Nikolay Sivov : mf/evr: Set the device manager for sample allocators.
Alexandre Julliard
julliard at winehq.org
Thu Oct 22 15:27:31 CDT 2020
Module: wine
Branch: master
Commit: fe70e7beb509508cd70a2aa7d612b66c46f7c411
URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe70e7beb509508cd70a2aa7d612b66c46f7c411
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Oct 22 14:29:04 2020 +0300
mf/evr: Set the device manager for sample allocators.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/evr.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index cc3f828e540..537d859d229 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -83,6 +83,7 @@ struct video_renderer
IMFTransform *mixer;
IMFVideoPresenter *presenter;
+ IUnknown *device_manager;
unsigned int flags;
unsigned int state;
@@ -539,7 +540,11 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface,
EnterCriticalSection(&stream->cs);
if (!stream->allocator)
+ {
hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator);
+ if (SUCCEEDED(hr))
+ hr = IMFVideoSampleAllocator_SetDirectXManager(stream->allocator, stream->parent->device_manager);
+ }
if (SUCCEEDED(hr))
hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj);
@@ -667,6 +672,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
IMFTransform_Release(renderer->mixer);
if (renderer->presenter)
IMFVideoPresenter_Release(renderer->presenter);
+ if (renderer->device_manager)
+ IUnknown_Release(renderer->device_manager);
if (renderer->clock)
IMFPresentationClock_Release(renderer->clock);
if (renderer->attributes)
@@ -1183,6 +1190,12 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere
IMFTopologyServiceLookupClient_Release(lookup_client);
}
+ if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE,
+ &IID_IUnknown, (void **)&renderer->device_manager)))
+ {
+ WARN("Failed to get device manager from the presenter.\n");
+ }
+
return hr;
}
@@ -1203,6 +1216,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra
renderer->presenter = NULL;
}
+ if (renderer->device_manager)
+ {
+ IUnknown_Release(renderer->device_manager);
+ renderer->device_manager = NULL;
+ }
+
renderer->mixer = mixer;
IMFTransform_AddRef(renderer->mixer);
More information about the wine-cvs
mailing list