Changeset 74da7a424fdcaea34fed38e37f844dbeade9a3b3

Timestamp:

09/20/07 20:54:02 (10 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1190314442 +0000

git-parent:

[98622388c1b02f46c29fd7e46a1750396d3eae03]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1190314442 +0000

Message:

DMO/loader patch from Alex Antropoff.
You may need to upgrade Windows Media to get this working,
since it uses a newer DLL name.

Files:

• libs/loader/win32.c (modified) (3 diffs)
• modules/codec/dmo/dmo.c (modified) (5 diffs)

libs/loader/win32.c

@@ -3937 +3937 @@
-typedef struct __attribute__((__packed__))
-{
-
+
+
-    unsigned long cbFormat;     //0x40
-    char*   pbFormat;       //0x44
@@ -3959 +3960 @@
-    if (!dest)
-        return E_POINTER;
-
+
+
+
-    if (cbFormat)
-    {
@@ -3965 +3968 @@
-    if (!dest->pbFormat)
-            return E_OUTOFMEMORY;
+    }
+    else 
+    {
+    dest->pbFormat=NULL;
-    }
-    return S_OK;

modules/codec/dmo/dmo.c

@@ -143 +143 @@
-
-static const GUID guid_wmv_enc = { 0x3181343b, 0x94a2, 0x4feb, { 0xad, 0xef, 0x30, 0xa1, 0xdd, 0xe6, 0x17, 0xb4 } };
+static const GUID guid_wmv_enc2 = { 0x96b57cdd, 0x8966, 0x410c,{ 0xbb, 0x1f, 0xc9, 0x7e, 0xea, 0x76, 0x5c, 0x04 } };
-static const GUID guid_wma_enc = { 0x70f598e9, 0xf4ab, 0x495a, { 0x99, 0xe2, 0xa7, 0xc4, 0xd3, 0xd8, 0x9a, 0xbf } };
-
@@ -192 +193 @@
-static const codec_dll encoders_table[] =
-{
+    /* WMV3 */
+    { VLC_FOURCC('W','M','V','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
+    { VLC_FOURCC('w','m','v','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
-    /* WMV2 */
-.dll", &guid_wmv_enc
-.dll", &guid_wmv_enc
+2.dll", &guid_wmv_enc2
+2.dll", &guid_wmv_enc2
-    /* WMV1 */
-.dll", &guid_wmv_enc
-.dll", &guid_wmv_enc
+2.dll", &guid_wmv_enc2
+2.dll", &guid_wmv_enc2
-
-    /* WMA 3 */
@@ -968 +972 @@
-    encoder_t *p_enc = (encoder_t*)p_this;
-
-#ifndef LOADER
-    int i_ret = EncOpen( p_this );
-    if( i_ret != VLC_SUCCESS ) return i_ret;
-
-#else
-    /* We can't open it now, because of ldt_keeper or something
-     * Open/Encode/Close has to be done in the same thread */
-    int i;
-
-    /* Probe if we support it */
-    for( i = 0; encoders_table[i].i_fourcc != 0; i++ )
-    {
-        if( encoders_table[i].i_fourcc == p_enc->fmt_out.i_codec )
-        {
-            msg_Dbg( p_enc, "DMO codec for %4.4s may work with dll=%s",
-                     (char*)&p_enc->fmt_out.i_codec,
-                     encoders_table[i].psz_dll );
-            break;
-        }
-    }
-
-    p_enc->p_sys = NULL;
-    if( !encoders_table[i].i_fourcc ) return VLC_EGENERIC;
-#endif /* LOADER */
-
-    /* Set callbacks */
@@ -1034 +1016 @@
-    /* Setup input format */
-    memset( &dmo_type, 0, sizeof(dmo_type) );
-    dmo_type.pUnk = 0;
-    memset( &vih, 0, sizeof(VIDEOINFOHEADER) );
-
@@ -1412 +1393 @@
-    mtime_t i_pts;
-
-    if( p_sys == NULL )
-    {
-        if( EncOpen( VLC_OBJECT(p_enc) ) )
-        {
-            msg_Err( p_enc, "EncOpen failed" );
-            return NULL;
-        }
-        p_sys = p_enc->p_sys;
-    }
-
-    if( !p_data ) return NULL;
-