March 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : winegstreamer: Return S_OK from WMA decoder ProcessMessage.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: e4258d529342cc1dc486a136d0f715520b3dd5da URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4258d529342cc1dc486a136… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 14:43:23 2022 +0100 winegstreamer: Return S_OK from WMA decoder ProcessMessage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wma_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6ee43e19414..57b0f204f9e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -515,7 +515,7 @@ 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 %p stub!\n", iface, message, (void *)param); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags)

1 0

Jacek Caban : win32u: Move NtUserSetWindowPos implementation from user32.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 08b2fbcbd6e5ff59c856e13dee3aed44138cdfed URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b2fbcbd6e5ff59c856e13d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:27:14 2022 +0100 win32u: Move NtUserSetWindowPos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 36 +-- dlls/user32/defwnd.c | 4 +- dlls/user32/dialog.c | 4 +- dlls/user32/focus.c | 4 +- dlls/user32/icontitle.c | 2 +- dlls/user32/listbox.c | 6 +- dlls/user32/mdi.c | 24 +- dlls/user32/menu.c | 12 +- dlls/user32/message.c | 3 - dlls/user32/msgbox.c | 18 +- dlls/user32/painting.c | 6 +- dlls/user32/scroll.c | 4 +- dlls/user32/static.c | 9 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 6 - dlls/user32/win.c | 10 +- dlls/user32/winpos.c | 123 ++------- dlls/win32u/message.c | 3 + dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 606 ++++++++++++++++++++++++++++++++++++++++++- 22 files changed, 707 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08b2fbcbd6e5ff59c856…

1 0

Jacek Caban : win32u: Fix name comparison in find_class.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: d402df31966d73f7f120b4a4d90f22bcffd79b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d402df31966d73f7f120b4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 14:26:39 2022 +0100 win32u: Fix name comparison in find_class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52654 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 5 +++++ dlls/win32u/class.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 64fc3c014e3..eed90b8adc9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1049,6 +1049,11 @@ if (0) { /* crashes under XP */ ok(ret, "GetClassInfoExA() error %ld\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); ok(wcx.lpfnWndProc != NULL, "got null proc\n"); + + wcx.cbSize = sizeof(wcx); + ret = GetClassInfoExA(0, "stati", &wcx); + ok(!ret && GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, + "GetClassInfoExA() returned %x %ld\n", ret, GetLastError()); } static void test_icons(void) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 74d06ee04de..3113ef357cf 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -259,7 +259,8 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) } else { - if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) )) continue; + if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || + class->name[name->Length / sizeof(WCHAR)]) continue; } if (!class->local || !module || (class->instance & ~0xffff) == instance) {

1 0

Rémi Bernon : winegstreamer: Introduce new wg_transform_(push|read)_data functions.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 651e4002ceeb9a15b11a184b5f47a732e26b7e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=651e4002ceeb9a15b11a184b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 14:43:22 2022 +0100 winegstreamer: Introduce new wg_transform_(push|read)_data functions. And use it to implement WMA decoder Process(Input|Output). The test output is different because ffmpeg WMA decoder outputs data in a different way as native. The data seems valid audio nonetheless, and it shouldn't matter too much. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 50 +++++----------- dlls/winegstreamer/gst_private.h | 5 ++ dlls/winegstreamer/main.c | 30 ++++++++++ dlls/winegstreamer/mfplat.c | 49 ++++++++++++++++ dlls/winegstreamer/unix_private.h | 2 + dlls/winegstreamer/unixlib.h | 30 ++++++++++ dlls/winegstreamer/wg_parser.c | 3 + dlls/winegstreamer/wg_transform.c | 119 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/wma_decoder.c | 33 +++++++++-- 9 files changed, 278 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=651e4002ceeb9a15b11a…

1 0

Rémi Bernon : winebus.sys: Implement trigger rumble using SDL_JoystickRumbleTriggers.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 634d380e4c9e8f7ac3fb82e6bbed1e1b1c2a62df URL: https://source.winehq.org/git/wine.git/?a=commit;h=634d380e4c9e8f7ac3fb82e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 15 10:08:27 2022 +0100 winebus.sys: Implement trigger rumble using SDL_JoystickRumbleTriggers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index dbc9ce6a858..07fdd9d3fa2 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -114,6 +114,7 @@ MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); MAKE_FUNCPTR(SDL_GetTicks); static int (*pSDL_JoystickRumble)(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); +static int (*pSDL_JoystickRumbleTriggers)(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 right_rumble, Uint32 duration_ms); static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); @@ -442,7 +443,11 @@ static NTSTATUS sdl_device_haptics_start(struct unix_device *iface, UINT duratio if (!(impl->effect_support & EFFECT_SUPPORT_HAPTICS)) return STATUS_NOT_SUPPORTED; if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + { pSDL_JoystickRumble(impl->sdl_joystick, rumble_intensity, buzz_intensity, duration_ms); + if (pSDL_JoystickRumbleTriggers) + pSDL_JoystickRumbleTriggers(impl->sdl_joystick, left_intensity, right_intensity, duration_ms); + } else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) { SDL_HapticEffect effect; @@ -475,7 +480,11 @@ static NTSTATUS sdl_device_haptics_stop(struct unix_device *iface) TRACE("iface %p.\n", iface); if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) + { pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); + if (pSDL_JoystickRumbleTriggers) + pSDL_JoystickRumbleTriggers(impl->sdl_joystick, 0, 0, 0); + } else if (impl->effect_support & SDL_HAPTIC_LEFTRIGHT) pSDL_HapticStopAll(impl->sdl_haptic); else if (impl->effect_support & WINE_SDL_HAPTIC_RUMBLE) @@ -1050,6 +1059,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_GetTicks); #undef LOAD_FUNCPTR pSDL_JoystickRumble = dlsym(sdl_handle, "SDL_JoystickRumble"); + pSDL_JoystickRumbleTriggers = dlsym(sdl_handle, "SDL_JoystickRumbleTriggers"); pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor");

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder SetOutputType.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: f71c51cb19fd694ad9e169ecc37767a93bbe40aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f71c51cb19fd694ad9e169ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 12:09:08 2022 +0100 winegstreamer: Implement H264 decoder SetOutputType. 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(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 --- dlls/winegstreamer/h264_decoder.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2f855b5d9ca..feee38a5231 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6685,7 +6685,6 @@ static void test_h264_decoder(void) ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); init_media_type(media_type, default_outputs[0], -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); @@ -6806,10 +6805,8 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); } - todo_wine ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); - todo_wine ok(ret == 1, "Release returned %lu\n", ret); flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index c587b6d185e..2f4b42ed101 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -47,6 +47,7 @@ struct h264_decoder IMFTransform IMFTransform_iface; LONG refcount; IMFMediaType *input_type; + IMFMediaType *output_type; }; static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface) @@ -184,6 +185,8 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) { if (decoder->input_type) IMFMediaType_Release(decoder->input_type); + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); free(decoder); } @@ -340,6 +343,12 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == ARRAY_SIZE(h264_decoder_input_types)) return MF_E_INVALIDMEDIATYPE; + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + } + if (decoder->input_type) IMFMediaType_Release(decoder->input_type); IMFMediaType_AddRef((decoder->input_type = type)); @@ -349,8 +358,34 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_SetOutputType(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 (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || + FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Video)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < ARRAY_SIZE(h264_decoder_output_types); ++i) + if (IsEqualGUID(&subtype, h264_decoder_output_types[i])) + break; + if (i == ARRAY_SIZE(h264_decoder_output_types)) + return MF_E_INVALIDMEDIATYPE; + + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); + IMFMediaType_AddRef((decoder->output_type = type)); + + return S_OK; } static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder GetInputAvailableType.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 3dd1aefc682adff082d2ae267a230f684dc1e9c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd1aefc682adff082d2ae26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 12:09:07 2022 +0100 winegstreamer: Implement H264 decoder GetInputAvailableType. Required by Shadow Warrior 2. 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(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 -- dlls/winegstreamer/h264_decoder.c | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 26e128d2f32..2f855b5d9ca 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6730,9 +6730,7 @@ static void test_h264_decoder(void) ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); } - todo_wine ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#lx\n", hr); - todo_wine ok(i == 2 || broken(i == 1) /* Win7 */, "%lu input media types\n", i); /* check required input media type attributes */ diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index c84f84ece28..c587b6d185e 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -258,8 +258,27 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %#lx, index %#lx, type %p stub!\n", iface, id, index, type); - return E_NOTIMPL; + IMFMediaType *media_type; + const GUID *subtype; + HRESULT hr; + + TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); + + *type = NULL; + + if (index >= ARRAY_SIZE(h264_decoder_input_types)) + return MF_E_NO_MORE_TYPES; + subtype = h264_decoder_input_types[index]; + + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + + if (SUCCEEDED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video)) && + SUCCEEDED(hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, subtype))) + IMFMediaType_AddRef((*type = media_type)); + + IMFMediaType_Release(media_type); + return hr; } static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,

1 0

Rémi Bernon : winegstreamer: Return S_OK from H264 decoder GetAttributes.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 2d7c37da495cc25d14f5b2761a5d7e2a2111320a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7c37da495cc25d14f5b276… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 12:09:04 2022 +0100 winegstreamer: Return S_OK from H264 decoder GetAttributes. 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(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 -- dlls/winegstreamer/h264_decoder.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index de72ad5a6e7..0b089b74a5f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6665,9 +6665,7 @@ static void test_h264_decoder(void) goto failed; hr = IMFTransform_GetAttributes(transform, &attributes); - todo_wine ok(hr == S_OK, "GetAttributes returned %#lx\n", hr); - if (hr != S_OK) MFCreateAttributes(&attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); ok(hr == S_OK, "SetUINT32 returned %#lx\n", hr); IMFAttributes_Release(attributes); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2fafaea4fff..fdc0d6addeb 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -119,7 +119,7 @@ static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { FIXME("iface %p, attributes %p stub!\n", iface, attributes); - return E_NOTIMPL; + return MFCreateAttributes(attributes, 0); } static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes)

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder SetInputType.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: dfce20f34322e4d4087edf0e5f065ae7a2493151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfce20f34322e4d4087edf0e… Author: Rémi Bernon <rbernon(a)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(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder GetOutputAvailableType.
by Alexandre Julliard March 15, 2022

March 15, 2022

Module: wine Branch: master Commit: 648ea45b810f54e5da69a239a4198c3f48b4c7e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=648ea45b810f54e5da69a239… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 12:09:06 2022 +0100 winegstreamer: Implement H264 decoder GetOutputAvailableType. This adds some todo_wine because we were not enumerating any media type before, and we do now. 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(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 59 +++++++++-------- dlls/winegstreamer/h264_decoder.c | 133 +++++++++++++++++++++++++++++++++++++- 2 files changed, 159 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=648ea45b810f54e5da69…

1 0