Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com
Il 14/03/22 15:47, Nikolay Sivov ha scritto:
From: Giovanni Mascellani gmascellani@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
dlls/mfplat/buffer.c | 2 +- dlls/mfplat/tests/mfplat.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 1cb84cba944..2ec714c1419 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1385,7 +1385,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo max_length = pitch * height; }
- if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl)))
- if (FAILED(hr = memory_buffer_init(object, max_length, row_alignment, &memory_1d_2d_buffer_vtbl))) { free(object); return hr;
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d9c25edaa72..83877041694 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6005,6 +6005,28 @@ static void test_MFCreate2DMediaBuffer(void)
IMFMediaBuffer_Release(buffer); }
/* Alignment tests */
for (i = 0; i < ARRAY_SIZE(_2d_buffer_tests); ++i)
{
const struct _2d_buffer_test *ptr = &_2d_buffer_tests[i];hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->fourcc, FALSE, &buffer);ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr);hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer);ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr);hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch);ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr);ok(((uintptr_t)data & MF_64_BYTE_ALIGNMENT) == 0, "Misaligned data at %p.\n", data);hr = IMF2DBuffer_Unlock2D(_2dbuffer);ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr);IMF2DBuffer_Release(_2dbuffer);IMFMediaBuffer_Release(buffer);} }
static void test_MFCreateMediaBufferFromMediaType(void)