Rémi Bernon : winegstreamer: Implement H264 decoder GetOutputCurrentType.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a7c60623158b048244701f104ca4daeb739637a4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a7c60623158b048244701f104...

Author: Rémi Bernon 
Date:   Mon Apr 25 10:30:53 2022 +0200

winegstreamer: Implement H264 decoder GetOutputCurrentType.

Signed-off-by: Rémi Bernon 
Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/mf/tests/mf.c                |  8 --------
 dlls/winegstreamer/h264_decoder.c | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 6e2c9d7b429..dd00207d311 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6659,7 +6659,6 @@ static void test_h264_decoder(void)
     hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type);
     ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputAvailableType returned %#lx\n", hr);
     hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
-    todo_wine
     ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputCurrentType returned %#lx\n", hr);

/* setting output media type first doesn't work */
@@ -6783,14 +6782,10 @@ static void test_h264_decoder(void)
     ok(ret == 1, "Release returned %lu\n", ret);

hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
-    todo_wine
     ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr);
-    if (hr != S_OK) MFCreateMediaType(&media_type);
-    todo_wine
     check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1);
     ret = IMFMediaType_Release(media_type);
     ok(ret == 0, "Release returned %lu\n", ret);
-
     flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE;
     memset(&input_info, 0xcd, sizeof(input_info));
     hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info);
@@ -6918,10 +6913,7 @@ static void test_h264_decoder(void)

/* current output type is still the one we selected */
     hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
-    todo_wine
     ok(hr == S_OK, "GetOutputCurrentType returned %#lx\n", hr);
-    if (hr != S_OK) MFCreateMediaType(&media_type);
-    todo_wine
     check_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1);
     hr = IMFMediaType_GetItemType(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, NULL);
     ok(hr == MF_E_ATTRIBUTENOTFOUND, "GetItemType returned %#lx\n", hr);
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index 8bfa15529db..1c7bf391bf7 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -460,8 +460,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i

static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)
 {
+    struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+    HRESULT hr;
+
     FIXME("iface %p, id %#lx, type %p stub!\n", iface, id, type);
-    return E_NOTIMPL;
+
+    if (!decoder->output_type)
+        return MF_E_TRANSFORM_TYPE_NOT_SET;
+
+    if (FAILED(hr = MFCreateMediaType(type)))
+        return hr;
+
+    return IMFMediaType_CopyAllItems(decoder->output_type, (IMFAttributes *)*type);
 }

static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)