May 2023 - Wine-commits - list.winehq.org

Rémi Bernon : dinput/tests: Test that FromGameController also works with IRawGameController.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: eab7b95babd23654fe5ad57709d3aa9200fe2c61 URL: https://gitlab.winehq.org/wine/wine/-/commit/eab7b95babd23654fe5ad57709d3aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 22 10:52:06 2023 +0200 dinput/tests: Test that FromGameController also works with IRawGameController. --- dlls/dinput/tests/joystick8.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 60bee06479a..e336cc24c6d 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5090,6 +5090,12 @@ static void test_windows_gaming_input(void) ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); IRawGameController_Release( tmp_raw_controller ); + hr = IRawGameControllerStatics_FromGameController( controller_statics, (IGameController *)raw_controller, &tmp_raw_controller ); + ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); + todo_wine + ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); + if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); + IGameController_Release( game_controller ); IRawGameController_Release( raw_controller );

1 0

Rémi Bernon : windows.gaming.input: Query IGameController interface in TryGetFactoryControllerFromGameController.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: c0877844e7602dc542384c19c7b0e191daa2b3da URL: https://gitlab.winehq.org/wine/wine/-/commit/c0877844e7602dc542384c19c7b0e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 22 10:56:51 2023 +0200 windows.gaming.input: Query IGameController interface in TryGetFactoryControllerFromGameController. --- dlls/dinput/tests/hotplug.c | 2 +- dlls/dinput/tests/joystick8.c | 3 +-- dlls/windows.gaming.input/manager.c | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index cd21363770e..7187cf7dc38 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -1184,13 +1184,13 @@ static void test_windows_gaming_input(void) IGameController_Release( tmp_game_controller ); -next: hr = IRawGameControllerStatics_FromGameController( statics, custom_controller.IGameController_outer, &tmp_raw_controller ); ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); todo_wine ok( tmp_raw_controller == raw_controller, "got controller %p\n", tmp_raw_controller ); if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); +next: IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); SetEvent( stop_event ); diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index e336cc24c6d..191e5273e1d 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5092,9 +5092,8 @@ static void test_windows_gaming_input(void) hr = IRawGameControllerStatics_FromGameController( controller_statics, (IGameController *)raw_controller, &tmp_raw_controller ); ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); - todo_wine ok( tmp_raw_controller == raw_controller, "got unexpected IGameController interface\n" ); - if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); + IRawGameController_Release( tmp_raw_controller ); IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index c2567a2fe3e..d54b01d92e3 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -372,14 +372,18 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage IGameController *controller, IGameController **value ) { struct controller *entry, *other; + IGameController *tmp_controller; BOOL found = FALSE; TRACE( "iface %p, factory %p, controller %p, value %p.\n", iface, factory, controller, value ); + /* Spider Man Remastered passes a IRawGameController instead of IGameController, query the iface again */ + if (FAILED(IGameController_QueryInterface( controller, &IID_IGameController, (void **)&tmp_controller ))) goto done; + EnterCriticalSection( &manager_cs ); LIST_FOR_EACH_ENTRY( entry, &controller_list, struct controller, entry ) - if ((found = &entry->IGameController_iface == controller)) break; + if ((found = &entry->IGameController_iface == tmp_controller)) break; if (!found) WARN( "Failed to find controller %p\n", controller ); else @@ -392,6 +396,9 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage LeaveCriticalSection( &manager_cs ); + IGameController_Release( tmp_controller ); + +done: if (!found) *value = NULL; return S_OK; }

1 0

Rémi Bernon : mf/tests: Simplify video processor expected input types checks.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: cb3a2637e4606d636574a5a5908601456961ee24 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb3a2637e4606d636574a5a5908601… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 20:14:37 2023 +0200 mf/tests: Simplify video processor expected input types checks. And fix W11 results. --- dlls/mf/tests/transform.c | 150 +++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 90 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index def0170e106..c3338560383 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6059,63 +6059,44 @@ static void test_video_processor(void) {.subtype = &MFVideoFormat_YVYU}, }, }; - const GUID expect_available_inputs_w8[] = + const struct input_type_desc { - MFVideoFormat_IYUV, - MFVideoFormat_YV12, - MFVideoFormat_NV12, - MFVideoFormat_420O, - MFVideoFormat_UYVY, - MFVideoFormat_YUY2, - MFVideoFormat_P208, - MFVideoFormat_NV11, - MFVideoFormat_AYUV, - MFVideoFormat_ARGB32, - MFVideoFormat_RGB32, - MFVideoFormat_RGB24, - MFVideoFormat_I420, - MFVideoFormat_YVYU, - MFVideoFormat_RGB555, - MFVideoFormat_RGB565, - MFVideoFormat_RGB8, - MFVideoFormat_Y216, - MFVideoFormat_v410, - MFVideoFormat_Y41P, - MFVideoFormat_Y41T, - MFVideoFormat_Y42T, - }; - const GUID expect_available_inputs_w10[] = - { - MFVideoFormat_L8, - MFVideoFormat_L16, - MFAudioFormat_MPEG, - MFVideoFormat_IYUV, - MFVideoFormat_YV12, - MFVideoFormat_NV12, - MFVideoFormat_420O, - MFVideoFormat_P010, - MFVideoFormat_P016, - MFVideoFormat_UYVY, - MFVideoFormat_YUY2, - MFVideoFormat_P208, - MFVideoFormat_NV11, - MFVideoFormat_AYUV, - MFVideoFormat_ARGB32, - MFVideoFormat_ABGR32, - MFVideoFormat_RGB32, - MFVideoFormat_A2R10G10B10, - MFVideoFormat_A16B16G16R16F, - MFVideoFormat_RGB24, - MFVideoFormat_I420, - MFVideoFormat_YVYU, - MFVideoFormat_RGB555, - MFVideoFormat_RGB565, - MFVideoFormat_RGB8, - MFVideoFormat_Y216, - MFVideoFormat_v410, - MFVideoFormat_Y41P, - MFVideoFormat_Y41T, - MFVideoFormat_Y42T, + GUID guid; + BOOL optional; + } + expect_available_inputs[] = + { + {MFVideoFormat_L8, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_L16, .optional = TRUE /* >= W10 */}, + {MFAudioFormat_MPEG, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_IYUV}, + {MFVideoFormat_YV12}, + {MFVideoFormat_NV12}, + {MFVideoFormat_NV21, .optional = TRUE /* >= W11 */}, + {MFVideoFormat_420O}, + {MFVideoFormat_P010, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_P016, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_UYVY}, + {MFVideoFormat_YUY2}, + {MFVideoFormat_P208}, + {MFVideoFormat_NV11}, + {MFVideoFormat_AYUV}, + {MFVideoFormat_ARGB32}, + {MFVideoFormat_ABGR32, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_RGB32}, + {MFVideoFormat_A2R10G10B10, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_A16B16G16R16F, .optional = TRUE /* >= W10 */}, + {MFVideoFormat_RGB24}, + {MFVideoFormat_I420}, + {MFVideoFormat_YVYU}, + {MFVideoFormat_RGB555}, + {MFVideoFormat_RGB565}, + {MFVideoFormat_RGB8}, + {MFVideoFormat_Y216}, + {MFVideoFormat_v410}, + {MFVideoFormat_Y41P}, + {MFVideoFormat_Y41T}, + {MFVideoFormat_Y42T}, }; const GUID expect_available_outputs[] = { @@ -6138,6 +6119,7 @@ static void test_video_processor(void) MFVideoFormat_AYUV, /* some inputs enumerate MFVideoFormat_AYUV after RGB565 */ MFVideoFormat_NV12, /* P010 enumerates NV12 after (A)RGB32 formats */ MFVideoFormat_A16B16G16R16F, /* enumerated with MFVideoFormat_P010 input */ + MFVideoFormat_NV21, /* enumerated with some input formats */ }; static const media_type_desc expect_available_common = { @@ -6246,10 +6228,10 @@ static void test_video_processor(void) MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_I420}; + const struct input_type_desc *expect_input = expect_available_inputs; DWORD i, j, k, flags, length, output_status; IMFSample *input_sample, *output_sample; IMFMediaType *media_type, *media_type2; - const GUID *expect_available_inputs; IMFCollection *output_samples; const BYTE *nv12frame_data; ULONG nv12frame_data_len; @@ -6361,7 +6343,9 @@ static void test_video_processor(void) ok(flags == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected input status %#lx.\n", flags); input_info.cbSize = 0; - if (!IsEqualGUID(&guid, &MFVideoFormat_P208) && !IsEqualGUID(&guid, &MEDIASUBTYPE_Y41T) + if (IsEqualGUID(&guid, &MFVideoFormat_NV21)) + input_info.cbSize = 0x180; + else if (!IsEqualGUID(&guid, &MFVideoFormat_P208) && !IsEqualGUID(&guid, &MEDIASUBTYPE_Y41T) && !IsEqualGUID(&guid, &MEDIASUBTYPE_Y42T)) { hr = MFCalculateImageSize(&guid, 16, 16, (UINT32 *)&input_info.cbSize); @@ -6481,51 +6465,38 @@ static void test_video_processor(void) hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#lx\n", hr); - hr = IMFTransform_GetInputAvailableType(transform, 0, 23, &media_type); - ok(hr == S_OK || hr == MF_E_NO_MORE_TYPES /* w8 */, "GetOutputAvailableType returned %#lx\n", hr); - if (hr == MF_E_NO_MORE_TYPES) - expect_available_inputs = expect_available_inputs_w8; - else - { - hr = IMFTransform_GetInputAvailableType(transform, 0, 27, &media_type); - ok(hr == S_OK || broken(hr == MF_E_NO_MORE_TYPES) /* w1064v1507 */, "GetOutputAvailableType returned %#lx\n", hr); - if (hr == MF_E_NO_MORE_TYPES) - expect_available_inputs = expect_available_inputs_w10 + 3; - else - expect_available_inputs = expect_available_inputs_w10; - } - i = -1; while (SUCCEEDED(hr = IMFTransform_GetInputAvailableType(transform, 0, ++i, &media_type))) { - /* FIXME: Skip exotic input types which aren't directly accepted */ - if (IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_L8) - || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_L16) - || IsEqualGUID(&expect_available_inputs[i], &MFAudioFormat_MPEG) - || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_420O) - || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_A16B16G16R16F) /* w1064v1507 */) - { - IMFMediaType_Release(media_type); - continue; - } - winetest_push_context("in %lu", i); + ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_available_common, -1); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "GetGUID returned %#lx\n", hr); - /* w1064v1507 doesn't expose MFVideoFormat_ABGR32 input */ - if (broken(IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_ABGR32) - && IsEqualGUID(&guid, &MFVideoFormat_RGB32))) - expect_available_inputs++; + while (!IsEqualGUID(&expect_input->guid, &guid)) + { + if (!expect_input->optional) + break; + expect_input++; + } + ok(IsEqualGUID(&expect_input->guid, &guid), "got subtype %s\n", debugstr_guid(&guid)); + expect_input++; - ok(IsEqualGUID(&expect_available_inputs[i], &guid), "got subtype %s\n", debugstr_guid(&guid)); + /* FIXME: Skip exotic input types which aren't directly accepted */ + if (IsEqualGUID(&guid, &MFVideoFormat_L8) || IsEqualGUID(&guid, &MFVideoFormat_L16) + || IsEqualGUID(&guid, &MFAudioFormat_MPEG) || IsEqualGUID(&guid, &MFVideoFormat_420O) + || IsEqualGUID(&guid, &MFVideoFormat_A16B16G16R16F) /* w1064v1507 */) + { + IMFMediaType_Release(media_type); + winetest_pop_context(); + continue; + } hr = IMFTransform_SetInputType(transform, 0, media_type, 0); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr); - hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)actual_width << 32 | actual_height); ok(hr == S_OK, "SetUINT64 returned %#lx.\n", hr); hr = IMFTransform_SetInputType(transform, 0, media_type, 0); @@ -6564,7 +6535,6 @@ static void test_video_processor(void) winetest_pop_context(); } ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#lx\n", hr); - ok(i == 22 || i == 30 || broken(i == 26) /* w1064v1507 */, "%lu input media types\n", i); for (i = 0; i < ARRAY_SIZE(video_processor_tests); i++) {

1 0

Rémi Bernon : mf/tests: Rename some variables in video processor transform tests.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: d4cf74dabf3505246f6d638ad41fe60d3b685ccf URL: https://gitlab.winehq.org/wine/wine/-/commit/d4cf74dabf3505246f6d638ad41fe6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 20:56:39 2023 +0200 mf/tests: Rename some variables in video processor transform tests. --- dlls/mf/tests/resource.rc | 4 +- .../{rgb32frame-vp.bmp => rgb32frame-flip.bmp} | Bin dlls/mf/tests/transform.c | 74 +++++++++------------ 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 10a969ff037..1651d1d4d1e 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -80,8 +80,8 @@ i420frame.bmp RCDATA i420frame.bmp rgb32frame.bmp RCDATA rgb32frame.bmp /* Generated from running the tests on Windows */ -/* @makedep: rgb32frame-vp.bmp */ -rgb32frame-vp.bmp RCDATA rgb32frame-vp.bmp +/* @makedep: rgb32frame-flip.bmp */ +rgb32frame-flip.bmp RCDATA rgb32frame-flip.bmp /* Generated from running the tests on Windows */ /* @makedep: rgb32frame-grabber.bmp */ diff --git a/dlls/mf/tests/rgb32frame-vp.bmp b/dlls/mf/tests/rgb32frame-flip.bmp similarity index 100% rename from dlls/mf/tests/rgb32frame-vp.bmp rename to dlls/mf/tests/rgb32frame-flip.bmp diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c3338560383..ee1cd3d69c0 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5146,7 +5146,7 @@ static void test_wmv_decoder(void) .expect_input_info = &expect_input_info_rgb, .expect_output_info = &expect_output_info_rgb, .output_sample_desc = &output_sample_desc_rgb, - .result_bitmap = L"rgb32frame-vp.bmp", + .result_bitmap = L"rgb32frame-flip.bmp", .delta = 5, }, @@ -5157,7 +5157,7 @@ static void test_wmv_decoder(void) .expect_input_info = &expect_input_info_rgb, .expect_output_info = &expect_output_info_rgb, .output_sample_desc = &output_sample_desc_rgb, - .result_bitmap = L"rgb32frame-vp.bmp", + .result_bitmap = L"rgb32frame-flip.bmp", .delta = 5, }, @@ -5168,7 +5168,7 @@ static void test_wmv_decoder(void) .expect_input_info = &expect_input_info_rgb, .expect_output_info = &expect_output_info_rgb, .output_sample_desc = &output_sample_desc_rgb, - .result_bitmap = L"rgb32frame-vp.bmp", + .result_bitmap = L"rgb32frame-flip.bmp", .delta = 5, }, @@ -5849,7 +5849,7 @@ static void test_color_convert(void) /* YUV -> RGB (negative stride) */ .output_type_desc = output_type_desc_negative_stride, .expect_output_type_desc = expect_output_type_desc_negative_stride, - .result_bitmap = L"rgb32frame-vp.bmp", + .result_bitmap = L"rgb32frame-flip.bmp", .delta = 6, }, @@ -6134,7 +6134,7 @@ static void test_video_processor(void) static const MFVideoArea actual_aperture = {.Area={82,84}}; static const DWORD actual_width = 96, actual_height = 96; - const struct attribute_desc input_type_desc[] = + const struct attribute_desc nv12_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), @@ -6142,7 +6142,7 @@ static void test_video_processor(void) ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; - const struct attribute_desc output_type_desc[] = + const struct attribute_desc rgb32_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), @@ -6150,7 +6150,7 @@ static void test_video_processor(void) ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; - const struct attribute_desc output_type_desc_negative_stride[] = + const struct attribute_desc rgb32_negative_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), @@ -6159,7 +6159,7 @@ static void test_video_processor(void) ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), {0}, }; - const struct attribute_desc output_type_desc_positive_stride[] = + const struct attribute_desc rgb32_positive_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), @@ -6173,57 +6173,48 @@ static void test_video_processor(void) MFT_OUTPUT_STREAM_INFO output_info = {0}; MFT_INPUT_STREAM_INFO input_info = {0}; - const struct buffer_desc output_buffer_desc = - { - .length = actual_width * actual_height * 4, - .compare = compare_rgb32, .dump = dump_rgb32, .rect = {.top = 12, .right = 82, .bottom = 96}, - }; const struct attribute_desc output_sample_attributes[] = { ATTR_UINT32(MFSampleExtension_CleanPoint, 1, .todo = TRUE), {0}, }; - const struct sample_desc output_sample_desc = + const struct buffer_desc rgb32_buffer_desc = + { + .length = actual_width * actual_height * 4, + .compare = compare_rgb32, .dump = dump_rgb32, .rect = {.top = 12, .right = 82, .bottom = 96}, + }; + const struct sample_desc rgb32_sample_desc = { .attributes = output_sample_attributes, .sample_time = 0, .sample_duration = 10000000, - .buffer_count = 1, .buffers = &output_buffer_desc, + .buffer_count = 1, .buffers = &rgb32_buffer_desc, }; const struct transform_desc { + const struct attribute_desc *input_type_desc; const struct attribute_desc *output_type_desc; - const struct attribute_desc *expect_output_type_desc; + const struct sample_desc *output_sample_desc; const WCHAR *result_bitmap; ULONG delta; } video_processor_tests[] = { - { - /* YUV -> RGB */ - .output_type_desc = output_type_desc, - .expect_output_type_desc = output_type_desc, - .result_bitmap = L"rgb32frame-vp.bmp", + .input_type_desc = nv12_default_stride, .output_type_desc = rgb32_default_stride, + .output_sample_desc = &rgb32_sample_desc, .result_bitmap = L"rgb32frame-flip.bmp", .delta = 2, /* Windows returns 0, Wine needs 2 */ }, - { - /* YUV -> RGB (negative stride) */ - .output_type_desc = output_type_desc_negative_stride, - .expect_output_type_desc = output_type_desc_negative_stride, - .result_bitmap = L"rgb32frame-vp.bmp", + .input_type_desc = nv12_default_stride, .output_type_desc = rgb32_negative_stride, + .output_sample_desc = &rgb32_sample_desc, .result_bitmap = L"rgb32frame-flip.bmp", .delta = 2, /* Windows returns 0, Wine needs 2 */ }, - { - /* YUV -> RGB (positive stride) */ - .output_type_desc = output_type_desc_positive_stride, - .expect_output_type_desc = output_type_desc_positive_stride, - .result_bitmap = L"rgb32frame.bmp", + .input_type_desc = nv12_default_stride, .output_type_desc = rgb32_positive_stride, + .output_sample_desc = &rgb32_sample_desc, .result_bitmap = L"rgb32frame.bmp", .delta = 6, }, - }; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6538,15 +6529,17 @@ static void test_video_processor(void) for (i = 0; i < ARRAY_SIZE(video_processor_tests); i++) { + const struct transform_desc *test = video_processor_tests + i; + winetest_push_context("transform #%lu", i); - check_mft_set_input_type_required(transform, input_type_desc); - check_mft_set_input_type(transform, input_type_desc); - check_mft_get_input_current_type(transform, input_type_desc); + check_mft_set_input_type_required(transform, test->input_type_desc); + check_mft_set_input_type(transform, test->input_type_desc); + check_mft_get_input_current_type(transform, test->input_type_desc); - check_mft_set_output_type_required(transform, video_processor_tests[i].output_type_desc); - check_mft_set_output_type(transform, video_processor_tests[i].output_type_desc, S_OK); - check_mft_get_output_current_type(transform, video_processor_tests[i].output_type_desc); + check_mft_set_output_type_required(transform, test->output_type_desc); + check_mft_set_output_type(transform, test->output_type_desc, S_OK); + check_mft_get_output_current_type(transform, test->output_type_desc); input_info.cbSize = actual_width * actual_height * 3 / 2; output_info.cbSize = actual_width * actual_height * 4; @@ -6594,9 +6587,8 @@ static void test_video_processor(void) ref = IMFSample_Release(output_sample); ok(ref == 1, "Release returned %ld\n", ref); - ret = check_mf_sample_collection(output_samples, &output_sample_desc, - video_processor_tests[i].result_bitmap); - ok(ret <= video_processor_tests[i].delta + ret = check_mf_sample_collection(output_samples, test->output_sample_desc, test->result_bitmap); + ok(ret <= test->delta /* w1064v1507 / w1064v1809 incorrectly rescale */ || broken(ret == 25) || broken(ret == 32), "got %lu%% diff\n", ret);

1 0

Rémi Bernon : mf/tests: Move broken video processor aperture to a separate test.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: db1e98a639af50d8136168fabb62923e5a1641a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/db1e98a639af50d8136168fabb6292… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 20:59:09 2023 +0200 mf/tests: Move broken video processor aperture to a separate test. --- dlls/mf/tests/transform.c | 61 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ee1cd3d69c0..1bc618f63f7 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6134,12 +6134,19 @@ static void test_video_processor(void) static const MFVideoArea actual_aperture = {.Area={82,84}}; static const DWORD actual_width = 96, actual_height = 96; + const struct attribute_desc rgb32_with_aperture[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + {0}, + }; const struct attribute_desc nv12_default_stride[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; const struct attribute_desc rgb32_default_stride[] = @@ -6147,7 +6154,6 @@ static void test_video_processor(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), {0}, }; const struct attribute_desc rgb32_negative_stride[] = @@ -6155,7 +6161,6 @@ static void test_video_processor(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), ATTR_UINT32(MF_MT_DEFAULT_STRIDE, -actual_width * 4), {0}, }; @@ -6164,7 +6169,6 @@ static void test_video_processor(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 4), {0}, }; @@ -6197,6 +6201,7 @@ static void test_video_processor(void) const struct sample_desc *output_sample_desc; const WCHAR *result_bitmap; ULONG delta; + BOOL broken; } video_processor_tests[] = { @@ -6215,6 +6220,11 @@ static void test_video_processor(void) .output_sample_desc = &rgb32_sample_desc, .result_bitmap = L"rgb32frame.bmp", .delta = 6, }, + { + .input_type_desc = rgb32_with_aperture, .output_type_desc = rgb32_with_aperture, + .output_sample_desc = &rgb32_sample_desc, .result_bitmap = L"rgb32frame.bmp", + .broken = TRUE /* old Windows version incorrectly rescale */ + }, }; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6224,10 +6234,10 @@ static void test_video_processor(void) IMFSample *input_sample, *output_sample; IMFMediaType *media_type, *media_type2; IMFCollection *output_samples; - const BYTE *nv12frame_data; - ULONG nv12frame_data_len; IMFTransform *transform; IMFMediaBuffer *buffer; + const BYTE *input_data; + ULONG input_data_len; UINT32 count; HRESULT hr; ULONG ret; @@ -6541,19 +6551,35 @@ static void test_video_processor(void) check_mft_set_output_type(transform, test->output_type_desc, S_OK); check_mft_get_output_current_type(transform, test->output_type_desc); - input_info.cbSize = actual_width * actual_height * 3 / 2; output_info.cbSize = actual_width * actual_height * 4; - check_mft_get_input_stream_info(transform, S_OK, &input_info); check_mft_get_output_stream_info(transform, S_OK, &output_info); - load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); - /* skip BMP header and RGB data from the dump */ - length = *(DWORD *)(nv12frame_data + 2); - nv12frame_data_len = nv12frame_data_len - length; - nv12frame_data = nv12frame_data + length; - ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); + if (test->input_type_desc == nv12_default_stride) + { + input_info.cbSize = actual_width * actual_height * 3 / 2; + check_mft_get_input_stream_info(transform, S_OK, &input_info); - input_sample = create_sample(nv12frame_data, nv12frame_data_len); + load_resource(L"nv12frame.bmp", &input_data, &input_data_len); + /* skip BMP header and RGB data from the dump */ + length = *(DWORD *)(input_data + 2); + input_data_len = input_data_len - length; + ok(input_data_len == 13824, "got length %lu\n", input_data_len); + input_data = input_data + length; + } + else + { + input_info.cbSize = actual_width * actual_height * 4; + check_mft_get_input_stream_info(transform, S_OK, &input_info); + + load_resource(L"rgb32frame.bmp", &input_data, &input_data_len); + /* skip BMP header and RGB data from the dump */ + length = *(DWORD *)(input_data + 2 + 2 * sizeof(DWORD)); + input_data_len -= length; + ok(input_data_len == 36864, "got length %lu\n", input_data_len); + input_data += length; + } + + input_sample = create_sample(input_data, input_data_len); hr = IMFSample_SetSampleTime(input_sample, 0); ok(hr == S_OK, "SetSampleTime returned %#lx\n", hr); hr = IMFSample_SetSampleDuration(input_sample, 10000000); @@ -6588,10 +6614,7 @@ static void test_video_processor(void) ok(ref == 1, "Release returned %ld\n", ref); ret = check_mf_sample_collection(output_samples, test->output_sample_desc, test->result_bitmap); - ok(ret <= test->delta - /* w1064v1507 / w1064v1809 incorrectly rescale */ - || broken(ret == 25) || broken(ret == 32), - "got %lu%% diff\n", ret); + ok(ret <= test->delta || broken(test->broken), "got %lu%% diff\n", ret); IMFCollection_Release(output_samples); output_sample = create_sample(NULL, output_info.cbSize);

1 0

Rémi Bernon : mf/tests: Add more video processor tests with RGB555 format.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 8d699e5a14b6956ddcd9662f5f4b06fff21ecfb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d699e5a14b6956ddcd9662f5f4b06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 21:12:42 2023 +0200 mf/tests: Add more video processor tests with RGB555 format. --- dlls/mf/tests/mf_test.h | 2 + dlls/mf/tests/nv12frame-flip.bmp | Bin 0 -> 50742 bytes dlls/mf/tests/resource.rc | 12 +++ dlls/mf/tests/rgb555frame-flip.bmp | Bin 0 -> 18486 bytes dlls/mf/tests/rgb555frame.bmp | Bin 0 -> 18486 bytes dlls/mf/tests/transform.c | 165 ++++++++++++++++++++++++++++++++++--- 6 files changed, 168 insertions(+), 11 deletions(-)

1 0

Rémi Bernon : mf/tests: Add some IV50 encoder / decoder tests.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 5a74f001ac1f659487e73b9add82c22a97cc1f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/5a74f001ac1f659487e73b9add82c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 19:40:48 2023 +0200 mf/tests: Add some IV50 encoder / decoder tests. --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/iv50frame.bin | Bin 0 -> 744 bytes dlls/mf/tests/mf_test.h | 2 + dlls/mf/tests/resource.rc | 8 ++ dlls/mf/tests/rgb24frame.bmp | Bin 0 -> 27702 bytes dlls/mf/tests/transform.c | 207 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 218 insertions(+), 1 deletion(-)

1 0

Ziqing Hui : mf/tests: Test GetInputStatus for WMV decoder DMO.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: ebd3bbc6c891f84f4b9b01353d45f2953a551eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/ebd3bbc6c891f84f4b9b01353d45f2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 11:56:14 2023 +0800 mf/tests: Test GetInputStatus for WMV decoder DMO. --- dlls/mf/tests/transform.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index a18aec15b07..f6995b4287e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5578,6 +5578,27 @@ static void test_wmv_decoder_media_object(void) diff = check_dmo_output_data_buffer(&output_data_buffer, &output_buffer_desc_nv12, L"nv12frame.bmp", 0, 0); ok(diff == 0, "Got %lu%% diff.\n", diff); + /* Test GetInputStatus. */ + hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, NULL); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); + + status = 0xdeadbeef; + hr = IMediaObject_GetInputStatus(media_object, 0xdeadbeef, &status); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputStatus returned %#lx.\n", hr); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); + + hr = IMediaObject_GetInputStatus(media_object, 0, NULL); + todo_wine + ok(hr == E_POINTER, "GetInputStatus returned %#lx.\n", hr); + + hr = IMediaObject_GetInputStatus(media_object, 0, &status); + todo_wine + ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); + todo_wine + ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0

Ziqing Hui : mf/tests: Test Discontinuity for WMV decoder DMO.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 4f22db5b9f6fc5f9b2234e466cd2ae1f4d193f1d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f22db5b9f6fc5f9b2234e466cd2ae… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:15:34 2023 +0800 mf/tests: Test Discontinuity for WMV decoder DMO. The tests show that input status is not affected by it. --- dlls/mf/tests/transform.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f6995b4287e..ddb82249ffc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5599,6 +5599,22 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test Discontinuity. */ + hr = IMediaObject_Discontinuity(media_object, 0xdeadbeef); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_Discontinuity(media_object, 0); + todo_wine + ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_Discontinuity(media_object, 0); + todo_wine + ok(hr == S_OK, "Discontinuity returned %#lx.\n", hr); + hr = IMediaObject_GetInputStatus(media_object, 0, &status); + todo_wine + ok(hr == S_OK, "GetInputStatus returned %#lx.\n", hr); + todo_wine + ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0

Ziqing Hui : mf/tests: Test Flush for WMV decoder DMO.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: b7e4b5247b6ac8213f1bc02645a4e5eabee00011 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7e4b5247b6ac8213f1bc02645a4e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue May 23 12:00:05 2023 +0800 mf/tests: Test Flush for WMV decoder DMO. --- dlls/mf/tests/transform.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ddb82249ffc..70bd2195521 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -5615,6 +5615,26 @@ static void test_wmv_decoder_media_object(void) todo_wine ok(status == DMO_INPUT_STATUSF_ACCEPT_DATA, "Unexpected status %#lx.\n", status); + /* Test Flush. */ + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); + hr = IMediaObject_Flush(media_object); + todo_wine + ok(hr == S_OK, "Flush returned %#lx.\n", hr); + hr = IMediaObject_Flush(media_object); + todo_wine + ok(hr == S_OK, "Flush returned %#lx.\n", hr); + output_media_buffer->length = 0; + output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; + output_data_buffer.dwStatus = 0xdeadbeef; + output_data_buffer.rtTimestamp = 0xdeadbeef; + output_data_buffer.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); + todo_wine + ok(hr == S_FALSE, "ProcessOutput returned %#lx.\n", hr); + todo_wine + ok(output_media_buffer->length == 0, "Unexpected length %#lx.\n", output_media_buffer->length); + /* Test ProcessOutput with setting framerate. */ init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); ((VIDEOINFOHEADER *)type->pbFormat)->AvgTimePerFrame = 100000;

1 0