Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical.
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+)
diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..45781d3725a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3965,6 +3965,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 },
+ { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5293,6 +5299,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride;
Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical.
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 68278838458..821657f8dd8 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -521,6 +521,7 @@ video_formats[] = {&MFVideoFormat_RGB565, WG_VIDEO_FORMAT_RGB16}, {&MFVideoFormat_AYUV, WG_VIDEO_FORMAT_AYUV}, {&MFVideoFormat_I420, WG_VIDEO_FORMAT_I420}, + {&MFVideoFormat_IYUV, WG_VIDEO_FORMAT_I420}, {&MFVideoFormat_NV12, WG_VIDEO_FORMAT_NV12}, {&MFVideoFormat_UYVY, WG_VIDEO_FORMAT_UYVY}, {&MFVideoFormat_YUY2, WG_VIDEO_FORMAT_YUY2},
Signed-off-by: Zebediah Figura z.figura12@gmail.com
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=88205
Your paranoid android.
=== w2008s64 (32 bit report) ===
mfplat: mfplat.c:0: Test failed: missing manifest for side-by-side dll (details below)
=== w2008s64 (task log) ===
TestLauncher32.exe:error: Unexpected return value 1 from wait for child
=== w2008s64 (64 bit report) ===
mfplat: mfplat.c:0: Test failed: missing manifest for side-by-side dll (details below)
=== w2008s64 (task log) ===
TestLauncher64.exe:error: Unexpected return value 1 from wait for child
-
Connor McAdams -
Marvin -
Zebediah Figura (she/her)