June 2022 - Wine-Devel - list.winehq.org

Re: How to identify the primary battery (for Wine)

by Alex Henrie

On Tue, Jun 14, 2022 at 8:17 AM Sebastian Reichel <sebastian.reichel(a)collabora.com> wrote: > > On Mon, Jun 13, 2022 at 07:54:49PM -0600, Alex Henrie wrote: > > I've been working to improve battery status reporting for applications > > running on Wine on Linux. However, we Wine developers are not sure > > what the best way is to determine which battery is the computer's > > primary battery. Could you take a look at > > https://gitlab.winehq.org/wine/wine/-/merge_requests/134 and leave a > > comment there or on the wine-devel mailing list? > > /sys/class/power_supply/*/scope is set to 'Device' for all > batteries, that are not powering the main system. There can still > be multiple batteries; for example Thinkpads in the 2014-2018 era > used to have an internal and a removable battery. For a single > "X %/hours left" info the data from all 'System' level batteries > must be aggregated. Thanks Sebastian, that helps a lot! We would really need to test this API on Windows on a laptop with two batteries to see whether Windows aggregates the batteries or just reports the charge of the first one. For now, I hope that not doing any aggregation in Wine is acceptable (and I hope someone will tell me if I'm mistaken). > On Tue, Jun 14, 2022 at 2:05 AM Benjamin Berg <benjamin(a)sipsolutions.net> wrote: > > > Wouldn't it make sense for Wine to use the UPower provided > > DisplayDevice that can be queried through DBus? > > UPower does the required data aggregation for the 'DisplayDevice'. > I don't know enough about the Wine codebase to recommend for or > against using UPower. I also don't know if D-Bus would be a good choice here. It would certainly be a bigger change than the patch that I've proposed. What are the advantages and disadvantages of querying the battery through D-Bus, besides it doing battery aggregation for us? -Alex

June 14, 2022

[PATCH v3 8/8] mfplat/tests: Merge and reorganize image format tests.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Added --- dlls/mfplat/tests/mfplat.c | 279 +++++++++++++++++-------------------- 1 file changed, 131 insertions(+), 148 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 74de51b42f1..8d8bd27b8fb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4233,87 +4233,122 @@ static const struct image_size_test UINT32 height; UINT32 size; UINT32 plane_size; /* Matches image size when 0. */ + UINT32 max_length; + UINT32 contiguous_length; + UINT32 pitch; } image_size_tests[] = { - { &MFVideoFormat_RGB8, 3, 5, 20 }, - { &MFVideoFormat_RGB8, 1, 1, 4 }, - { &MFVideoFormat_RGB555, 3, 5, 40 }, - { &MFVideoFormat_RGB555, 1, 1, 4 }, - { &MFVideoFormat_RGB565, 3, 5, 40 }, - { &MFVideoFormat_RGB565, 1, 1, 4 }, - { &MFVideoFormat_RGB24, 3, 5, 60 }, - { &MFVideoFormat_RGB24, 1, 1, 4 }, - { &MFVideoFormat_RGB32, 3, 5, 60 }, - { &MFVideoFormat_RGB32, 1, 1, 4 }, - { &MFVideoFormat_ARGB32, 3, 5, 60 }, - { &MFVideoFormat_ARGB32, 1, 1, 4 }, - { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, - { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, - { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, - { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, - - /* YUV */ - { &MFVideoFormat_NV12, 1, 3, 9, 4 }, - { &MFVideoFormat_NV12, 1, 2, 6, 3 }, - { &MFVideoFormat_NV12, 2, 2, 6, 6 }, - { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12 }, - { &MFVideoFormat_NV12, 320, 240, 115200 }, - { &MFVideoFormat_AYUV, 1, 1, 4 }, - { &MFVideoFormat_AYUV, 2, 1, 8 }, - { &MFVideoFormat_AYUV, 1, 2, 8 }, - { &MFVideoFormat_AYUV, 4, 3, 48 }, - { &MFVideoFormat_AYUV, 320, 240, 307200 }, - { &MFVideoFormat_IMC1, 1, 1, 4 }, - { &MFVideoFormat_IMC1, 2, 1, 4 }, - { &MFVideoFormat_IMC1, 1, 2, 8 }, - { &MFVideoFormat_IMC1, 4, 3, 24 }, - { &MFVideoFormat_IMC1, 320, 240, 153600 }, - { &MFVideoFormat_IMC3, 1, 1, 4 }, - { &MFVideoFormat_IMC3, 2, 1, 4 }, - { &MFVideoFormat_IMC3, 1, 2, 8 }, - { &MFVideoFormat_IMC3, 4, 3, 24 }, - { &MFVideoFormat_IMC3, 320, 240, 153600 }, - { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12 }, - { &MFVideoFormat_IMC2, 320, 240, 115200 }, - { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12 }, - { &MFVideoFormat_IMC4, 320, 240, 115200 }, - { &MFVideoFormat_YV12, 1, 1, 3, 1 }, - { &MFVideoFormat_YV12, 2, 1, 3 }, - { &MFVideoFormat_YV12, 1, 2, 6, 3 }, - { &MFVideoFormat_YV12, 4, 3, 18 }, - { &MFVideoFormat_YV12, 320, 240, 115200 }, - - { &MFVideoFormat_I420, 1, 1, 3, 1 }, - { &MFVideoFormat_I420, 2, 1, 3 }, - { &MFVideoFormat_I420, 1, 2, 6, 3 }, - { &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 }, - { &MFVideoFormat_YUY2, 320, 240, 153600 }, - - { &MFVideoFormat_UYVY, 2, 1, 4 }, - { &MFVideoFormat_UYVY, 4, 3, 24 }, - { &MFVideoFormat_UYVY, 128, 128, 32768 }, - { &MFVideoFormat_UYVY, 320, 240, 153600 }, + /* RGB */ + { &MFVideoFormat_RGB8, 3, 5, 20, 0, 320, 20, 64 }, + { &MFVideoFormat_RGB8, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_RGB555, 3, 5, 40, 0, 320, 40, 64 }, + { &MFVideoFormat_RGB555, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_RGB565, 3, 5, 40, 0, 320, 40, 64 }, + { &MFVideoFormat_RGB565, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_RGB24, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_RGB24, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_RGB32, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_RGB32, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_ARGB32, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_ARGB32, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120, 0, 320, 120, 64 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8, 0, 64, 8, 64 }, + + /* YUV, 32 bpp, packed */ + { &MFVideoFormat_AYUV, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_AYUV, 2, 1, 8, 0, 64, 8, 64 }, + { &MFVideoFormat_AYUV, 1, 2, 8, 0, 128, 8, 64 }, + { &MFVideoFormat_AYUV, 4, 3, 48, 0, 192, 48, 64 }, + { &MFVideoFormat_AYUV, 320, 240, 307200, 0, 307200, 307200, 1280 }, + + /* YUV, 16 bpp, packed */ + { &MFVideoFormat_YUY2, 2, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_YUY2, 4, 3, 24, 0, 192, 24, 64 }, + { &MFVideoFormat_YUY2, 128, 128, 32768, 0, 32768, 32768, 256 }, + { &MFVideoFormat_YUY2, 320, 240, 153600, 0, 153600, 153600, 640 }, + + { &MFVideoFormat_UYVY, 2, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_UYVY, 4, 3, 24, 0, 192, 24, 64 }, + { &MFVideoFormat_UYVY, 128, 128, 32768, 0, 32768, 32768, 256 }, + { &MFVideoFormat_UYVY, 320, 240, 153600, 0, 153600, 153600, 640 }, + + /* YUV, 16 bpp, planar */ + { &MFVideoFormat_IMC1, 1, 1, 4, 0, 256, 8, 128 }, + { &MFVideoFormat_IMC1, 2, 1, 4, 0, 256, 8, 128 }, + { &MFVideoFormat_IMC1, 1, 2, 8, 0, 512, 16, 128 }, + { &MFVideoFormat_IMC1, 2, 2, 8, 0, 512, 16, 128 }, + { &MFVideoFormat_IMC1, 2, 4, 16, 0, 1024, 32, 128 }, + { &MFVideoFormat_IMC1, 4, 2, 16, 0, 512, 32, 128 }, + { &MFVideoFormat_IMC1, 4, 3, 24, 0, 768, 48, 128 }, + { &MFVideoFormat_IMC1, 320, 240, 153600, 0, 307200, 307200, 640 }, + + { &MFVideoFormat_IMC3, 1, 1, 4, 0, 256, 8, 128 }, + { &MFVideoFormat_IMC3, 2, 1, 4, 0, 256, 8, 128 }, + { &MFVideoFormat_IMC3, 1, 2, 8, 0, 512, 16, 128 }, + { &MFVideoFormat_IMC3, 2, 2, 8, 0, 512, 16, 128 }, + { &MFVideoFormat_IMC3, 2, 4, 16, 0, 1024, 32, 128 }, + { &MFVideoFormat_IMC3, 4, 2, 16, 0, 512, 32, 128 }, + { &MFVideoFormat_IMC3, 4, 3, 24, 0, 768, 48, 128 }, + { &MFVideoFormat_IMC3, 320, 240, 153600, 0, 307200, 307200, 640 }, + + /* YUV, 12 bpp, planar, full stride */ + { &MFVideoFormat_NV12, 1, 3, 9, 4, 288, 4, 64 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3, 192, 3, 64 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6, 192, 6, 64 }, + { &MFVideoFormat_NV12, 2, 4, 12, 0, 384, 12, 64 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9, 192, 9, 64 }, + { &MFVideoFormat_NV12, 4, 2, 12, 0, 192, 12, 64 }, + { &MFVideoFormat_NV12, 320, 240, 115200, 0, 115200, 115200, 320 }, + + /* YUV, 12 bpp, planar, half stride */ + { &MFVideoFormat_IMC2, 1, 3, 9, 4, 576, 3, 128 }, + { &MFVideoFormat_IMC2, 3, 5, 30, 22, 960, 20, 128 }, + { &MFVideoFormat_IMC2, 1, 2, 6, 3, 384, 2, 128 }, + { &MFVideoFormat_IMC2, 2, 2, 6, 6, 384, 6, 128 }, + { &MFVideoFormat_IMC2, 2, 4, 12, 0, 768, 12, 128 }, + { &MFVideoFormat_IMC2, 3, 2, 12, 9, 384, 8, 128 }, + { &MFVideoFormat_IMC2, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_IMC2, 320, 240, 115200, 0, 138240, 115200, 384 }, + + { &MFVideoFormat_IMC4, 1, 3, 9, 4, 576, 3, 128 }, + { &MFVideoFormat_IMC4, 3, 5, 30, 22, 960, 20, 128 }, + { &MFVideoFormat_IMC4, 1, 2, 6, 3, 384, 2, 128 }, + { &MFVideoFormat_IMC4, 2, 2, 6, 6, 384, 6, 128 }, + { &MFVideoFormat_IMC4, 2, 4, 12, 0, 768, 12, 128 }, + { &MFVideoFormat_IMC4, 3, 2, 12, 9, 384, 8, 128 }, + { &MFVideoFormat_IMC4, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_IMC4, 320, 240, 115200, 0, 138240, 115200, 384 }, + + { &MFVideoFormat_YV12, 1, 1, 3, 1, 192, 1, 128 }, + { &MFVideoFormat_YV12, 2, 1, 3, 0, 192, 3, 128 }, + { &MFVideoFormat_YV12, 1, 2, 6, 3, 384, 2, 128 }, + { &MFVideoFormat_YV12, 2, 2, 6, 0, 384, 6, 128 }, + { &MFVideoFormat_YV12, 2, 4, 12, 0, 768, 12, 128 }, + { &MFVideoFormat_YV12, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_YV12, 4, 3, 18, 0, 576, 18, 128 }, + { &MFVideoFormat_YV12, 320, 240, 115200, 0, 138240, 115200, 384 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1, 192, 1, 128 }, + { &MFVideoFormat_I420, 2, 1, 3, 0, 192, 3, 128 }, + { &MFVideoFormat_I420, 1, 2, 6, 3, 384, 2, 128 }, + { &MFVideoFormat_I420, 2, 2, 6, 0, 384, 6, 128 }, + { &MFVideoFormat_I420, 2, 4, 12, 0, 768, 12, 128 }, + { &MFVideoFormat_I420, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_I420, 4, 3, 18, 0, 576, 18, 128 }, + { &MFVideoFormat_I420, 320, 240, 115200, 0, 138240, 115200, 384 }, + + { &MFVideoFormat_IYUV, 1, 1, 3, 1, 192, 1, 128 }, + { &MFVideoFormat_IYUV, 2, 1, 3, 0, 192, 3, 128 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3, 384, 2, 128 }, + { &MFVideoFormat_IYUV, 2, 2, 6, 0, 384, 6, 128 }, + { &MFVideoFormat_IYUV, 2, 4, 12, 0, 768, 12, 128 }, + { &MFVideoFormat_IYUV, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_IYUV, 4, 3, 18, 0, 576, 18, 128 }, + { &MFVideoFormat_IYUV, 320, 240, 115200, 0, 138240, 115200, 384 }, + }; static void test_MFCalculateImageSize(void) @@ -4366,7 +4401,8 @@ 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); - ok(size == plane_size, "%u: unexpected plane size %lu, expected %u.\n", i, size, plane_size); + 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)); } } @@ -5706,61 +5742,6 @@ static void test_MFGetStrideForBitmapInfoHeader(void) static void test_MFCreate2DMediaBuffer(void) { - static const struct _2d_buffer_test - { - unsigned int width; - unsigned int height; - unsigned int fourcc; - unsigned int contiguous_length; - int pitch; - unsigned int max_length; - } _2d_buffer_tests[] = - { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, - { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, - { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, - { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, - { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, - { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, - { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, - { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, - { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, - - { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, - { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, - - { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, - { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, - - { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, - { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, - - { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, - { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, - - { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, - { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, - { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, - }; static const char two_aas[] = { 0xaa, 0xaa }; static const char eight_bbs[] = { 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb }; DWORD max_length, length, length2; @@ -5958,18 +5939,17 @@ static void test_MFCreate2DMediaBuffer(void) IMFMediaBuffer_Release(buffer); - for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { - const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + const struct image_size_test *ptr = &image_size_tests[i]; - hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (ptr->max_length) - ok(length == ptr->max_length, "%u: unexpected maximum length %lu for %u x %u, format %s.\n", - i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + ok(length == ptr->max_length, "%u: unexpected maximum length %lu for %u x %u, format %s.\n", + i, length, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype)); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr); @@ -5977,12 +5957,12 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_GetContiguousLength(_2dbuffer, &length); ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(length == ptr->contiguous_length, "%d: unexpected contiguous length %lu for %u x %u, format %s.\n", - i, length, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + i, length, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype)); hr = IMFMediaBuffer_Lock(buffer, &data, &length2, NULL); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %lu for %u x %u, format %s.\n", - i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + i, length2, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype)); memset(data, 0xff, length2); @@ -6002,11 +5982,11 @@ static void test_MFCreate2DMediaBuffer(void) for (k = 0; k < ptr->width; k++) ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); - hr = pMFGetStrideForBitmapInfoHeader(ptr->fourcc, ptr->width, &stride); + hr = pMFGetStrideForBitmapInfoHeader(ptr->subtype->Data1, ptr->width, &stride); ok(hr == S_OK, "Failed to get stride, hr %#lx.\n", hr); /* secondary planes */ - switch (ptr->fourcc) + switch (ptr->subtype->Data1) { case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): @@ -6017,6 +5997,9 @@ static void test_MFCreate2DMediaBuffer(void) case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): for (j = 0; ptr->height * stride + j * (stride / 2) < length2; j++) for (k = 0; k < ptr->width / 2; k++) ok(data[ptr->height * pitch + j * (pitch / 2) + k] == 0xff, @@ -6038,7 +6021,7 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); ok(pitch == ptr->pitch, "%d: unexpected pitch %ld, expected %d, %u x %u, format %s.\n", i, pitch, ptr->pitch, - ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); + ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype)); ret = TRUE; hr = IMF2DBuffer_IsContiguousFormat(_2dbuffer, &ret); @@ -6051,11 +6034,11 @@ static void test_MFCreate2DMediaBuffer(void) } /* Alignment tests */ - for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i) + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { - const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i]; + const struct image_size_test *ptr = &image_size_tests[i]; - hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer); + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); -- 2.36.1

June 14, 2022

[PATCH v3 7/8] mflat/buffer: Support YV12, I420 and IYUV image formats.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Added --- dlls/mfplat/buffer.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 5a447817145..8934f761817 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1276,13 +1276,25 @@ static HRESULT create_1d_buffer(DWORD max_length, DWORD alignment, IMFMediaBuffe static p_copy_image_func get_2d_buffer_copy_func(DWORD fourcc) { - if (fourcc == MAKEFOURCC('N','V','1','2')) - return copy_image_nv12; - if (fourcc == MAKEFOURCC('I','M','C','1') || fourcc == MAKEFOURCC('I','M','C','3')) - return copy_image_imc1; - if (fourcc == MAKEFOURCC('I','M','C','2') || fourcc == MAKEFOURCC('I','M','C','4')) - return copy_image_imc2; - return NULL; + switch (fourcc) + { + case MAKEFOURCC('N','V','1','2'): + return copy_image_nv12; + + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + return copy_image_imc1; + + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + return copy_image_imc2; + + default: + return NULL; + } } static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) @@ -1318,12 +1330,12 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo break; case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): - plane_size = stride * 3 / 2 * height; - break; - case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): plane_size = stride * height * 3 / 2; break; default: @@ -1340,6 +1352,8 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','3'): case MAKEFOURCC('I','M','C','4'): case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): row_alignment = MF_128_BYTE_ALIGNMENT; break; default: @@ -1358,6 +1372,8 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): max_length = pitch * height * 3 / 2; break; default: -- 2.36.1

June 14, 2022

[PATCH v3 6/8] mfplat/tests: Remove duplicated tests.

by Giovanni Mascellani

The same tests are already performed in test_MFGetPlaneSize(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Added --- dlls/mfplat/tests/mfplat.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fd757d26d9b..74de51b42f1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4318,7 +4318,6 @@ image_size_tests[] = static void test_MFCalculateImageSize(void) { - DWORD plane_size; unsigned int i; UINT32 size; HRESULT hr; @@ -4340,15 +4339,6 @@ static void test_MFCalculateImageSize(void) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); - - if (pMFGetPlaneSize) - { - unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size; - - hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size); - ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); - ok(plane_size == expected, "%u: unexpected plane size %lu, expected %u.\n", i, plane_size, expected); - } } } -- 2.36.1

June 14, 2022

[PATCH v3 5/8] mfplat/buffer: Redirect all Lock2D() implementations to Lock2DSize().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the trace in memory_2d_buffer_Lock2D() v3: * Redirect all invocations to helper functions. --- dlls/mfplat/buffer.c | 140 ++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 90 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a7ba306223d..5a447817145 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -485,11 +485,17 @@ static ULONG WINAPI memory_2d_buffer_Release(IMF2DBuffer2 *iface) return IMFMediaBuffer_Release(&buffer->IMFMediaBuffer_iface); } -static HRESULT memory_2d_buffer_lock(struct buffer *buffer, BYTE **scanline0, LONG *pitch, - BYTE **buffer_start, DWORD *buffer_length) +static HRESULT memory_2d_buffer_lock2d(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, + LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; + if (!scanline0 || !pitch || !buffer_start || !buffer_length) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + if (buffer->_2d.linear_buffer) hr = MF_E_UNEXPECTED; else @@ -503,26 +509,19 @@ static HRESULT memory_2d_buffer_lock(struct buffer *buffer, BYTE **scanline0, LO *buffer_length = buffer->max_length; } + LeaveCriticalSection(&buffer->cs); + return hr; } static HRESULT WINAPI memory_2d_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr; + DWORD buffer_length; + BYTE *buffer_start; TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - hr = memory_2d_buffer_lock(buffer, scanline0, pitch, NULL, NULL); - - LeaveCriticalSection(&buffer->cs); - - return hr; + return memory_2d_buffer_lock2d(iface, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, &buffer_start, &buffer_length); } static HRESULT WINAPI memory_2d_buffer_Unlock2D(IMF2DBuffer2 *iface) @@ -615,21 +614,9 @@ static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, c static HRESULT WINAPI memory_2d_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr; - TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); - if (!scanline0 || !pitch || !buffer_start || !buffer_length) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - hr = memory_2d_buffer_lock(buffer, scanline0, pitch, buffer_start, buffer_length); - - LeaveCriticalSection(&buffer->cs); - - return hr; + return memory_2d_buffer_lock2d(iface, flags, scanline0, pitch, buffer_start, buffer_length); } static HRESULT WINAPI memory_2d_buffer_Copy2DTo(IMF2DBuffer2 *iface, IMF2DBuffer2 *dest_buffer) @@ -655,14 +642,13 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; -static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT d3d9_surface_buffer_lock2d(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, + LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) + if (!scanline0 || !pitch || !buffer_start || !buffer_length) return E_POINTER; EnterCriticalSection(&buffer->cs); @@ -679,6 +665,10 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca buffer->_2d.locks++; *scanline0 = buffer->d3d9_surface.rect.pBits; *pitch = buffer->d3d9_surface.rect.Pitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; } LeaveCriticalSection(&buffer->cs); @@ -686,6 +676,16 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca return hr; } +static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + DWORD buffer_length; + BYTE *buffer_start; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + return d3d9_surface_buffer_lock2d(iface, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, &buffer_start, &buffer_length); +} + static HRESULT WINAPI d3d9_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); @@ -743,37 +743,9 @@ static HRESULT WINAPI d3d9_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; - TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); - if (!scanline0 || !pitch || !buffer_start || !buffer_length) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks) - { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); - } - - if (SUCCEEDED(hr)) - { - buffer->_2d.locks++; - *scanline0 = buffer->d3d9_surface.rect.pBits; - *pitch = buffer->d3d9_surface.rect.Pitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->d3d9_surface.rect.Pitch * buffer->_2d.height; - } - - LeaveCriticalSection(&buffer->cs); - - return hr; + return d3d9_surface_buffer_lock2d(iface, flags, scanline0, pitch, buffer_start, buffer_length); } static const IMF2DBuffer2Vtbl d3d9_surface_buffer_vtbl = @@ -1030,14 +1002,13 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface return S_OK; } -static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +static HRESULT dxgi_surface_buffer_lock2d(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, + BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) + if (!scanline0 || !pitch || !buffer_start || !buffer_length) return E_POINTER; EnterCriticalSection(&buffer->cs); @@ -1051,6 +1022,10 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca { *scanline0 = buffer->dxgi_surface.map_desc.pData; *pitch = buffer->dxgi_surface.map_desc.RowPitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; } LeaveCriticalSection(&buffer->cs); @@ -1058,6 +1033,16 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **sca return hr; } +static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) +{ + DWORD buffer_length; + BYTE *buffer_start; + + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + return dxgi_surface_buffer_lock2d(iface, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, &buffer_start, &buffer_length); +} + static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); @@ -1112,34 +1097,9 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; - TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); - if (!scanline0 || !pitch || !buffer_start || !buffer_length) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) - hr = dxgi_surface_buffer_map(buffer); - - if (SUCCEEDED(hr)) - { - *scanline0 = buffer->dxgi_surface.map_desc.pData; - *pitch = buffer->dxgi_surface.map_desc.RowPitch; - if (buffer_start) - *buffer_start = *scanline0; - if (buffer_length) - *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; - } - - LeaveCriticalSection(&buffer->cs); - - return hr; + return dxgi_surface_buffer_lock2d(iface, flags, scanline0, pitch, buffer_start, buffer_length); } static HRESULT WINAPI dxgi_buffer_QueryInterface(IMFDXGIBuffer *iface, REFIID riid, void **obj) -- 2.36.1

June 14, 2022

[PATCH v3 4/8] mfplat/tests: Test interaction between Lock2D() and LockRect().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index aefd4aa46c1..fd757d26d9b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6519,9 +6519,23 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock the buffer while the surface is locked. */ + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + /* Cannot lock the surface once the buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + hr = IMF2DBuffer_GetScanline0AndPitch(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); -- 2.36.1

June 14, 2022

[PATCH v3 3/8] mfplat/tests: Test interaction between Lock() and LockRect().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 52608c05929..aefd4aa46c1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6391,6 +6391,7 @@ static void test_MFCreateDXSurfaceBuffer(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; IDirect3DSwapChain9 *swapchain; + D3DLOCKED_RECT locked_rect; DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; @@ -6463,9 +6464,32 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(length == 2 * max_length, "Unexpected length %lu.\n", length); + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + + /* Cannot lock while the surface is locked. */ + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(length == max_length, "Unexpected length %lu instead of %lu.\n", length, max_length); + + /* You can lock the surface while the media buffer is locked. */ + hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); + ok(hr == S_OK, "Failed to lock back buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(length == max_length, "Unexpected length.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(backbuffer); + ok(hr == S_OK, "Failed to unlock back buffer, hr %#lx.\n", hr); /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer); -- 2.36.1

June 14, 2022

[PATCH v3 2/8] mfplat/buffer: Fix image copy function for IMC2/IMC4 buffers with odd height.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 3 +-- dlls/mfplat/tests/mfplat.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 39407ccc9e2..a7ba306223d 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -100,8 +100,7 @@ static void copy_image_imc1(BYTE *dest, LONG dest_stride, const BYTE *src, LONG static void copy_image_imc2(BYTE *dest, LONG dest_stride, const BYTE *src, LONG src_stride, DWORD width, DWORD lines) { - MFCopyImage(dest, dest_stride, src, src_stride, width / 2, lines / 2); - MFCopyImage(dest + dest_stride / 2, dest_stride, src + src_stride / 2, src_stride, width / 2, lines / 2); + MFCopyImage(dest, dest_stride / 2, src, src_stride / 2, width / 2, lines); } static inline struct buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1b5e8cf7ed5..52608c05929 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6027,12 +6027,11 @@ static void test_MFCreate2DMediaBuffer(void) case MAKEFOURCC('I','M','C','2'): case MAKEFOURCC('I','M','C','4'): - for (j = ptr->height; j < length2 / stride; j++) + for (j = 0; ptr->height * stride + j * (stride / 2) < length2; j++) for (k = 0; k < ptr->width / 2; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); - for (j = ptr->height; j < length2 / stride; j++) - for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); + ok(data[ptr->height * pitch + j * (pitch / 2) + k] == 0xff, + "Unexpected byte %02x at test %d row %d column %d.\n", + data[ptr->height * pitch + j * (pitch / 2) + k], i, j, k); break; case MAKEFOURCC('N','V','1','2'): -- 2.36.1

June 14, 2022

[PATCH v3 1/8] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 28b89de4b1f..1b5e8cf7ed5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

June 14, 2022

Re: HLSL offsetting

by Giovanni Mascellani

Hi, I finally managed to read through your messages, and it seems that we have a sort of agreement for trying with structured dereferences, which I agree with too. Il 10/06/22 23:13, Zebediah Figura ha scritto: >> On the other hand, the version of (b) I imagine changes hlsl_deref to: >> --- >> struct hlsl_deref >> { >> struct hlsl_ir_var *var; >> unsigned int route_len; >> struct hlsl_src *route; >> }; >> --- >> Where route is intended to be a variable size array of component offsets. > > I was envisioning something more explicit, but this is simpler, so my > guess is that this is what we want. I can live with Francisco's proposal, but my preference would be for something like: enum hlsl_selector_type { HLSL_SELECTOR_SUBSCRIPT, HLSL_SELECTOR_FIELD, }; struct hlsl_selector { enum hlsl_selector_type type; union { hlsl_src *subscript; unsigned int field; }; }; struct hlsl_deref { struct hlsl_ir_var *var; unsigned int path_len; struct hlsl_selector *path; }; This way field indices are kept as actual numbers, not other nodes that have to resolve to a constant uint value. In general I like data types to constrain as much as possible to the valid values that you can store in them (and I don't think there is any way in HLSL to make a dynamic reference to a field of a structure, like it is possible in C++). Giovanni.

June 14, 2022