mfplat: Fix buffer alignment calculation.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mfplat: Fix buffer alignment calculation.
6450fb3b · Nikolay Sivov · Alexandre Julliard · eead400b · 6450fb3b
Commit 6450fb3b authored Mar 17, 2020 by Nikolay Sivov Committed by Alexandre Julliard Mar 17, 2020
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

buffer.c dlls/mfplat/buffer.c +3 -3

No files found.
--- a/dlls/mfplat/buffer.c
+++ b/dlls/mfplat/buffer.c
@@ -24,7 +24,7 @@

 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);

-#define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1)))
+#define ALIGN_SIZE(size, alignment) (((size) + (alignment)) & ~((alignment)))

 struct memory_buffer
 {
@@ -262,7 +262,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat
        hr = MF_E_INVALIDREQUEST;
    else if (!buffer->_2d.linear_buffer)
    {
-        if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, 64))))
+        if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT))))
            hr = E_OUTOFMEMORY;
    }

@@ -575,7 +575,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo
    if (!object)
        return E_OUTOFMEMORY;

-    pitch = ALIGN_SIZE(width * bpp, 64);
+    pitch = ALIGN_SIZE(width * bpp, MF_64_BYTE_ALIGNMENT);

    switch (fourcc)
    {