[PATCH v2 5/5] mfsrcsnk: Stub byte stream handlers if demuxing is supported.

[Rémi Bernon]

From: Rémi Bernon

This introduces a new alternative FFmpeg-based implementation for the
MF byte stream handlers, while keeping the current GStreamer-based as
default.

The new implementation can be enabled by setting the DWORD value:

DisableGstByteStreamHandler = 1

in the HKCU\Software\Wine\MediaFoundation registry key.
---
 dlls/mfasfsrcsnk/Makefile.in |  2 +-
 dlls/mfmp4srcsnk/Makefile.in |  2 +-
 dlls/mfsrcsnk/Makefile.in    |  2 +-
 dlls/mfsrcsnk/media_source.c | 71 ++++++++++++++++++++++++++++++++----
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/dlls/mfasfsrcsnk/Makefile.in b/dlls/mfasfsrcsnk/Makefile.in
index f450c304d3b..e2dbc7afb4d 100644
--- a/dlls/mfasfsrcsnk/Makefile.in
+++ b/dlls/mfasfsrcsnk/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = mfasfsrcsnk.dll
-IMPORTS   = ole32 mfplat mfuuid uuid
+IMPORTS   = advapi32 ole32 mfplat mfuuid uuid winedmo
 PARENTSRC = ../mfsrcsnk

EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/mfmp4srcsnk/Makefile.in b/dlls/mfmp4srcsnk/Makefile.in
index cc91ab58df9..5464e1d86e3 100644
--- a/dlls/mfmp4srcsnk/Makefile.in
+++ b/dlls/mfmp4srcsnk/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = mfmp4srcsnk.dll
-IMPORTS   = ole32 mfplat mfuuid uuid
+IMPORTS   = advapi32 ole32 mfplat mfuuid uuid winedmo
 PARENTSRC = ../mfsrcsnk

EXTRADLLFLAGS = -Wb,--prefer-native
diff --git a/dlls/mfsrcsnk/Makefile.in b/dlls/mfsrcsnk/Makefile.in
index d238b43424d..5bef58ca10d 100644
--- a/dlls/mfsrcsnk/Makefile.in
+++ b/dlls/mfsrcsnk/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = mfsrcsnk.dll
 IMPORTLIB = mfsrcsnk
-IMPORTS   = ole32 mfplat mfuuid uuid
+IMPORTS   = advapi32 ole32 mfplat mfuuid uuid winedmo

EXTRADLLFLAGS = -Wb,--prefer-native

diff --git a/dlls/mfsrcsnk/media_source.c b/dlls/mfsrcsnk/media_source.c
index 8c02743e811..fe6f8cea256 100644
--- a/dlls/mfsrcsnk/media_source.c
+++ b/dlls/mfsrcsnk/media_source.c
@@ -19,12 +19,43 @@
 #include "mfsrcsnk_private.h"

#include "wine/debug.h"
+#include "wine/winedmo.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
+
+static HRESULT byte_stream_plugin_create(IUnknown *outer, REFIID riid, void **out)
+{
+    FIXME("outer %p, riid %s, out %p stub!.\n", outer, debugstr_guid(riid), out);
+    *out = NULL;
+    return E_NOTIMPL;
+}
+
+static BOOL use_gst_byte_stream_handler(void)
+{
+    BOOL result;
+    DWORD size = sizeof(result);
+
+    /* @@ Wine registry key: HKCU\Software\Wine\MediaFoundation */
+    if (!RegGetValueW( HKEY_CURRENT_USER, L"Software\Wine\MediaFoundation", L"DisableGstByteStreamHandler",
+                       RRF_RT_REG_DWORD, NULL, &result, &size ))
+        return !result;
+
+    return TRUE;
+}

static HRESULT WINAPI asf_byte_stream_plugin_factory_CreateInstance(IClassFactory *iface,
         IUnknown *outer, REFIID riid, void **out)
 {
-    static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
-    return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    NTSTATUS status;
+
+    if ((status = winedmo_demuxer_check("video/x-ms-asf")) || use_gst_byte_stream_handler())
+    {
+        static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
+        if (status) WARN("Unsupported demuxer, status %#lx.\n", status);
+        return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    }
+
+    return byte_stream_plugin_create(outer, riid, out);
 }

static const IClassFactoryVtbl asf_byte_stream_plugin_factory_vtbl =
@@ -41,8 +72,16 @@ IClassFactory asf_byte_stream_plugin_factory = {&asf_byte_stream_plugin_factory_
 static HRESULT WINAPI avi_byte_stream_plugin_factory_CreateInstance(IClassFactory *iface,
         IUnknown *outer, REFIID riid, void **out)
 {
-    static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
-    return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    NTSTATUS status;
+
+    if ((status = winedmo_demuxer_check("video/avi")) || use_gst_byte_stream_handler())
+    {
+        static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
+        if (status) WARN("Unsupported demuxer, status %#lx.\n", status);
+        return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    }
+
+    return byte_stream_plugin_create(outer, riid, out);
 }

static const IClassFactoryVtbl avi_byte_stream_plugin_factory_vtbl =
@@ -59,8 +98,16 @@ IClassFactory avi_byte_stream_plugin_factory = {&avi_byte_stream_plugin_factory_
 static HRESULT WINAPI mpeg4_byte_stream_plugin_factory_CreateInstance(IClassFactory *iface,
         IUnknown *outer, REFIID riid, void **out)
 {
-    static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
-    return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    NTSTATUS status;
+
+    if ((status = winedmo_demuxer_check("video/mp4")) || use_gst_byte_stream_handler())
+    {
+        static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
+        if (status) WARN("Unsupported demuxer, status %#lx.\n", status);
+        return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    }
+
+    return byte_stream_plugin_create(outer, riid, out);
 }

static const IClassFactoryVtbl mpeg4_byte_stream_plugin_factory_vtbl =
@@ -77,8 +124,16 @@ IClassFactory mpeg4_byte_stream_plugin_factory = {&mpeg4_byte_stream_plugin_fact
 static HRESULT WINAPI wav_byte_stream_plugin_factory_CreateInstance(IClassFactory *iface,
         IUnknown *outer, REFIID riid, void **out)
 {
-    static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
-    return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    NTSTATUS status;
+
+    if ((status = winedmo_demuxer_check("audio/wav")) || use_gst_byte_stream_handler())
+    {
+        static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618,0x5e5a,0x468a,{0x9f,0x15,0xd8,0x27,0xa9,0xa0,0x81,0x62}};
+        if (status) WARN("Unsupported demuxer, status %#lx.\n", status);
+        return CoCreateInstance(&CLSID_GStreamerByteStreamHandler, outer, CLSCTX_INPROC_SERVER, riid, out);
+    }
+
+    return byte_stream_plugin_create(outer, riid, out);
 }

static const IClassFactoryVtbl wav_byte_stream_plugin_factory_vtbl =