Rémi Bernon : winegstreamer: Implement H264 decoder SetInputType.
Alexandre Julliard
julliard at winehq.org
Tue Mar 15 17:57:48 CDT 2022
Module: wine
Branch: master
Commit: dfce20f34322e4d4087edf0e5f065ae7a2493151
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfce20f34322e4d4087edf0e5f065ae7a2493151
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon Mar 14 12:09:05 2022 +0100
winegstreamer: Implement H264 decoder SetInputType.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/tests/mf.c | 3 ---
dlls/winegstreamer/h264_decoder.c | 38 ++++++++++++++++++++++++++++++++++++--
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 0b089b74a5f..12f37387f59 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6737,7 +6737,6 @@ static void test_h264_decoder(void)
hr = MFCreateMediaType(&media_type);
ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr);
hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
- todo_wine
ok(hr == E_INVALIDARG, "SetInputType returned %#lx.\n", hr);
init_media_type(media_type, input_type_desc, 1);
hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
@@ -6745,10 +6744,8 @@ static void test_h264_decoder(void)
ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr);
init_media_type(media_type, input_type_desc, 2);
hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
- todo_wine
ok(hr == S_OK, "SetInputType returned %#lx.\n", hr);
ret = IMFMediaType_Release(media_type);
- todo_wine
ok(ret == 1, "Release returned %lu\n", ret);
flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE;
diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c
index fdc0d6addeb..318998d02a3 100644
--- a/dlls/winegstreamer/h264_decoder.c
+++ b/dlls/winegstreamer/h264_decoder.c
@@ -28,10 +28,17 @@
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
+static const GUID *const h264_decoder_input_types[] =
+{
+ &MFVideoFormat_H264,
+ &MFVideoFormat_H264_ES,
+};
+
struct h264_decoder
{
IMFTransform IMFTransform_iface;
LONG refcount;
+ IMFMediaType *input_type;
};
static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface)
@@ -77,7 +84,11 @@ static ULONG WINAPI transform_Release(IMFTransform *iface)
TRACE("iface %p decreasing refcount to %lu.\n", decoder, refcount);
if (!refcount)
+ {
+ if (decoder->input_type)
+ IMFMediaType_Release(decoder->input_type);
free(decoder);
+ }
return refcount;
}
@@ -163,8 +174,31 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR
static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
{
- FIXME("iface %p, id %#lx, type %p, flags %#lx stub!\n", iface, id, type, flags);
- return E_NOTIMPL;
+ struct h264_decoder *decoder = impl_from_IMFTransform(iface);
+ GUID major, subtype;
+ HRESULT hr;
+ ULONG i;
+
+ TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags);
+
+ if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) ||
+ FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
+ return E_INVALIDARG;
+
+ if (!IsEqualGUID(&major, &MFMediaType_Video))
+ return MF_E_INVALIDMEDIATYPE;
+
+ for (i = 0; i < ARRAY_SIZE(h264_decoder_input_types); ++i)
+ if (IsEqualGUID(&subtype, h264_decoder_input_types[i]))
+ break;
+ if (i == ARRAY_SIZE(h264_decoder_input_types))
+ return MF_E_INVALIDMEDIATYPE;
+
+ if (decoder->input_type)
+ IMFMediaType_Release(decoder->input_type);
+ IMFMediaType_AddRef((decoder->input_type = type));
+
+ return S_OK;
}
static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
More information about the wine-cvs
mailing list