Skip to content

W
wine-winehq
Commit b52a48b9 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

mf/tests: Simplify handling of broken Win7 results.

Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3276ab4a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
dlls/mf/tests/mf.c
View file @ b52a48b9
...@@ -6631,6 +6631,7 @@ static void test_h264_decoder(void) ...@@ -6631,6 +6631,7 @@ static void test_h264_decoder(void)
IMFMediaType *media_type; IMFMediaType *media_type;
IMFTransform *transform; IMFTransform *transform;
DWORD status, length; DWORD status, length;
BOOL is_win7 = FALSE;
ULONG i, ret, flags; ULONG i, ret, flags;
HANDLE output_file; HANDLE output_file;
IMFSample *sample; IMFSample *sample;
...@@ -6741,10 +6742,9 @@ static void test_h264_decoder(void) ...@@ -6741,10 +6742,9 @@ static void test_h264_decoder(void)
winetest_push_context("out %lu", i); winetest_push_context("out %lu", i);
ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr);
check_media_type(media_type, default_outputs[i], -1); check_media_type(media_type, default_outputs[i], -1);
if (FAILED(hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL))) hr = IMFMediaType_GetItem(media_type, &MF_MT_VIDEO_ROTATION, NULL);
check_media_type(media_type, default_outputs_win7[i], -1); is_win7 = broken(FAILED(hr));
else check_media_type(media_type, is_win7 ? default_outputs_win7[i] : default_outputs_extra[i], -1);
check_media_type(media_type, default_outputs_extra[i], -1);
ret = IMFMediaType_Release(media_type); ret = IMFMediaType_Release(media_type);
ok(ret == 0, "Release returned %lu\n", ret); ok(ret == 0, "Release returned %lu\n", ret);
winetest_pop_context(); winetest_pop_context();
...@@ -6772,11 +6772,9 @@ static void test_h264_decoder(void) ...@@ -6772,11 +6772,9 @@ static void test_h264_decoder(void)
init_media_type(media_type, output_type_desc, i + 1); init_media_type(media_type, output_type_desc, i + 1);
} }
hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
if (broken(hr == MF_E_INVALIDMEDIATYPE)) ok(hr == (is_win7 ? MF_E_INVALIDMEDIATYPE : S_OK), "SetOutputType returned %#lx.\n", hr);
{ init_media_type(media_type, is_win7 ? output_type_desc_win7 : output_type_desc, -1);
init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1);
hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
}
ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr);
ret = IMFMediaType_Release(media_type); ret = IMFMediaType_Release(media_type);
ok(ret == 1, "Release returned %lu\n", ret); ok(ret == 1, "Release returned %lu\n", ret);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment