Paul Gofman : winegstreamer: Process MFT_MESSAGE_SET_D3D_MANAGER in h264 decoder.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3f2ff939a10bc9ec14172d2798ea6f02e73048d2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3f2ff939a10bc9ec14172d2798ea6f0...

Author: Paul Gofman <pgofman(a)codeweavers.com>
Date:   Fri Mar 31 19:16:59 2023 -0600

winegstreamer: Process MFT_MESSAGE_SET_D3D_MANAGER in h264 decoder.

---

 dlls/mf/tests/transform.c         |  2 +-
 dlls/winegstreamer/h264_decoder.c | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 501747c94ae..26052e6ea6e 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -6832,7 +6832,7 @@ static void test_h264_with_dxgi_manager(void)
     IMFAttributes_Release(attribs);
 
     hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)transform);
-    todo_wine ok(hr == E_NOINTERFACE, "got %#lx\n", hr);
+    ok(hr == E_NOINTERFACE, "got %#lx\n", hr);
 
     hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager);
     ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got %#lx\n", hr);
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 7d9c38837d3..e92d7bd730b 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -61,6 +61,8 @@ struct h264_decoder
     struct wg_format wg_format;
     struct wg_transform *wg_transform;
     struct wg_sample_queue *wg_sample_queue;
+
+    IMFVideoSampleAllocatorEx *allocator;
 };
 
 static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)
@@ -241,6 +243,7 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)
 
     if (!refcount)
     {
+        IMFVideoSampleAllocatorEx_Release(decoder->allocator);
         if (decoder->wg_transform)
             wg_transform_destroy(decoder->wg_transform);
         if (decoder->input_type)
@@ -251,7 +254,6 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)
             IMFAttributes_Release(decoder->output_attributes);
         if (decoder->attributes)
             IMFAttributes_Release(decoder->attributes);
-
         wg_sample_queue_destroy(decoder->wg_sample_queue);
         free(decoder);
     }
@@ -580,7 +582,14 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
-    FIXME("iface %p, message %#x, param %Ix stub!\n", iface, message, param);
+    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+
+    TRACE("iface %p, message %#x, param %Ix.\n", iface, message, param);
+
+    if (message == MFT_MESSAGE_SET_D3D_MANAGER)
+        return IMFVideoSampleAllocatorEx_SetDirectXManager(decoder->allocator, (IUnknown *)param);
+
+    FIXME("Ignoring message %#x.\n", message);
     return S_OK;
 }
 
@@ -732,12 +741,16 @@ HRESULT h264_decoder_create(REFIID riid, void **ret)
         goto failed;
     if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue)))
         goto failed;
+    if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&decoder->allocator)))
+        goto failed;
 
     *ret = &decoder->IMFTransform_iface;
     TRACE("Created decoder %p\n", *ret);
     return S_OK;
 
 failed:
+    if (decoder->wg_sample_queue)
+        wg_sample_queue_destroy(decoder->wg_sample_queue);
     if (decoder->output_attributes)
         IMFAttributes_Release(decoder->output_attributes);
     if (decoder->attributes)