[PATCH v3 3/4] winegstreamer: Provide samples if DXGI device manager is set in h264 decoder.

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 3ab596317f9..04fcdf1f98c 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -6867,8 +6867,7 @@ static void test_h264_with_dxgi_manager(void)
     status = 0;
     memset(output, 0, sizeof(output));
     hr = IMFTransform_ProcessOutput(transform, 0, 1, output, &status);
-    todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "got %#lx\n", hr);
-    if (hr != MF_E_TRANSFORM_NEED_MORE_INPUT) goto failed;
+    ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "got %#lx\n", hr);

hr = IMFTransform_GetAttributes(transform, &attribs);
     ok(hr == S_OK, "got %#lx\n", hr);
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index e92d7bd730b..00c6afd96cd 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -63,6 +63,7 @@ struct h264_decoder
     struct wg_sample_queue *wg_sample_queue;

IMFVideoSampleAllocatorEx *allocator;
+    BOOL allocator_initialized;
 };

static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)
@@ -204,6 +205,26 @@ static HRESULT fill_output_media_type(struct h264_decoder *decoder, IMFMediaType
     return S_OK;
 }

+static HRESULT init_allocator(struct h264_decoder *decoder)
+{
+    HRESULT hr;
+
+    if (decoder->allocator_initialized)
+        return S_OK;
+
+    if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(decoder->allocator, 10, 10,
+            decoder->attributes, decoder->output_type)))
+        return hr;
+    decoder->allocator_initialized = TRUE;
+    return S_OK;
+}
+
+static void uninit_allocator(struct h264_decoder *decoder)
+{
+    IMFVideoSampleAllocatorEx_UninitializeSampleAllocator(decoder->allocator);
+    decoder->allocator_initialized = FALSE;
+}
+
 static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out)
 {
     struct h264_decoder *decoder = impl_from_IMFTransform(iface);
@@ -583,11 +604,22 @@ static HRESULT WINAPI transform_ProcessEvent(IMFTransform *iface, DWORD id, IMFM
 static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param)
 {
     struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    HRESULT hr;

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);
+    {
+        if (FAILED(hr = IMFVideoSampleAllocatorEx_SetDirectXManager(decoder->allocator, (IUnknown *)param)))
+            return hr;
+
+        uninit_allocator(decoder);
+        if (param)
+            decoder->output_info.dwFlags |= MFT_OUTPUT_STREAM_PROVIDES_SAMPLES;
+        else
+            decoder->output_info.dwFlags &= ~MFT_OUTPUT_STREAM_PROVIDES_SAMPLES;
+        return S_OK;
+    }

FIXME("Ignoring message %#x.\n", message);
     return S_OK;
@@ -611,6 +643,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
     struct h264_decoder *decoder = impl_from_IMFTransform(iface);
     struct wg_format wg_format;
     UINT32 sample_size;
+    IMFSample *sample;
     UINT64 frame_rate;
     GUID subtype;
     HRESULT hr;
@@ -624,7 +657,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
         return MF_E_TRANSFORM_TYPE_NOT_SET;

*status = samples->dwStatus = 0;
-    if (!samples->pSample)
+    if (!(sample = samples->pSample) && !(decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES))
         return E_INVALIDARG;

if (FAILED(hr = IMFMediaType_GetGUID(decoder->output_type, &MF_MT_SUBTYPE, &subtype)))
@@ -633,7 +666,21 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
             decoder->wg_format.u.video.height, &sample_size)))
         return hr;

-    if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, samples->pSample,
+    if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)
+    {
+        if (FAILED(hr = init_allocator(decoder)))
+        {
+            ERR("Failed to initialize allocator, hr %#lx.\n", hr);
+            return hr;
+        }
+        if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, &sample)))
+        {
+            ERR("Failed to allocate sample, hr %#lx.\n", hr);
+            return hr;
+        }
+    }
+
+    if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, sample,
             sample_size, &wg_format, &samples->dwStatus)))
         wg_sample_queue_flush(decoder->wg_sample_queue, false);

@@ -652,6 +699,16 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,

samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE;
         *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE;
+
+        uninit_allocator(decoder);
+    }
+
+    if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)
+    {
+        if (hr == S_OK)
+            samples->pSample = sample;
+        else
+            IMFSample_Release(sample);
     }

return hr;