[PATCH v2 4/4] winegstreamer: Pass temporary sample to wg_transform_read_mf() in h264 decoder.

[Paul Gofman]

From: Paul Gofman

---
 dlls/winegstreamer/Makefile.in    |  2 +-
 dlls/winegstreamer/h264_decoder.c | 55 ++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index 82b1c148d6b..ae6420bad84 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = winegstreamer.dll
 UNIXLIB   = winegstreamer.so
 IMPORTLIB = winegstreamer
 IMPORTS   = strmbase ole32 oleaut32 msdmo
-DELAYIMPORTS = mfplat
+DELAYIMPORTS = mfplat mf
 UNIX_CFLAGS  = $(GSTREAMER_CFLAGS)
 UNIX_LIBS    = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)

diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 239f28b74e7..b307e051193 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -64,6 +64,8 @@ struct h264_decoder

IMFVideoSampleAllocatorEx *allocator;
     BOOL allocator_initialized;
+    IMFTransform *copier;
+    IMFMediaBuffer *temp_buffer;
 };

static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)
@@ -212,6 +214,9 @@ static HRESULT init_allocator(struct h264_decoder *decoder)
     if (decoder->allocator_initialized)
         return S_OK;

+    IMFTransform_SetInputType(decoder->copier, 0, decoder->output_type, 0);
+    IMFTransform_SetOutputType(decoder->copier, 0, decoder->output_type, 0);
+
     if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(decoder->allocator, 10, 10,
             decoder->attributes, decoder->output_type)))
         return hr;
@@ -264,7 +269,10 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)

if (!refcount)
     {
+        IMFTransform_Release(decoder->copier);
         IMFVideoSampleAllocatorEx_Release(decoder->allocator);
+        if (decoder->temp_buffer)
+            IMFMediaBuffer_Release(decoder->temp_buffer);
         if (decoder->wg_transform)
             wg_transform_destroy(decoder->wg_transform);
         if (decoder->input_type)
@@ -637,6 +645,25 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS
     return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue);
 }

+static HRESULT output_sample(struct h264_decoder *decoder, IMFSample **out, IMFSample *src_sample)
+{
+    MFT_OUTPUT_DATA_BUFFER output[1];
+    DWORD status;
+    HRESULT hr;
+
+    if (FAILED(hr = init_allocator(decoder)))
+    {
+        ERR("Failed to initialize allocator, hr %#lx.\n", hr);
+        return hr;
+    }
+    if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, out)))
+        return hr;
+
+    IMFTransform_ProcessInput(decoder->copier, 0, src_sample, 0);
+    output[0].pSample = *out;
+    return IMFTransform_ProcessOutput(decoder->copier, 0, 1, output, &status);
+}
+
 static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,
         MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status)
 {
@@ -646,6 +673,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
     IMFSample *sample;
     UINT64 frame_rate;
     GUID subtype;
+    DWORD size;
     HRESULT hr;

TRACE("iface %p, flags %#lx, count %lu, samples %p, status %p.\n", iface, flags, count, samples, status);
@@ -668,16 +696,20 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,

if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)
     {
-        if (FAILED(hr = init_allocator(decoder)))
+        if (decoder->temp_buffer)
         {
-            ERR("Failed to initialize allocator, hr %#lx.\n", hr);
-            return hr;
+            if (FAILED(IMFMediaBuffer_GetMaxLength(decoder->temp_buffer, &size)) || size < sample_size)
+            {
+                IMFMediaBuffer_Release(decoder->temp_buffer);
+                decoder->temp_buffer = NULL;
+            }
         }
-        if (FAILED(hr = IMFVideoSampleAllocatorEx_AllocateSample(decoder->allocator, &sample)))
-        {
-            ERR("Failed to allocate sample, hr %#lx.\n", hr);
+        if (!decoder->temp_buffer && FAILED(hr = MFCreateMemoryBuffer(sample_size, &decoder->temp_buffer)))
+            return hr;
+        if (FAILED(hr = MFCreateSample(&sample)))
+            return hr;
+        if (FAILED(hr = IMFSample_AddBuffer(sample, decoder->temp_buffer)))
             return hr;
-        }
     }

if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, sample,
@@ -705,10 +737,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,

if (decoder->output_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)
     {
-        if (hr == S_OK)
-            samples->pSample = sample;
-        else
-            IMFSample_Release(sample);
+        if (hr == S_OK && FAILED(hr = output_sample(decoder, &samples->pSample, sample)))
+            ERR("Failed to output sample, hr %#lx.\n", hr);
+        IMFSample_Release(sample);
     }

return hr;
@@ -800,6 +831,8 @@ HRESULT h264_decoder_create(REFIID riid, void **ret)
         goto failed;
     if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&decoder->allocator)))
         goto failed;
+    if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier)))
+        goto failed;

*ret = &decoder->IMFTransform_iface;
     TRACE("Created decoder %p\n", *ret);