[PATCH v4 0/11] MR887: mf/tests: Improve MF transform output checks and dumps.

Rémi Bernon

21 Sep 2022 21 Sep '22

9:56 a.m.

-- v4: mf/tests: Dump image samples with a BMP header and RGB data. mf/tests: Rename transform frame dumps to BMP. mf/tests: Check all produced output IMFSample at the same time. mf/tests: Factor IMFSample attributes checks in check_mf_sample. mf/tests: Factor IMFSample checks in a check_mf_sample helper. mf/tests: Introduce a new dump_mf_sample helper. mf/tests: Introduce a new load_resource helper. mf/tests: Factor IMFTransform_ProcessOutput checks together. mf/tests: Use separate variables for input / output samples. mf: Validate sample copier ProcessOutput count parameter. winegstreamer: Avoid accessing NULL pointer if transform didn't provide a sample. https://gitlab.winehq.org/wine/wine/-/merge_requests/887

Show replies by date

Rémi Bernon

21 Sep 21 Sep

9:56 a.m.

New subject: [PATCH v4 11/11] mf/tests: Dump image samples with a BMP header and RGB data.

From: Rémi Bernon <rbernon(a)codeweavers.com> Allowing easier preview of NV12 / I420 images as well. --- dlls/mf/tests/i420frame.bmp | Bin 13824 -> 50742 bytes dlls/mf/tests/nv12frame.bmp | Bin 13824 -> 50742 bytes dlls/mf/tests/rgb32frame-vp.bmp | Bin 36864 -> 36918 bytes dlls/mf/tests/rgb32frame.bmp | Bin 36864 -> 36918 bytes dlls/mf/tests/transform.c | 146 +++++++++++++++++++++++++++----- 5 files changed, 127 insertions(+), 19 deletions(-) diff --git a/dlls/mf/tests/i420frame.bmp b/dlls/mf/tests/i420frame.bmp index 58cefb87913d03728d293154aaa5fc82ce0fb64c..13d7c6259fe3a9c3f63c5591ad126889390e97d1 100644 GIT binary patch literal 50742 zcmeI!p{>GD7=~fkpd%0zU7!Qt5m*!&!3-S%7y`j4l^uWuFx}wLQ1ovqPB=VY@;BTx z*SvYcz1v-LS$x)v&&_zp?=2Ur(a)zc2P`{{@2`D)wbG+=-M1{h#~0R|XgfB^;=V1NMz z$~Dkex8yWnfB^;=V1NMz7+`<_1{h#~0S3x7(a)VHmWX}|yj3^2d|0}L?000Rs#zyJdb zlxyJHtdrA#0R|XgfB^;=V1NMz7+`<_1{f&Uz^QvCrvU>DFu(u<3^2d|0}L?000Rs# zP_BXfVMtB`1{h#~0R|XgfB^;=V1NMz7+|1W1NCrDP6GxQV1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^=6)4<CVP(Xo91$t9J0R=J(a)c$fkTD3GbZ)f7-b zflLKXrhozpWGb*X1r$&qQ-RtPP(T3%6i`5cKP%8$SfH}7z}><EjfDj|3kw`9EHIb? lGYW)%{Jm^%78VHqIr6evTUg*}VSyQ6?SJvBXH#HCfj8JQBi;Z2 literal 13824 zcmeH}u?>Sz3`AF82D&W39<+>*f*Du=hM-^+q%;{I3;c!=(zr1ar$e%SVeT4)e7g9a zEQL~{^>K<$FU7(a)wlz%25K4&8SU3@%`^IKg$-*EZ;!{fio$4tdXd(a)un#t$ROPxcvU% z(a)tg87Q}GcWOaM>o-p?E^zkhiAtbEK=e8dM6z|*?-^A4BaKRo`ee9TmQ#0L|=)4KQ5 zhs*CD9^We;GZi24!36NM?)|*N<@XPde<>d`6(8}z1n{)({rF$gn+S-22-G7mv9gs| z`;^4ru(H0ay-DI<Sy^A!z9#W^tgJ6<?~?d;R(a)Rrb?@9avE9=YJha~=kmGx!qM-so) z(Bp!@)4pf!_FY&RU)H`P(a)jvZ*?{43gmE8ktZ<F|ctgJ6<|0VH1?f?32-;tHw18X0X K_^pN>7X<!9H+|Ir diff --git a/dlls/mf/tests/nv12frame.bmp b/dlls/mf/tests/nv12frame.bmp index d6640023fb9f7382de5251b39eb54cf693a1dad8..f37bdfc4062ef20d0f017e43147767708c51c09b 100644 GIT binary patch literal 50742 zcmeI5v5g`@5JmSgm=IQ2M*<VT`D@@}osB^Zgm4f92B9F~5C93_Oa^l^w`*);lytwp zTAI(a)9RwG)i`c%Dr{{H&t|GfQM{q*^BI={cpkGJ>f+qAykKQEu3&%<Hl)HAr<ZliKw zU(bGKsIZ(a)F;1B-{4&cAXW7P%t!(VkLLmmF(e+G}$8So$fRd+Jf;r}xIzjvpRQ_n#4 zANKX^XNK_ia8!MSKm1j9GSuNe{%7!5odN&xUv(!#9sc8g29MPl(a)PC>9U(Vggsb`@2 z5BqxdGeh`$II2FvAO5O48S3yK|1)^3&Vc{;uey_=4*&5#gU9L&_`gj5kNs-o)H6{1 zhkZT!nIZf=9919T4}aC240ZUA{~0`1XTX2_SKY}_hyVDW!DDp>{9mU3yX#}*)H6{1 zhkZT!nIZf=9919T4}aC240ZUA{~0`1XTX2_SKY}_hyVDW!DDp>{9mU3o9!@i>KUm1 z!@i#V%n<$_j;fFFhrjAhhC2Mm{|p|hGvGh|tL|i|!+-qG;ITRb{x8%2^{^i~^$b-1 zVPDUFW(a=|N7YC8!(VkLLmmF(e+G}$8So$fRd+Jf;XnRo(a)K~Jz|Ci~%`gfyF`+x6n zgBuRu01n^)4&VR|-~bNb01n^)4&Xp*2cGsdP4I2m<DcKcr?2F{5`fPuk(a)60olE>?< zEuXu6mHpe}@8ri!;RBzTK>XU)pNoB!{oCU&<i||m1D}{c{My!^qkWbA+vAVq$4ub^ zpO`@W+SZ?)eU<&&<9Fo8OyL8cm_Yp6)}M`imHpe}H{{1m;RBzTK>XU)pS69J{oCW$ z<i||m1D}{c{My!^^4GXQ00IzbN8n&zW$*U*1Nkx2wtTvidzbyY)4LP-G1Inu&YgRg z{kzl89r-cSwtV`PdzbyY)B6?qG1Inut`GMv`*){bALPeO+w$2C?p^lpPTvmX$4uMu a8TRg7_U}#~_T<M*+wv)YjT;31kHBAWY55KS delta 18 acmdni!`zTF*<pgm<bVlWn>!|~GX(%k(a)CXP1 diff --git a/dlls/mf/tests/rgb32frame-vp.bmp b/dlls/mf/tests/rgb32frame-vp.bmp index 46d93a9c40b5d875c821580dd1db984d3b97217a..cd9fb4fdd5c2ea8d4a359bd130767527de0a2241 100644 GIT binary patch delta 70 xcmZozz_e`vlbMsR*#rhKFawerK%4-(a)j0_4u77#$?Ash&~k(a)3Ia=Kq3>bpT|H3E2Pu delta 17 ZcmdnCfT>{t(?*AHf)fL{7Mlsx0RTdu2FCyZ diff --git a/dlls/mf/tests/rgb32frame.bmp b/dlls/mf/tests/rgb32frame.bmp index 3ad7556ef7886011bce680f90127f150b081502d..9f2ea1e5d1b2b808f3671b09c19ed6fcd090de85 100644 GIT binary patch delta 63 qcmZozz_e`vlbMsR*#rhKFawerK%4-(a)j0_4u77#$?Ash&~U;+Rqy9WgT delta 18 acmdnCfT>{t(?&Z7#)*C$o9h^N^Z@`v$p;Dm diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 0af265ac5f5..1e5bf2ba0db 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -375,12 +375,17 @@ static HRESULT check_mft_process_output_(int line, IMFTransform *transform, IMFS return ret; } -typedef DWORD (*compare_cb)(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect); +typedef DWORD (*compare_cb)(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect); -static DWORD compare_nv12(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect) +static DWORD compare_nv12(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { DWORD x, y, size, diff = 0, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + /* skip BMP header and RGB data from the dump */ + size = *(DWORD *)(expect + 2); + *length = *length + size; + expect = expect + size; + for (y = 0; y < height; y++, data += width, expect += width) { if (y < rect->top || y >= rect->bottom) continue; @@ -406,10 +411,15 @@ static DWORD compare_nv12(const BYTE *data, DWORD length, const RECT *rect, cons return diff * 100 / 256 / size; } -static DWORD compare_i420(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect) +static DWORD compare_i420(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { DWORD i, x, y, size, diff = 0, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + /* skip BMP header and RGB data from the dump */ + size = *(DWORD *)(expect + 2); + *length = *length + size; + expect = expect + size; + for (y = 0; y < height; y++, data += width, expect += width) { if (y < rect->top || y >= rect->bottom) continue; @@ -434,10 +444,15 @@ static DWORD compare_i420(const BYTE *data, DWORD length, const RECT *rect, cons return diff * 100 / 256 / size; } -static DWORD compare_rgb32(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect) +static DWORD compare_rgb32(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { DWORD x, y, size, diff = 0, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + /* skip BMP header from the dump */ + size = *(DWORD *)(expect + 2 + 2 * sizeof(DWORD)); + *length = *length + size; + expect = expect + size; + for (y = 0; y < height; y++, data += width * 4, expect += width * 4) { if (y < rect->top || y >= rect->bottom) continue; @@ -454,10 +469,10 @@ static DWORD compare_rgb32(const BYTE *data, DWORD length, const RECT *rect, con return diff * 100 / 256 / size; } -static DWORD compare_pcm16(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect) +static DWORD compare_pcm16(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { const INT16 *data_pcm = (INT16 *)data, *expect_pcm = (INT16 *)expect; - DWORD i, size = length / 2, diff = 0; + DWORD i, size = *length / 2, diff = 0; for (i = 0; i < size; i++) diff += abs((int)*expect_pcm++ - (int)*data_pcm++); @@ -465,14 +480,93 @@ static DWORD compare_pcm16(const BYTE *data, DWORD length, const RECT *rect, con return diff * 100 / 65536 / size; } -static DWORD compare_bytes(const BYTE *data, DWORD length, const RECT *rect, const BYTE *expect) +static DWORD compare_bytes(const BYTE *data, DWORD *length, const RECT *rect, const BYTE *expect) { - DWORD i, diff = 0; + DWORD i, size = *length, diff = 0; - for (i = 0; i < length; i++) + for (i = 0; i < size; i++) diff += abs((int)*expect++ - (int)*data++); - return diff * 100 / 256 / length; + return diff * 100 / 256 / size; +} + +typedef void (*dump_cb)(const BYTE *data, DWORD length, const RECT *rect, HANDLE output); + +static void dump_rgb32(const BYTE *data, DWORD length, const RECT *rect, HANDLE output) +{ + DWORD width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + static const char magic[2] = "BM"; + struct + { + DWORD length; + DWORD reserved; + DWORD offset; + BITMAPINFOHEADER biHeader; + } header = + { + .length = length + sizeof(header) + 2, .offset = sizeof(header) + 2, + .biHeader = + { + .biSize = sizeof(BITMAPINFOHEADER), .biWidth = width, .biHeight = height, .biPlanes = 1, + .biBitCount = 32, .biCompression = BI_RGB, .biSizeImage = width * height * 4, + }, + }; + DWORD written; + BOOL ret; + + ret = WriteFile(output, magic, sizeof(magic), &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == sizeof(magic), "written %lu bytes\n", written); + ret = WriteFile(output, &header, sizeof(header), &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == sizeof(header), "written %lu bytes\n", written); + ret = WriteFile(output, data, length, &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == length, "written %lu bytes\n", written); +} + +static void dump_nv12(const BYTE *data, DWORD length, const RECT *rect, HANDLE output) +{ + DWORD written, x, y, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + BYTE *rgb32_data = malloc(width * height * 4), *rgb32 = rgb32_data; + BOOL ret; + + for (y = 0; y < height; y++) for (x = 0; x < width; x++) + { + *rgb32++ = data[width * y + x]; + *rgb32++ = data[width * height + width * (y / 2) + (x & ~1) + 0]; + *rgb32++ = data[width * height + width * (y / 2) + (x & ~1) + 1]; + *rgb32++ = 0xff; + } + + dump_rgb32(rgb32_data, width * height * 4, rect, output); + free(rgb32_data); + + ret = WriteFile(output, data, length, &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == length, "written %lu bytes\n", written); +} + +static void dump_i420(const BYTE *data, DWORD length, const RECT *rect, HANDLE output) +{ + DWORD written, x, y, width = (rect->right + 0xf) & ~0xf, height = (rect->bottom + 0xf) & ~0xf; + BYTE *rgb32_data = malloc(width * height * 4), *rgb32 = rgb32_data; + BOOL ret; + + for (y = 0; y < height; y++) for (x = 0; x < width; x++) + { + *rgb32++ = data[width * y + x]; + *rgb32++ = data[width * height + (width / 2) * (y / 2) + x / 2]; + *rgb32++ = data[width * height + (width / 2) * (y / 2) + (width / 2) * (height / 2) + x / 2]; + *rgb32++ = 0xff; + } + + dump_rgb32(rgb32_data, width * height * 4, rect, output); + free(rgb32_data); + + ret = WriteFile(output, data, length, &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == length, "written %lu bytes\n", written); } struct buffer_desc @@ -480,6 +574,7 @@ struct buffer_desc DWORD length; BOOL todo_length; compare_cb compare; + dump_cb dump; RECT rect; }; @@ -559,9 +654,14 @@ static void dump_mf_media_buffer(IMFMediaBuffer *buffer, const struct buffer_des hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Lock returned %#lx\n", hr); - ret = WriteFile(output, data, length, &written, NULL); - ok(ret, "WriteFile failed, error %lu\n", GetLastError()); - ok(written == length, "written %lu bytes\n", written); + if (buffer_desc->dump) + buffer_desc->dump(data, length, &buffer_desc->rect, output); + else + { + ret = WriteFile(output, data, length, &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == length, "written %lu bytes\n", written); + } hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Unlock returned %#lx\n", hr); @@ -607,9 +707,9 @@ static DWORD check_mf_media_buffer_(int line, IMFMediaBuffer *buffer, const stru todo_wine_if(expect->todo_length) ok_(__FILE__, line)(0, "missing %#lx bytes\n", length - *expect_data_len); else if (!expect->compare) - diff = compare_bytes(data, length, NULL, *expect_data); + diff = compare_bytes(data, &length, NULL, *expect_data); else - diff = expect->compare(data, length, &expect->rect, *expect_data); + diff = expect->compare(data, &length, &expect->rect, *expect_data); hr = IMFMediaBuffer_Unlock(buffer); ok_(__FILE__, line)(hr == S_OK, "Unlock returned %#lx\n", hr); @@ -2540,7 +2640,7 @@ static void test_h264_decoder(void) const struct buffer_desc output_buffer_desc_nv12 = { .length = actual_width * actual_height * 3 / 2, - .compare = compare_nv12, .rect = {.right = 82, .bottom = 84}, + .compare = compare_nv12, .dump = dump_nv12, .rect = {.right = 82, .bottom = 84}, }; const struct sample_desc output_sample_desc_nv12 = { @@ -2551,7 +2651,7 @@ static void test_h264_decoder(void) const struct buffer_desc output_buffer_desc_i420 = { .length = actual_width * actual_height * 3 / 2, - .compare = compare_i420, .rect = {.right = 82, .bottom = 84}, + .compare = compare_i420, .dump = dump_i420, .rect = {.right = 82, .bottom = 84}, }; const struct sample_desc expect_output_sample_i420 = { @@ -3430,7 +3530,7 @@ static void test_color_convert(void) const struct buffer_desc output_buffer_desc = { .length = actual_width * actual_height * 4, - .compare = compare_rgb32, .rect = {.right = 82, .bottom = 84}, + .compare = compare_rgb32, .dump = dump_rgb32, .rect = {.right = 82, .bottom = 84}, }; const struct attribute_desc output_sample_attributes[] = { @@ -3559,6 +3659,10 @@ static void test_color_convert(void) ok(output_info.cbAlignment == 1, "got cbAlignment %#lx\n", output_info.cbAlignment); load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); + /* skip BMP header and RGB data from the dump */ + length = *(DWORD *)(nv12frame_data + 2); + nv12frame_data_len = nv12frame_data_len - length; + nv12frame_data = nv12frame_data + length; ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); input_sample = create_sample(nv12frame_data, nv12frame_data_len); @@ -3773,7 +3877,7 @@ static void test_video_processor(void) const struct buffer_desc output_buffer_desc = { .length = actual_width * actual_height * 4, - .compare = compare_rgb32, .rect = {.top = 12, .right = 82, .bottom = 96}, + .compare = compare_rgb32, .dump = dump_rgb32, .rect = {.top = 12, .right = 82, .bottom = 96}, }; const struct attribute_desc output_sample_attributes[] = { @@ -4226,6 +4330,10 @@ todo_wine { ok(output_info.cbAlignment == 0, "got cbAlignment %#lx\n", output_info.cbAlignment); load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); + /* skip BMP header and RGB data from the dump */ + length = *(DWORD *)(nv12frame_data + 2); + nv12frame_data_len = nv12frame_data_len - length; + nv12frame_data = nv12frame_data + length; ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); input_sample = create_sample(nv12frame_data, nv12frame_data_len); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/887

1185

Age (days ago)

1185

Last active (days ago)

List overview

Download

11 comments

1 participants

participants (1)

Rémi Bernon

[PATCH v4 0/11] MR887: mf/tests: Improve MF transform output checks and dumps.

tags

participants (1)