Skip to content

W
wine-cw
Commit 41184e9d authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

winegstreamer: Implement ColorConvertDMO transform.

Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com>
parent 5b178b2f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 41 deletions
dlls/mf/tests/mf.c
View file @ 41184e9d
...@@ -8027,10 +8027,8 @@ static void test_color_convert(void) ...@@ -8027,10 +8027,8 @@ static void test_color_convert(void)
/* check default media types */ /* check default media types */
hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info);
todo_wine
ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#lx\n", hr); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetInputStreamInfo returned %#lx\n", hr);
hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info);
todo_wine
ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#lx\n", hr); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "GetOutputStreamInfo returned %#lx\n", hr);
i = -1; i = -1;
...@@ -8044,9 +8042,7 @@ static void test_color_convert(void) ...@@ -8044,9 +8042,7 @@ static void test_color_convert(void)
ok(ret == 0, "Release returned %lu\n", ret); ok(ret == 0, "Release returned %lu\n", ret);
winetest_pop_context(); winetest_pop_context();
} }
todo_wine
ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#lx\n", hr); ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#lx\n", hr);
todo_wine
ok(i == 16, "%lu output media types\n", i); ok(i == 16, "%lu output media types\n", i);
i = -1; i = -1;
...@@ -8068,9 +8064,7 @@ static void test_color_convert(void) ...@@ -8068,9 +8064,7 @@ static void test_color_convert(void)
ok(ret == 0, "Release returned %lu\n", ret); ok(ret == 0, "Release returned %lu\n", ret);
winetest_pop_context(); winetest_pop_context();
} }
todo_wine
ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#lx\n", hr); ok(hr == MF_E_NO_MORE_TYPES, "GetInputAvailableType returned %#lx\n", hr);
todo_wine
ok(i == 20, "%lu input media types\n", i); ok(i == 20, "%lu input media types\n", i);
/* check required output media type attributes */ /* check required output media type attributes */
...@@ -8078,22 +8072,18 @@ static void test_color_convert(void) ...@@ -8078,22 +8072,18 @@ static void test_color_convert(void)
hr = MFCreateMediaType(&media_type); hr = MFCreateMediaType(&media_type);
ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr);
hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
todo_wine
ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#lx.\n", hr); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#lx.\n", hr);
init_media_type(media_type, output_type_desc, 1); init_media_type(media_type, output_type_desc, 1);
hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
todo_wine
ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#lx.\n", hr); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#lx.\n", hr);
init_media_type(media_type, output_type_desc, 2); init_media_type(media_type, output_type_desc, 2);
for (i = 2; i < ARRAY_SIZE(output_type_desc) - 1; ++i) for (i = 2; i < ARRAY_SIZE(output_type_desc) - 1; ++i)
{ {
hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0);
todo_wine
ok(hr == E_INVALIDARG, "SetOutputType returned %#lx.\n", hr); ok(hr == E_INVALIDARG, "SetOutputType returned %#lx.\n", hr);
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);
todo_wine
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 == 0, "Release returned %lu\n", ret); ok(ret == 0, "Release returned %lu\n", ret);
...@@ -8103,50 +8093,36 @@ static void test_color_convert(void) ...@@ -8103,50 +8093,36 @@ static void test_color_convert(void)
hr = MFCreateMediaType(&media_type); hr = MFCreateMediaType(&media_type);
ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr);
hr = IMFTransform_SetInputType(transform, 0, media_type, 0); hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
todo_wine
ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr);
init_media_type(media_type, input_type_desc, 1); init_media_type(media_type, input_type_desc, 1);
hr = IMFTransform_SetInputType(transform, 0, media_type, 0); hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
todo_wine
ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr); ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetInputType returned %#lx.\n", hr);
init_media_type(media_type, input_type_desc, 2); init_media_type(media_type, input_type_desc, 2);
for (i = 2; i < ARRAY_SIZE(input_type_desc) - 1; ++i) for (i = 2; i < ARRAY_SIZE(input_type_desc) - 1; ++i)
{ {
hr = IMFTransform_SetInputType(transform, 0, media_type, 0); hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
todo_wine
ok(hr == E_INVALIDARG, "SetInputType returned %#lx.\n", hr); ok(hr == E_INVALIDARG, "SetInputType returned %#lx.\n", hr);
init_media_type(media_type, input_type_desc, i + 1); init_media_type(media_type, input_type_desc, i + 1);
} }
hr = IMFTransform_SetInputType(transform, 0, media_type, 0); hr = IMFTransform_SetInputType(transform, 0, media_type, 0);
todo_wine
ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); ok(hr == S_OK, "SetInputType returned %#lx.\n", hr);
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);
memset(&input_info, 0xcd, sizeof(input_info)); memset(&input_info, 0xcd, sizeof(input_info));
hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info);
todo_wine
ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr);
todo_wine
ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency));
todo_wine
ok(input_info.dwFlags == 0, "got dwFlags %#lx\n", input_info.dwFlags); ok(input_info.dwFlags == 0, "got dwFlags %#lx\n", input_info.dwFlags);
todo_wine
ok(input_info.cbSize == actual_width * actual_height * 3 / 2, "got cbSize %#lx\n", input_info.cbSize); ok(input_info.cbSize == actual_width * actual_height * 3 / 2, "got cbSize %#lx\n", input_info.cbSize);
todo_wine
ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead);
todo_wine
ok(input_info.cbAlignment == 1, "got cbAlignment %#lx\n", input_info.cbAlignment); ok(input_info.cbAlignment == 1, "got cbAlignment %#lx\n", input_info.cbAlignment);
memset(&output_info, 0xcd, sizeof(output_info)); memset(&output_info, 0xcd, sizeof(output_info));
hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info);
todo_wine
ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr);
todo_wine
ok(output_info.dwFlags == 0, "got dwFlags %#lx\n", output_info.dwFlags); ok(output_info.dwFlags == 0, "got dwFlags %#lx\n", output_info.dwFlags);
todo_wine
ok(output_info.cbSize == actual_width * actual_height * 4, "got cbSize %#lx\n", output_info.cbSize); ok(output_info.cbSize == actual_width * actual_height * 4, "got cbSize %#lx\n", output_info.cbSize);
todo_wine
ok(output_info.cbAlignment == 1, "got cbAlignment %#lx\n", output_info.cbAlignment); ok(output_info.cbAlignment == 1, "got cbAlignment %#lx\n", output_info.cbAlignment);
resource = FindResourceW(NULL, L"nv12frame.bin", (const WCHAR *)RT_RCDATA); resource = FindResourceW(NULL, L"nv12frame.bin", (const WCHAR *)RT_RCDATA);
...@@ -8161,13 +8137,10 @@ static void test_color_convert(void) ...@@ -8161,13 +8137,10 @@ static void test_color_convert(void)
hr = IMFSample_SetSampleDuration(sample, 10000000); hr = IMFSample_SetSampleDuration(sample, 10000000);
ok(hr == S_OK, "SetSampleDuration returned %#lx\n", hr); ok(hr == S_OK, "SetSampleDuration returned %#lx\n", hr);
hr = IMFTransform_ProcessInput(transform, 0, sample, 0); hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
todo_wine
ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ok(hr == S_OK, "ProcessInput returned %#lx\n", hr);
hr = IMFTransform_ProcessInput(transform, 0, sample, 0); hr = IMFTransform_ProcessInput(transform, 0, sample, 0);
todo_wine
ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr); ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr);
hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0);
todo_wine
ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr);
IMFSample_Release(sample); IMFSample_Release(sample);
...@@ -8175,9 +8148,7 @@ static void test_color_convert(void) ...@@ -8175,9 +8148,7 @@ static void test_color_convert(void)
ok(resource != 0, "FindResourceW failed, error %lu\n", GetLastError()); ok(resource != 0, "FindResourceW failed, error %lu\n", GetLastError());
rgb32_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); rgb32_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource));
rgb32_data_len = SizeofResource(GetModuleHandleW(NULL), resource); rgb32_data_len = SizeofResource(GetModuleHandleW(NULL), resource);
todo_wine
ok(rgb32_data_len == output_info.cbSize, "got length %lu\n", rgb32_data_len); ok(rgb32_data_len == output_info.cbSize, "got length %lu\n", rgb32_data_len);
if (rgb32_data_len != output_info.cbSize) output_info.cbSize = actual_width * actual_height * 4;
/* and generate a new one as well in a temporary directory */ /* and generate a new one as well in a temporary directory */
GetTempPathW(ARRAY_SIZE(output_path), output_path); GetTempPathW(ARRAY_SIZE(output_path), output_path);
...@@ -8190,29 +8161,21 @@ static void test_color_convert(void) ...@@ -8190,29 +8161,21 @@ static void test_color_convert(void)
memset(&output, 0, sizeof(output)); memset(&output, 0, sizeof(output));
output.pSample = sample; output.pSample = sample;
hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status);
todo_wine
ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr);
ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.pSample == sample, "got pSample %p\n", output.pSample);
ok(output.dwStatus == 0 || broken(output.dwStatus == 6) /* win7 */, "got dwStatus %#lx\n", output.dwStatus); ok(output.dwStatus == 0 || broken(output.dwStatus == 6) /* win7 */, "got dwStatus %#lx\n", output.dwStatus);
todo_wine
ok(status == 0, "got status %#lx\n", status); ok(status == 0, "got status %#lx\n", status);
hr = IMFSample_GetSampleTime(sample, &time); hr = IMFSample_GetSampleTime(sample, &time);
todo_wine
ok(hr == S_OK, "GetSampleTime returned %#lx\n", hr); ok(hr == S_OK, "GetSampleTime returned %#lx\n", hr);
todo_wine
ok(time == 0, "got time %I64d\n", time); ok(time == 0, "got time %I64d\n", time);
hr = IMFSample_GetSampleDuration(sample, &duration); hr = IMFSample_GetSampleDuration(sample, &duration);
todo_wine
ok(hr == S_OK, "GetSampleDuration returned %#lx\n", hr); ok(hr == S_OK, "GetSampleDuration returned %#lx\n", hr);
todo_wine
ok(duration == 10000000, "got duration %I64d\n", duration); ok(duration == 10000000, "got duration %I64d\n", duration);
hr = IMFSample_GetTotalLength(sample, &length); hr = IMFSample_GetTotalLength(sample, &length);
ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr);
todo_wine
ok(length == output_info.cbSize, "got length %lu\n", length); ok(length == output_info.cbSize, "got length %lu\n", length);
if (length == output_info.cbSize) check_sample_rgb32(sample, rgb32_data, output_file);
check_sample_rgb32(sample, rgb32_data, output_file);
rgb32_data_len -= output_info.cbSize; rgb32_data_len -= output_info.cbSize;
rgb32_data += output_info.cbSize; rgb32_data += output_info.cbSize;
...@@ -8227,11 +8190,9 @@ static void test_color_convert(void) ...@@ -8227,11 +8190,9 @@ static void test_color_convert(void)
memset(&output, 0, sizeof(output)); memset(&output, 0, sizeof(output));
output.pSample = sample; output.pSample = sample;
hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status);
todo_wine
ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr);
ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.pSample == sample, "got pSample %p\n", output.pSample);
ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus);
todo_wine
ok(status == 0, "got status %#lx\n", status); ok(status == 0, "got status %#lx\n", status);
hr = IMFSample_GetTotalLength(sample, &length); hr = IMFSample_GetTotalLength(sample, &length);
ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr);
......
dlls/winegstreamer/wg_transform.c
View file @ 41184e9d
...@@ -406,8 +406,8 @@ NTSTATUS wg_transform_create(void *args) ...@@ -406,8 +406,8 @@ NTSTATUS wg_transform_create(void *args)
break; break;
case WG_MAJOR_TYPE_AUDIO: case WG_MAJOR_TYPE_AUDIO:
break;
case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_VIDEO:
break;
case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_UNKNOWN:
GST_FIXME("Format %u not implemented!", input_format.major_type); GST_FIXME("Format %u not implemented!", input_format.major_type);
gst_caps_unref(raw_caps); gst_caps_unref(raw_caps);
......
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