[PATCH v2 0/6] MR8280: ir50_32: Various, part 1/2.
-- v2: ir50_32: Suggest 24-bit RGB. ir50_32: Return ICERR_OK from ICM_DECOMPRESS_END. ir50_32: Do not handle a NULL input pointer in ICM_DECOMPRESS_GET_FORMAT. ir50_32: Use case-insensitive comparison for the compression fourcc. ir50_32/tests: Move compression and decompression tests from mf:transform. https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/ir50_32/tests/Makefile.in | 5 ++ dlls/ir50_32/tests/ir50_32.c | 149 +++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 dlls/ir50_32/tests/Makefile.in create mode 100644 dlls/ir50_32/tests/ir50_32.c diff --git a/configure b/configure index 681195a4c91..6346b6e96f2 100755 --- a/configure +++ b/configure @@ -22500,6 +22500,7 @@ wine_fn_config_makefile dlls/iphlpapi enable_iphlpapi wine_fn_config_makefile dlls/iphlpapi/tests enable_tests wine_fn_config_makefile dlls/iprop enable_iprop wine_fn_config_makefile dlls/ir50_32 enable_ir50_32 +wine_fn_config_makefile dlls/ir50_32/tests enable_tests wine_fn_config_makefile dlls/irprops.cpl enable_irprops_cpl wine_fn_config_makefile dlls/itircl enable_itircl wine_fn_config_makefile dlls/itss enable_itss diff --git a/configure.ac b/configure.ac index 848d8329554..1f64396a6e0 100644 --- a/configure.ac +++ b/configure.ac @@ -2790,6 +2790,7 @@ WINE_CONFIG_MAKEFILE(dlls/iphlpapi) WINE_CONFIG_MAKEFILE(dlls/iphlpapi/tests) WINE_CONFIG_MAKEFILE(dlls/iprop) WINE_CONFIG_MAKEFILE(dlls/ir50_32) +WINE_CONFIG_MAKEFILE(dlls/ir50_32/tests) WINE_CONFIG_MAKEFILE(dlls/irprops.cpl) WINE_CONFIG_MAKEFILE(dlls/itircl) WINE_CONFIG_MAKEFILE(dlls/itss) diff --git a/dlls/ir50_32/tests/Makefile.in b/dlls/ir50_32/tests/Makefile.in new file mode 100644 index 00000000000..6be99cf493e --- /dev/null +++ b/dlls/ir50_32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = ir50_32.dll +IMPORTS = msvfw32 + +SOURCES = \ + ir50_32.c diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c new file mode 100644 index 00000000000..c5820fb312f --- /dev/null +++ b/dlls/ir50_32/tests/ir50_32.c @@ -0,0 +1,149 @@ +/* + * Copyright 2025 Elizabeth Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <wingdi.h> +#include <vfw.h> +#include "wine/test.h" + +static void test_formats(void) +{ + char buffer[offsetof(BITMAPINFO, bmiColors[256])]; + BITMAPINFOHEADER in = {.biSize = sizeof(BITMAPINFOHEADER)}; + BITMAPINFO *out = (BITMAPINFO *)buffer; + LRESULT ret; + ICINFO info; + HIC hic; + + in.biCompression = mmioFOURCC('i','v','5','0'); + + hic = ICLocate(ICTYPE_VIDEO, mmioFOURCC('i','v','5','0'), &in, NULL, ICMODE_DECOMPRESS); + todo_wine ok(!!hic, "Failed to open codec.\n"); + if (!hic) + return; + + ret = ICGetInfo(hic, &info, sizeof(info)); + ok(ret == sizeof(info), "Got %Id.\n", ret); + ok(info.dwSize == sizeof(info), "Got size %lu.\n", info.dwSize); + ok(info.fccType == ICTYPE_VIDEO, "Got type %#lx.\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('I','V','5','0'), "Got handler %#lx.\n", info.fccHandler); + todo_wine ok(info.dwFlags == (VIDCF_QUALITY | VIDCF_CRUNCH | VIDCF_TEMPORAL | VIDCF_COMPRESSFRAMES | VIDCF_FASTTEMPORALC), + "Got flags %#lx.\n", info.dwFlags); + todo_wine ok(info.dwVersion == 0x32, "Got version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got ICM version %#lx.\n", info.dwVersionICM); + + ret = ICDecompressQuery(hic, &in, NULL); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + + ret = ICDecompressGetFormat(hic, &in, NULL); + todo_wine ok(ret == offsetof(BITMAPINFO, bmiColors[256]), "Got %Id.\n", ret); + + in.biWidth = 320; + in.biHeight = 240; + in.biXPelsPerMeter = 12; + in.biYPelsPerMeter = 34; + in.biClrUsed = 111; + in.biClrImportant = 111; + + memset(buffer, 0xcc, sizeof(buffer)); + ret = ICDecompressGetFormat(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + ok(out->bmiHeader.biSize == sizeof(BITMAPINFOHEADER), "Got size %lu.\n", out->bmiHeader.biSize); + ok(out->bmiHeader.biWidth == 320, "Got width %ld.\n", out->bmiHeader.biWidth); + ok(out->bmiHeader.biHeight == 240, "Got height %ld.\n", out->bmiHeader.biHeight); + todo_wine ok(out->bmiHeader.biPlanes == 1, "Got %u planes.\n", out->bmiHeader.biPlanes); + todo_wine ok(out->bmiHeader.biBitCount == 24, "Got depth %u.\n", out->bmiHeader.biBitCount); + ok(out->bmiHeader.biCompression == BI_RGB, "Got compression %#lx.\n", out->bmiHeader.biCompression); + todo_wine ok(out->bmiHeader.biSizeImage == 320 * 240 * 3, "Got image size %lu.\n", out->bmiHeader.biSizeImage); + todo_wine ok(!out->bmiHeader.biXPelsPerMeter, "Got horizontal resolution %ld.\n", out->bmiHeader.biXPelsPerMeter); + todo_wine ok(!out->bmiHeader.biYPelsPerMeter, "Got vertical resolution %ld.\n", out->bmiHeader.biYPelsPerMeter); + todo_wine ok(!out->bmiHeader.biClrUsed, "Got %lu used colours.\n", out->bmiHeader.biClrUsed); + todo_wine ok(!out->bmiHeader.biClrImportant, "Got %lu important colours.\n", out->bmiHeader.biClrImportant); + ok(out->bmiColors[0].rgbRed == 0xcc, "Expected colours to be unmodified.\n"); + + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + + out->bmiHeader.biHeight = -240; + out->bmiHeader.biSizeImage = 0; + out->bmiHeader.biPlanes = 0; + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + + out->bmiHeader.biHeight = -480; + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_BADPARAM, "Got %Id.\n", ret); + out->bmiHeader.biHeight = -240; + + out->bmiHeader.biWidth = 640; + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_BADPARAM, "Got %Id.\n", ret); + out->bmiHeader.biWidth = 320; + + out->bmiHeader.biBitCount = 8; + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + out->bmiHeader.biBitCount = 16; + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + out->bmiHeader.biBitCount = 32; + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + + out->bmiHeader.biBitCount = 16; + out->bmiHeader.biCompression = BI_BITFIELDS; + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_BADFORMAT, "Got %Id.\n", ret); + ((DWORD *)&out->bmiColors[0])[0] = 0xf800; + ((DWORD *)&out->bmiColors[0])[1] = 0x07e0; + ((DWORD *)&out->bmiColors[0])[2] = 0x001f; + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + + out->bmiHeader.biCompression = mmioFOURCC('C','L','J','R'); + out->bmiHeader.biBitCount = 8; + ret = ICDecompressQuery(hic, &in, out); + ok(ret == ICERR_BADFORMAT, "Got %Id.\n", ret); + + out->bmiHeader.biBitCount = 16; + out->bmiHeader.biCompression = mmioFOURCC('U','Y','V','Y'); + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + out->bmiHeader.biCompression = mmioFOURCC('Y','U','Y','2'); + ret = ICDecompressQuery(hic, &in, out); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + + ret = ICDecompressEnd(hic); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + + out->bmiHeader.biCompression = BI_RGB; + out->bmiHeader.biBitCount = 24; + ret = ICDecompressBegin(hic, &in, out); + ok(ret == ICERR_OK, "Got %Id.\n", ret); + + ret = ICDecompressEnd(hic); + todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + + ret = ICClose(hic); + ok(!ret, "Got %Id.\n", ret); +} + +START_TEST(ir50_32) +{ + test_formats(); +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> This is a more natural and findable place for them. Compression byte check is dropped since even different Windows versions don't seem to produce the same compressed bytes, and a reimplementation certainly won't. --- dlls/ir50_32/tests/Makefile.in | 3 +- dlls/ir50_32/tests/ir50_32.c | 127 +++++++++++++++ dlls/{mf => ir50_32}/tests/iv50frame.bin | Bin dlls/ir50_32/tests/resource.rc | 26 +++ dlls/ir50_32/tests/rgb24frame.bmp | Bin 0 -> 27702 bytes dlls/mf/tests/resource.rc | 4 - dlls/mf/tests/transform.c | 196 ----------------------- 7 files changed, 155 insertions(+), 201 deletions(-) rename dlls/{mf => ir50_32}/tests/iv50frame.bin (100%) create mode 100644 dlls/ir50_32/tests/resource.rc create mode 100644 dlls/ir50_32/tests/rgb24frame.bmp diff --git a/dlls/ir50_32/tests/Makefile.in b/dlls/ir50_32/tests/Makefile.in index 6be99cf493e..504377f6941 100644 --- a/dlls/ir50_32/tests/Makefile.in +++ b/dlls/ir50_32/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = ir50_32.dll IMPORTS = msvfw32 SOURCES = \ - ir50_32.c + ir50_32.c \ + resource.rc diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c index c5820fb312f..1321b8c877a 100644 --- a/dlls/ir50_32/tests/ir50_32.c +++ b/dlls/ir50_32/tests/ir50_32.c @@ -143,7 +143,134 @@ static void test_formats(void) ok(!ret, "Got %Id.\n", ret); } +static void test_compress(void) +{ + const void *res_data, *rgb_data; + BITMAPINFO rgb_info, iv50_info; + BYTE iv50_data[0x5100]; + HRSRC resource; + LRESULT ret; + DWORD flags; + HIC hic; + + resource = FindResourceW(NULL, L"rgb24frame.bmp", (const WCHAR *)RT_RCDATA); + res_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + memcpy(&rgb_info, ((BITMAPFILEHEADER *)res_data) + 1, sizeof(BITMAPINFOHEADER)); + rgb_data = ((const char *)res_data) + sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); + + hic = ICOpen(ICTYPE_VIDEO, mmioFOURCC('i','v','5','0'), ICMODE_COMPRESS); + ok(!!hic, "Failed to open codec.\n"); + + ret = ICCompressQuery(hic, &rgb_info, NULL); + todo_wine ok(!ret, "Got %Id.\n", ret); + if (ret) + { + ICClose(hic); + return; + } + + ret = ICCompressGetSize(hic, &rgb_info, NULL); + ok(ret == 0x5100, "Got %Id.\n", ret); + + ret = ICCompressGetFormatSize(hic, &rgb_info); + ok(ret == sizeof(BITMAPINFOHEADER), "Got %Id.\n", ret); + + memset(&iv50_info, 0xcc, sizeof(iv50_info)); + ret = ICCompressGetFormat(hic, &rgb_info, &iv50_info); + ok(!ret, "Got %Id.\n", ret); + ok(iv50_info.bmiHeader.biSize == sizeof(BITMAPINFOHEADER), "Got size %lu.\n", iv50_info.bmiHeader.biSize); + ok(iv50_info.bmiHeader.biWidth == 96, "Got width %ld.\n", iv50_info.bmiHeader.biWidth); + ok(iv50_info.bmiHeader.biHeight == 96, "Got height %ld.\n", iv50_info.bmiHeader.biHeight); + ok(iv50_info.bmiHeader.biPlanes == 1, "Got %u planes.\n", iv50_info.bmiHeader.biPlanes); + ok(iv50_info.bmiHeader.biBitCount == 24, "Got depth %u.\n", iv50_info.bmiHeader.biBitCount); + ok(iv50_info.bmiHeader.biCompression == mmioFOURCC('I','V','5','0'), + "Got compression %#lx.\n", iv50_info.bmiHeader.biCompression); + ok(iv50_info.bmiHeader.biSizeImage == 0x5100, "Got image size %lu.\n", iv50_info.bmiHeader.biSizeImage); + ok(!iv50_info.bmiHeader.biXPelsPerMeter, "Got horizontal resolution %ld.\n", iv50_info.bmiHeader.biXPelsPerMeter); + ok(!iv50_info.bmiHeader.biYPelsPerMeter, "Got vertical resolution %ld.\n", iv50_info.bmiHeader.biYPelsPerMeter); + ok(!iv50_info.bmiHeader.biClrUsed, "Got %lu used colours.\n", iv50_info.bmiHeader.biClrUsed); + ok(!iv50_info.bmiHeader.biClrImportant, "Got %lu important colours.\n", iv50_info.bmiHeader.biClrImportant); + ok(iv50_info.bmiColors[0].rgbRed == 0xcc, "Expected colours to be unmodified.\n"); + + ret = ICCompressQuery(hic, &rgb_info, &iv50_info); + ok(!ret, "Got %Id.\n", ret); + + ret = ICCompressBegin(hic, &rgb_info, &iv50_info); + ok(!ret, "Got %Id.\n", ret); + memset(iv50_data, 0xcd, sizeof(iv50_data)); + ret = ICCompress(hic, ICCOMPRESS_KEYFRAME, &iv50_info.bmiHeader, iv50_data, + &rgb_info.bmiHeader, (void *)rgb_data, NULL, &flags, 1, 0, 0, NULL, NULL); + ok(!ret, "Got %Id.\n", ret); + ok(flags == AVIIF_KEYFRAME, "got flags %#lx\n", flags); + ok(iv50_info.bmiHeader.biSizeImage < 0x5100, "Got size %ld.\n", iv50_info.bmiHeader.biSizeImage); + ret = ICCompressEnd(hic); + ok(!ret, "Got %Id.\n", ret); + + ret = ICClose(hic); + ok(!ret, "Got %Id.\n", ret); +} + +static void test_decompress(void) +{ + const BYTE *expect_rgb_data; + BYTE rgb_data[96 * 96 * 3]; + unsigned int diff = 0; + void *iv50_data; + HRSRC resource; + LRESULT ret; + HIC hic; + + BITMAPINFO iv50_info = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 96, + .bmiHeader.biHeight = 96, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = mmioFOURCC('I','V','5','0'), + }; + static const BITMAPINFO rgb_info = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 96, + .bmiHeader.biHeight = 96, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, + .bmiHeader.biSizeImage = 96 * 96 * 3, + }; + + resource = FindResourceW(NULL, L"iv50frame.bin", (const WCHAR *)RT_RCDATA); + iv50_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); + iv50_info.bmiHeader.biSizeImage = SizeofResource(GetModuleHandleW(NULL), resource); + + hic = ICOpen(ICTYPE_VIDEO, mmioFOURCC('i','v','5','0'), ICMODE_DECOMPRESS); + ok(!!hic, "Failed to open codec.\n"); + + ret = ICDecompressBegin(hic, &iv50_info, &rgb_info); + ok(!ret, "Got %Id.\n", ret); + ret = ICDecompress(hic, 0, &iv50_info.bmiHeader, iv50_data, + (BITMAPINFOHEADER *)&rgb_info.bmiHeader, rgb_data); + ok(!ret, "Got %Id.\n", ret); + ret = ICDecompressEnd(hic); + todo_wine ok(!ret, "Got %Id.\n", ret); + + resource = FindResourceW(NULL, L"rgb24frame.bmp", (const WCHAR *)RT_RCDATA); + expect_rgb_data = ((const BYTE *)LockResource(LoadResource(GetModuleHandleW(NULL), resource))) + + sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); + + for (unsigned int i = 0; i < rgb_info.bmiHeader.biSizeImage; ++i) + diff += abs((int)rgb_data[i] - (int)expect_rgb_data[i]); + diff = diff * 100 / 256 / rgb_info.bmiHeader.biSizeImage; + ok(diff < 4, "Got %u%% difference.\n", diff); + + ret = ICClose(hic); + ok(!ret, "Got %Id.\n", ret); +} + START_TEST(ir50_32) { test_formats(); + test_compress(); + test_decompress(); } diff --git a/dlls/mf/tests/iv50frame.bin b/dlls/ir50_32/tests/iv50frame.bin similarity index 100% rename from dlls/mf/tests/iv50frame.bin rename to dlls/ir50_32/tests/iv50frame.bin diff --git a/dlls/ir50_32/tests/resource.rc b/dlls/ir50_32/tests/resource.rc new file mode 100644 index 00000000000..cc2167f8f74 --- /dev/null +++ b/dlls/ir50_32/tests/resource.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2023 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: rgb24frame.bmp */ +rgb24frame.bmp RCDATA rgb24frame.bmp + +/* The above frame, encoded using native ir50_32.dll. */ +/* @makedep: iv50frame.bin */ +iv50frame.bin RCDATA iv50frame.bin diff --git a/dlls/ir50_32/tests/rgb24frame.bmp b/dlls/ir50_32/tests/rgb24frame.bmp new file mode 100644 index 0000000000000000000000000000000000000000..899e10fd68994f32331a45ae4878344e0a4a5452 GIT binary patch literal 27702 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 Vu~yJ6MTN6c^X4TM%udgn3jo}mSb+cl literal 0 HcmV?d00001 diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 873d373e079..ff7fb6d8b0c 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -161,10 +161,6 @@ rgb555frame.bmp RCDATA rgb555frame.bmp /* @makedep: rgb555frame-flip.bmp */ rgb555frame-flip.bmp RCDATA rgb555frame-flip.bmp -/* Generated from running the tests on Windows */ -/* @makedep: iv50frame.bin */ -iv50frame.bin RCDATA iv50frame.bin - /* Generated from running the tests on Windows */ /* @makedep: rgb24frame.bmp */ rgb24frame.bmp RCDATA rgb24frame.bmp diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 4578dbac591..87ce4ded382 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -60,7 +60,6 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32,D3DFMT_A8B8G8R8); DEFINE_MEDIATYPE_GUID(MFVideoFormat_P208,MAKEFOURCC('P','2','0','8')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_VC1S,MAKEFOURCC('V','C','1','S')); -DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_IV50,MAKEFOURCC('I','V','5','0')); DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); @@ -10360,199 +10359,6 @@ failed: CoUninitialize(); } -static void test_iv50_encoder(void) -{ - static const BITMAPINFOHEADER expect_iv50 = - { - .biSize = sizeof(BITMAPINFOHEADER), - .biWidth = 0x60, .biHeight = 0x60, - .biPlanes = 1, .biBitCount = 0x18, - .biCompression = mmioFOURCC('I','V','5','0'), - .biSizeImage = 0x5100, - }; - const struct buffer_desc iv50_buffer_desc = - { - .length = 0x2e8, - }; - const struct sample_desc iv50_sample_desc = - { - .buffer_count = 1, .buffers = &iv50_buffer_desc, - }; - const BYTE *res_data; - BYTE rgb_data[0x6c00], iv50_data[0x5100]; - BITMAPINFO rgb_info, iv50_info; - IMFCollection *collection; - DWORD flags, res_len, ret; - IMFSample *sample; - LRESULT res; - HRESULT hr; - HIC hic; - - load_resource(L"rgb555frame.bmp", (const BYTE **)&res_data, &res_len); - res_data += 2 + 3 * sizeof(DWORD); - res_len -= 2 + 3 * sizeof(DWORD); - rgb_info.bmiHeader = *(BITMAPINFOHEADER *)res_data; - memcpy(rgb_data, res_data + sizeof(BITMAPINFOHEADER), res_len - sizeof(BITMAPINFOHEADER)); - - hic = ICOpen(ICTYPE_VIDEO, expect_iv50.biCompression, ICMODE_COMPRESS); - if (!hic) - { - todo_wine - win_skip("ICOpen failed to created IV50 compressor.\n"); - return; - } - - res = ICCompressQuery(hic, &rgb_info, NULL); - todo_wine - ok(!res, "got res %#Ix\n", res); - if (res) - goto done; - - res = ICCompressGetSize(hic, &rgb_info, NULL); - ok(res == expect_iv50.biSizeImage, "got res %#Ix\n", res); - - res = ICCompressGetFormatSize(hic, &rgb_info); - ok(res == sizeof(BITMAPINFOHEADER), "got res %#Ix\n", res); - res = ICCompressGetFormat(hic, &rgb_info, &iv50_info); - ok(!res, "got res %#Ix\n", res); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biSize); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biWidth); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biHeight); - check_member(iv50_info.bmiHeader, expect_iv50, "%#x", biPlanes); - check_member(iv50_info.bmiHeader, expect_iv50, "%#x", biBitCount); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biCompression); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biSizeImage); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biXPelsPerMeter); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biYPelsPerMeter); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biClrUsed); - check_member(iv50_info.bmiHeader, expect_iv50, "%#lx", biClrImportant); - res = ICCompressQuery(hic, &rgb_info, &iv50_info); - ok(!res, "got res %#Ix\n", res); - - res = ICCompressBegin(hic, &rgb_info, &iv50_info); - ok(!res, "got res %#Ix\n", res); - memset(iv50_data, 0xcd, sizeof(iv50_data)); - res = ICCompress(hic, ICCOMPRESS_KEYFRAME, &iv50_info.bmiHeader, iv50_data, &rgb_info.bmiHeader, rgb_data, - NULL, &flags, 1, 0, 0, NULL, NULL); - ok(!res, "got res %#Ix\n", res); - ok(flags == 0x10, "got flags %#lx\n", flags); - ok(iv50_info.bmiHeader.biSizeImage == 0x2e8, "got res %#Ix\n", res); - res = ICCompressEnd(hic); - ok(!res, "got res %#Ix\n", res); - - hr = MFCreateCollection(&collection); - ok(hr == S_OK, "got hr %#lx\n", hr); - sample = create_sample(iv50_data, iv50_info.bmiHeader.biSizeImage); - ok(!!sample, "got sample %p\n", sample); - hr = IMFSample_SetSampleTime(sample, 0); - ok(hr == S_OK, "got hr %#lx\n", hr); - hr = IMFSample_SetSampleDuration(sample, 0); - ok(hr == S_OK, "got hr %#lx\n", hr); - hr = IMFCollection_AddElement(collection, (IUnknown *)sample); - ok(hr == S_OK, "got hr %#lx\n", hr); - ret = check_mf_sample_collection(collection, &iv50_sample_desc, L"iv50frame.bin"); - ok(ret == 0, "got %lu%% diff\n", ret); - IMFCollection_Release(collection); - -done: - res = ICClose(hic); - ok(!res, "got res %#Ix\n", res); -} - -static void test_iv50_decoder(void) -{ - static const BITMAPINFOHEADER expect_iv50 = - { - .biSize = sizeof(BITMAPINFOHEADER), - .biWidth = 0x60, .biHeight = 0x60, - .biPlanes = 1, .biBitCount = 24, - .biCompression = mmioFOURCC('I','V','5','0'), - .biSizeImage = 0x2e8, - }; - static const BITMAPINFOHEADER expect_rgb = - { - .biSize = sizeof(BITMAPINFOHEADER), - .biWidth = 0x60, .biHeight = 0x60, - .biPlanes = 1, .biBitCount = 24, - .biCompression = BI_RGB, - .biSizeImage = 96 * 96 * 3, - }; - const struct buffer_desc rgb_buffer_desc = - { - .length = 96 * 96 * 3, - .compare = compare_rgb24, .compare_rect = {.right = 82, .bottom = 84}, - .dump = dump_rgb24, .size = {.cx = 96, .cy = 96}, - }; - const struct sample_desc rgb_sample_desc = - { - .buffer_count = 1, .buffers = &rgb_buffer_desc, - }; - const BYTE *res_data; - BYTE rgb_data[0x6c00], iv50_data[0x5100]; - BITMAPINFO rgb_info, iv50_info; - IMFCollection *collection; - DWORD res_len, ret; - IMFSample *sample; - LRESULT res; - HRESULT hr; - HIC hic; - - load_resource(L"iv50frame.bin", (const BYTE **)&res_data, &res_len); - memcpy(iv50_data, res_data, res_len); - - iv50_info.bmiHeader = expect_iv50; - hic = ICOpen(ICTYPE_VIDEO, expect_iv50.biCompression, ICMODE_DECOMPRESS); - if (!hic) - { - todo_wine - win_skip("ICOpen failed to created IV50 decompressor.\n"); - return; - } - - res = ICDecompressGetFormat(hic, &iv50_info, &rgb_info); - ok(!res, "got res %#Ix\n", res); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biSize); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biWidth); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biHeight); - check_member(rgb_info.bmiHeader, expect_rgb, "%#x", biPlanes); - todo_wine - check_member(rgb_info.bmiHeader, expect_rgb, "%#x", biBitCount); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biCompression); - todo_wine - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biSizeImage); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biXPelsPerMeter); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biYPelsPerMeter); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biClrUsed); - check_member(rgb_info.bmiHeader, expect_rgb, "%#lx", biClrImportant); - rgb_info.bmiHeader = expect_rgb; - - res = ICDecompressBegin(hic, &iv50_info, &rgb_info); - ok(!res, "got res %#Ix\n", res); - res = ICDecompress(hic, 0, &iv50_info.bmiHeader, iv50_data, &rgb_info.bmiHeader, rgb_data); - ok(!res, "got res %#Ix\n", res); - res = ICDecompressEnd(hic); - todo_wine - ok(!res, "got res %#Ix\n", res); - - res = ICClose(hic); - ok(!res, "got res %#Ix\n", res); - - - hr = MFCreateCollection(&collection); - ok(hr == S_OK, "got hr %#lx\n", hr); - sample = create_sample(rgb_data, rgb_info.bmiHeader.biSizeImage); - ok(!!sample, "got sample %p\n", sample); - hr = IMFSample_SetSampleTime(sample, 0); - ok(hr == S_OK, "got hr %#lx\n", hr); - hr = IMFSample_SetSampleDuration(sample, 0); - ok(hr == S_OK, "got hr %#lx\n", hr); - hr = IMFCollection_AddElement(collection, (IUnknown *)sample); - ok(hr == S_OK, "got hr %#lx\n", hr); - ret = check_mf_sample_collection(collection, &rgb_sample_desc, L"rgb24frame.bmp"); - ok(ret <= 4, "got %lu%% diff\n", ret); - IMFCollection_Release(collection); -} - static IMFSample *create_d3d_sample(IMFVideoSampleAllocator *allocator, const void *data, ULONG size) { IMFMediaBuffer *media_buffer; @@ -11143,8 +10949,6 @@ START_TEST(transform) test_video_processor(FALSE); test_video_processor(TRUE); test_mp3_decoder(); - test_iv50_encoder(); - test_iv50_decoder(); test_h264_with_dxgi_manager(); test_h264_decoder_concat_streams(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/ir50_32/ir50.c | 4 ++-- dlls/ir50_32/tests/ir50_32.c | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 69700359e99..ed57e135a2c 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -74,7 +74,7 @@ IV50_DecompressQuery( LPBITMAPINFO in, LPBITMAPINFO out ) TRACE("in->width = %ld\n", in->bmiHeader.biWidth); TRACE("in->compr = %#lx\n", in->bmiHeader.biCompression); - if ( in->bmiHeader.biCompression != IV50_MAGIC ) + if (compare_fourcc(in->bmiHeader.biCompression, IV50_MAGIC)) { TRACE("can't do %#lx compression\n", in->bmiHeader.biCompression); return ICERR_BADFORMAT; @@ -123,7 +123,7 @@ IV50_DecompressGetFormat( LPBITMAPINFO in, LPBITMAPINFO out ) if ( !in ) return ICERR_BADPARAM; - if ( in->bmiHeader.biCompression != IV50_MAGIC ) + if (compare_fourcc(in->bmiHeader.biCompression, IV50_MAGIC)) return ICERR_BADFORMAT; size = in->bmiHeader.biSize; diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c index 1321b8c877a..f68bf4ab590 100644 --- a/dlls/ir50_32/tests/ir50_32.c +++ b/dlls/ir50_32/tests/ir50_32.c @@ -33,9 +33,7 @@ static void test_formats(void) in.biCompression = mmioFOURCC('i','v','5','0'); hic = ICLocate(ICTYPE_VIDEO, mmioFOURCC('i','v','5','0'), &in, NULL, ICMODE_DECOMPRESS); - todo_wine ok(!!hic, "Failed to open codec.\n"); - if (!hic) - return; + ok(!!hic, "Failed to open codec.\n"); ret = ICGetInfo(hic, &info, sizeof(info)); ok(ret == sizeof(info), "Got %Id.\n", ret); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> Native will crash here. Get rid of code we don't need. --- dlls/ir50_32/ir50.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index ed57e135a2c..1fba354180d 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -120,9 +120,6 @@ IV50_DecompressGetFormat( LPBITMAPINFO in, LPBITMAPINFO out ) TRACE("ICM_DECOMPRESS_GETFORMAT %p %p\n", in, out); - if ( !in ) - return ICERR_BADPARAM; - if (compare_fourcc(in->bmiHeader.biCompression, IV50_MAGIC)) return ICERR_BADFORMAT; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/ir50_32/ir50.c | 2 +- dlls/ir50_32/tests/ir50_32.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 1fba354180d..437dafa50f4 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -366,7 +366,7 @@ LRESULT WINAPI IV50_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, break; case ICM_DECOMPRESS_END: - r = ICERR_UNSUPPORTED; + r = ICERR_OK; break; case ICM_DECOMPRESSEX_QUERY: diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c index f68bf4ab590..b2bced42a00 100644 --- a/dlls/ir50_32/tests/ir50_32.c +++ b/dlls/ir50_32/tests/ir50_32.c @@ -127,7 +127,7 @@ static void test_formats(void) todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); ret = ICDecompressEnd(hic); - todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + ok(ret == ICERR_OK, "Got %Id.\n", ret); out->bmiHeader.biCompression = BI_RGB; out->bmiHeader.biBitCount = 24; @@ -135,7 +135,7 @@ static void test_formats(void) ok(ret == ICERR_OK, "Got %Id.\n", ret); ret = ICDecompressEnd(hic); - todo_wine ok(ret == ICERR_OK, "Got %Id.\n", ret); + ok(ret == ICERR_OK, "Got %Id.\n", ret); ret = ICClose(hic); ok(!ret, "Got %Id.\n", ret); @@ -251,7 +251,7 @@ static void test_decompress(void) (BITMAPINFOHEADER *)&rgb_info.bmiHeader, rgb_data); ok(!ret, "Got %Id.\n", ret); ret = ICDecompressEnd(hic); - todo_wine ok(!ret, "Got %Id.\n", ret); + ok(!ret, "Got %Id.\n", ret); resource = FindResourceW(NULL, L"rgb24frame.bmp", (const WCHAR *)RT_RCDATA); expect_rgb_data = ((const BYTE *)LockResource(LoadResource(GetModuleHandleW(NULL), resource))) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/ir50_32/ir50.c | 4 ++-- dlls/ir50_32/tests/ir50_32.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ir50_32/ir50.c b/dlls/ir50_32/ir50.c index 437dafa50f4..53f25c984ee 100644 --- a/dlls/ir50_32/ir50.c +++ b/dlls/ir50_32/ir50.c @@ -129,8 +129,8 @@ IV50_DecompressGetFormat( LPBITMAPINFO in, LPBITMAPINFO out ) memcpy( out, in, size ); out->bmiHeader.biHeight = abs(in->bmiHeader.biHeight); out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biBitCount = 32; - out->bmiHeader.biSizeImage = out->bmiHeader.biWidth * out->bmiHeader.biHeight * 4; + out->bmiHeader.biBitCount = 24; + out->bmiHeader.biSizeImage = out->bmiHeader.biWidth * out->bmiHeader.biHeight * 3; return ICERR_OK; } diff --git a/dlls/ir50_32/tests/ir50_32.c b/dlls/ir50_32/tests/ir50_32.c index b2bced42a00..8dbd1a82239 100644 --- a/dlls/ir50_32/tests/ir50_32.c +++ b/dlls/ir50_32/tests/ir50_32.c @@ -65,9 +65,9 @@ static void test_formats(void) ok(out->bmiHeader.biWidth == 320, "Got width %ld.\n", out->bmiHeader.biWidth); ok(out->bmiHeader.biHeight == 240, "Got height %ld.\n", out->bmiHeader.biHeight); todo_wine ok(out->bmiHeader.biPlanes == 1, "Got %u planes.\n", out->bmiHeader.biPlanes); - todo_wine ok(out->bmiHeader.biBitCount == 24, "Got depth %u.\n", out->bmiHeader.biBitCount); + ok(out->bmiHeader.biBitCount == 24, "Got depth %u.\n", out->bmiHeader.biBitCount); ok(out->bmiHeader.biCompression == BI_RGB, "Got compression %#lx.\n", out->bmiHeader.biCompression); - todo_wine ok(out->bmiHeader.biSizeImage == 320 * 240 * 3, "Got image size %lu.\n", out->bmiHeader.biSizeImage); + ok(out->bmiHeader.biSizeImage == 320 * 240 * 3, "Got image size %lu.\n", out->bmiHeader.biSizeImage); todo_wine ok(!out->bmiHeader.biXPelsPerMeter, "Got horizontal resolution %ld.\n", out->bmiHeader.biXPelsPerMeter); todo_wine ok(!out->bmiHeader.biYPelsPerMeter, "Got vertical resolution %ld.\n", out->bmiHeader.biYPelsPerMeter); todo_wine ok(!out->bmiHeader.biClrUsed, "Got %lu used colours.\n", out->bmiHeader.biClrUsed); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8280
participants (2)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)