From: Brendan McGrath bmcgrath@codeweavers.com
--- dlls/mfplat/buffer.c | 5 +++++ dlls/mfplat/mediatype.c | 7 +++++++ dlls/mfplat/tests/mfplat.c | 17 ----------------- 3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 65fab78d427..6d59245b40c 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1405,6 +1405,7 @@ static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) return copy_image_imc2;
case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('P','0','1','0'): return copy_image_nv12;
default: @@ -1454,6 +1455,9 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('N','V','1','2'): plane_size = stride * height * 3 / 2; break; + case MAKEFOURCC('P','0','1','0'): + plane_size = width * height * 3; + break; default: plane_size = stride * height; } @@ -1492,6 +1496,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('N','V','1','1'): case MAKEFOURCC('I','4','2','0'): case MAKEFOURCC('I','Y','U','V'): + case MAKEFOURCC('P','0','1','0'): max_length = pitch * height * 3 / 2; break; default: diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 755ef7e2216..10a92ad7464 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2728,6 +2728,7 @@ static struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IYUV, 12, 0, 0, 1, -1 }, { &MFVideoFormat_NV11, 12, 0, 0, 1, -1 }, { &MFVideoFormat_NV12, 12, 0, 0, 1, -1 }, + { &MFVideoFormat_P010, 24, 0, 0, 1, -1 }, { &MFVideoFormat_D16, 16, 3, 0, 0, -1 }, { &MFVideoFormat_L16, 16, 3, 0, 0, -1 }, { &MFVideoFormat_UYVY, 16, 0, 0, 1, -1 }, @@ -2762,6 +2763,7 @@ static struct uncompressed_video_format *mf_get_video_format(const GUID *subtype static unsigned int mf_get_stride_for_format(const struct uncompressed_video_format *format, unsigned int width) { if (format->bpp < 8) return (width * format->bpp) / 8; + else if (IsEqualGUID(format->subtype, &MFVideoFormat_P010)) return width * 2; return (width * (format->bpp / 8) + format->alignment) & ~format->alignment; }
@@ -2831,6 +2833,10 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; + case MAKEFOURCC('P','0','1','0'): + /* width is rounded up to a multiple of two */ + *size = ((width + 1) & ~1) * height * 3; + break; case MAKEFOURCC('N','V','1','1'): *size = ((width + 3) & ~3) * height * 3 / 2; break; @@ -2875,6 +2881,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('I','4','2','0'): case MAKEFOURCC('I','Y','U','V'): case MAKEFOURCC('N','V','1','1'): + case MAKEFOURCC('P','0','1','0'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 386b2d22144..1cdbb6f48ff 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5733,7 +5733,6 @@ static void test_MFCalculateImageSize(void) IsEqualGUID(ptr->subtype, &MFVideoFormat_ABGR32);
hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); - todo_wine_if(i >= 140) ok(hr == S_OK || broken(is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); if (hr == S_OK) { @@ -5769,7 +5768,6 @@ static void test_MFGetPlaneSize(void)
hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); - todo_wine_if(i >= 140) ok(size == plane_size, "%u: unexpected plane size %lu, expected %u. Size %u x %u, format %s.\n", i, size, plane_size, ptr->width, ptr->height, wine_dbgstr_an((char*)&ptr->subtype->Data1, 4)); } @@ -7538,16 +7536,8 @@ static void test_MFCreate2DMediaBuffer(void) winetest_push_context("%u, %u x %u, format %s", i, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype));
hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); - todo_wine_if(i >= 140) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr);
- if (hr != S_OK) - { - skip("P010 is not implemented in wine.\n"); - winetest_pop_context(); - continue; - } - hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(length == ptr->max_length, "Unexpected maximum length %lu.\n", length); @@ -7811,15 +7801,8 @@ static void test_MFCreate2DMediaBuffer(void) continue;
hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); - todo_wine_if(i >= 140) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr);
- if (hr != S_OK) - { - skip("P010 is not implemented in wine.\n"); - continue; - } - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr);