Nikolay Sivov : mf/evr: Create mixer object on activation.
Alexandre Julliard
julliard at winehq.org
Tue Jul 7 15:47:07 CDT 2020
Module: wine
Branch: master
Commit: 502341aa76e2e593e5a151afe5451176971a4832
URL: https://source.winehq.org/git/wine.git/?a=commit;h=502341aa76e2e593e5a151afe5451176971a4832
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Jul 7 14:40:12 2020 +0300
mf/evr: Create mixer object on activation.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/Makefile.in | 2 +-
dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
index 1d2bfc8a78..b64cdb4a64 100644
--- a/dlls/mf/Makefile.in
+++ b/dlls/mf/Makefile.in
@@ -1,6 +1,6 @@
MODULE = mf.dll
IMPORTLIB = mf
-IMPORTS = advapi32 mfplat ole32 uuid mfuuid
+IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index e0ab44f8b0..4166c1dd3e 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -19,6 +19,7 @@
#define COBJMACROS
#include "mf_private.h"
+#include "uuids.h"
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
@@ -32,6 +33,8 @@ struct video_renderer
IMFMediaSink IMFMediaSink_iface;
IMFMediaSinkPreroll IMFMediaSinkPreroll_iface;
LONG refcount;
+
+ IMFTransform *mixer;
unsigned int flags;
CRITICAL_SECTION cs;
};
@@ -90,6 +93,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
if (!refcount)
{
+ if (renderer->mixer)
+ IMFTransform_Release(renderer->mixer);
DeleteCriticalSection(&renderer->cs);
heap_free(renderer);
}
@@ -228,9 +233,33 @@ static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl =
video_renderer_preroll_NotifyPreroll,
};
+static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransform **out)
+{
+ unsigned int flags = 0;
+ IMFActivate *activate;
+ CLSID clsid;
+ HRESULT hr;
+
+ if (SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE,
+ &IID_IMFActivate, (void **)&activate)))
+ {
+ IMFAttributes_GetUINT32(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, &flags);
+ hr = IMFActivate_ActivateObject(activate, &IID_IMFTransform, (void **)out);
+ IMFActivate_Release(activate);
+ if (FAILED(hr) && !(flags & MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL))
+ return hr;
+ }
+
+ if (FAILED(IMFAttributes_GetGUID(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, &clsid)))
+ memcpy(&clsid, &CLSID_MFVideoMixer9, sizeof(clsid));
+
+ return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out);
+}
+
static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)
{
struct video_renderer *object;
+ HRESULT hr;
TRACE("%p, %p, %p.\n", attributes, user_context, obj);
@@ -242,9 +271,19 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context,
object->refcount = 1;
InitializeCriticalSection(&object->cs);
+ /* Create mixer. */
+ if (FAILED(hr = video_renderer_create_mixer(attributes, &object->mixer)))
+ goto done;
+
*obj = (IUnknown *)&object->IMFMediaSink_iface;
return S_OK;
+
+done:
+
+ IMFMediaSink_Release(&object->IMFMediaSink_iface);
+
+ return hr;
}
static void evr_shutdown_object(void *user_context, IUnknown *obj)
More information about the wine-cvs
mailing list