From: Rémi Bernon rbernon@codeweavers.com
--- dlls/mfmediaengine/main.c | 82 +++++++++++++++++++++++- dlls/mfmediaengine/mediaengine_private.h | 2 +- dlls/mfmediaengine/video_frame_sink.c | 64 +++++++++++++++++- 3 files changed, 144 insertions(+), 4 deletions(-)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index caeab3dea30..0f2ce5d189f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1196,7 +1196,7 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &subtype);
- hr = create_video_frame_sink(media_type, &engine->sink_events, &engine->presentation.frame_sink); + hr = create_video_frame_sink(media_type, (IUnknown *)engine->device_manager, &engine->sink_events, &engine->presentation.frame_sink); IMFMediaType_Release(media_type); if (FAILED(hr)) return hr; @@ -2458,6 +2458,83 @@ static void media_engine_update_d3d11_frame_surface(ID3D11DeviceContext *context IMFSample_Release(sample); }
+static HRESULT get_d3d11_resource_from_sample(IMFSample *sample, ID3D11Texture2D **resource, UINT *subresource) +{ + IMFDXGIBuffer *dxgi_buffer; + IMFMediaBuffer *buffer; + HRESULT hr; + + *resource = NULL; + *subresource = 0; + + if (FAILED(hr = IMFSample_GetBufferByIndex(sample, 0, &buffer))) + return hr; + + if (SUCCEEDED(hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer))) + { + IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, subresource); + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)resource); + IMFDXGIBuffer_Release(dxgi_buffer); + } + + IMFMediaBuffer_Release(buffer); + return hr; +} + +static HRESULT media_engine_transfer_d3d11(struct media_engine *engine, ID3D11Texture2D *dst_texture, + const MFVideoNormalizedRect *src_rect, const RECT *dst_rect, const MFARGB *color) +{ + MFVideoNormalizedRect src_rect_default = {0.0, 0.0, 1.0, 1.0}; + MFARGB color_default = {0, 0, 0, 0}; + D3D11_TEXTURE2D_DESC src_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *src_texture; + RECT dst_rect_default = {0}; + D3D11_BOX src_box = {0}; + ID3D11Device *device; + IMFSample *sample; + UINT subresource; + HRESULT hr; + + if (!src_rect) + src_rect = &src_rect_default; + if (!dst_rect) + dst_rect = &dst_rect_default; + if (!color) + color = &color_default; + + if (!video_frame_sink_get_sample(engine->presentation.frame_sink, &sample)) + return MF_E_UNEXPECTED; + hr = get_d3d11_resource_from_sample(sample, &src_texture, &subresource); + IMFSample_Release(sample); + if (FAILED(hr)) + return hr; + + if (FAILED(hr = media_engine_lock_d3d_device(engine, &device))) + { + ID3D11Texture2D_Release(src_texture); + return hr; + } + + ID3D11Texture2D_GetDesc(src_texture, &src_desc); + + src_box.left = src_rect->left * src_desc.Width; + src_box.top = src_rect->top * src_desc.Height; + src_box.front = 0; + src_box.right = src_rect->right * src_desc.Width; + src_box.bottom = src_rect->bottom * src_desc.Height; + src_box.back = 1; + + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + dst_rect->left, dst_rect->top, 0, (ID3D11Resource *)src_texture, subresource, &src_box); + ID3D11DeviceContext_Release(context); + + media_engine_unlock_d3d_device(engine, device); + ID3D11Texture2D_Release(src_texture); + return hr; +} + static HRESULT media_engine_transfer_to_d3d11_texture(struct media_engine *engine, ID3D11Texture2D *texture, const MFVideoNormalizedRect *src_rect, const RECT *dst_rect, const MFARGB *color) { @@ -2623,7 +2700,8 @@ static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngineEx *iface, I
if (SUCCEEDED(IUnknown_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture))) { - hr = media_engine_transfer_to_d3d11_texture(engine, texture, src_rect, dst_rect, color); + if (!engine->device_manager || FAILED(hr = media_engine_transfer_d3d11(engine, texture, src_rect, dst_rect, color))) + hr = media_engine_transfer_to_d3d11_texture(engine, texture, src_rect, dst_rect, color); ID3D11Texture2D_Release(texture); } else diff --git a/dlls/mfmediaengine/mediaengine_private.h b/dlls/mfmediaengine/mediaengine_private.h index 286cb9b1430..3b280a6d1ee 100644 --- a/dlls/mfmediaengine/mediaengine_private.h +++ b/dlls/mfmediaengine/mediaengine_private.h @@ -20,7 +20,7 @@
struct video_frame_sink;
-HRESULT create_video_frame_sink(IMFMediaType *media_type, IMFAsyncCallback *events_callback, +HRESULT create_video_frame_sink(IMFMediaType *media_type, IUnknown *device_manager, IMFAsyncCallback *events_callback, struct video_frame_sink **sink); HRESULT video_frame_sink_query_iface(struct video_frame_sink *object, REFIID riid, void **obj); ULONG video_frame_sink_release(struct video_frame_sink *sink); diff --git a/dlls/mfmediaengine/video_frame_sink.c b/dlls/mfmediaengine/video_frame_sink.c index ba4ef67c59a..bb33d1e69b7 100644 --- a/dlls/mfmediaengine/video_frame_sink.c +++ b/dlls/mfmediaengine/video_frame_sink.c @@ -28,6 +28,9 @@
#include "mediaengine_private.h"
+#include "initguid.h" +#include "evr.h" + #include "wine/debug.h" #include "wine/list.h"
@@ -73,7 +76,9 @@ struct video_frame_sink IMFMediaEventGenerator IMFMediaEventGenerator_iface; IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; + IMFGetService IMFGetService_iface; LONG refcount; + IUnknown *device_manager; IMFMediaType *media_type; IMFMediaType *current_media_type; bool is_shut_down; @@ -127,6 +132,11 @@ static struct video_frame_sink *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandle return CONTAINING_RECORD(iface, struct video_frame_sink, IMFMediaTypeHandler_iface); }
+static struct video_frame_sink *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_frame_sink, IMFGetService_iface); +} + static void video_frame_sink_samples_release(struct video_frame_sink *sink) { for (int i = 0; i < ARRAY_SIZE(sink->sample); i++) @@ -163,6 +173,10 @@ static HRESULT WINAPI video_frame_sink_stream_QueryInterface(IMFStreamSink *ifac { *obj = &sink->IMFMediaTypeHandler_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &sink->IMFGetService_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -577,6 +591,49 @@ static const IMFMediaTypeHandlerVtbl video_frame_sink_stream_type_handler_vtbl = video_frame_sink_stream_type_handler_GetMajorType, };
+static HRESULT WINAPI video_frame_sink_stream_get_service_QueryInterface(IMFGetService *iface, REFIID riid, + void **obj) +{ + struct video_frame_sink *sink = impl_from_IMFGetService(iface); + return IMFStreamSink_QueryInterface(&sink->IMFStreamSink_iface, riid, obj); +} + +static ULONG WINAPI video_frame_sink_stream_get_service_AddRef(IMFGetService *iface) +{ + struct video_frame_sink *sink = impl_from_IMFGetService(iface); + return IMFStreamSink_AddRef(&sink->IMFStreamSink_iface); +} + +static ULONG WINAPI video_frame_sink_stream_get_service_Release(IMFGetService *iface) +{ + struct video_frame_sink *sink = impl_from_IMFGetService(iface); + return IMFStreamSink_Release(&sink->IMFStreamSink_iface); +} + +static HRESULT WINAPI video_frame_sink_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, + void **obj) +{ + struct video_frame_sink *sink = impl_from_IMFGetService(iface); + + if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE)) + { + if (sink->device_manager) + return IUnknown_QueryInterface(sink->device_manager, riid, obj); + return E_NOINTERFACE; + } + + FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); + return MF_E_UNSUPPORTED_SERVICE; +} + +static const IMFGetServiceVtbl video_frame_sink_stream_get_service_vtbl = +{ + video_frame_sink_stream_get_service_QueryInterface, + video_frame_sink_stream_get_service_AddRef, + video_frame_sink_stream_get_service_Release, + video_frame_sink_stream_get_service_GetService, +}; + static HRESULT WINAPI video_frame_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct video_frame_sink *sink = impl_from_IMFMediaSink(iface); @@ -630,6 +687,8 @@ static ULONG WINAPI video_frame_sink_Release(IMFMediaSink *iface) if (sink->current_media_type) IMFMediaType_Release(sink->current_media_type); IMFMediaType_Release(sink->media_type); + if (sink->device_manager) + IUnknown_Release(sink->device_manager); if (sink->event_queue) IMFMediaEventQueue_Release(sink->event_queue); if (sink->clock) @@ -1059,7 +1118,7 @@ static const IMFClockStateSinkVtbl video_frame_sink_clock_sink_vtbl = video_frame_sink_clock_sink_OnClockSetRate, };
-HRESULT create_video_frame_sink(IMFMediaType *media_type, IMFAsyncCallback *events_callback, struct video_frame_sink **sink) +HRESULT create_video_frame_sink(IMFMediaType *media_type, IUnknown *device_manager, IMFAsyncCallback *events_callback, struct video_frame_sink **sink) { struct video_frame_sink *object; HRESULT hr; @@ -1072,8 +1131,11 @@ HRESULT create_video_frame_sink(IMFMediaType *media_type, IMFAsyncCallback *even object->IMFMediaEventGenerator_iface.lpVtbl = &video_frame_sink_events_vtbl; object->IMFStreamSink_iface.lpVtbl = &video_frame_sink_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &video_frame_sink_stream_type_handler_vtbl; + object->IMFGetService_iface.lpVtbl = &video_frame_sink_stream_get_service_vtbl; object->refcount = 1; object->rate = 1.0f; + if ((object->device_manager = device_manager)) + IUnknown_AddRef(object->device_manager); object->media_type = media_type; IMFAsyncCallback_AddRef(object->callback = events_callback); IMFMediaType_AddRef(object->media_type);