[PATCH 2/3] quartz: Properly copy data to render surfaces of planar formats in VMR7.

[Francisco Casas]

From: Francisco Casas

These changes were previously introduced for vmr9.c but were missing for
vmr7.c.
---
 dlls/quartz/vmr7.c | 74 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/dlls/quartz/vmr7.c b/dlls/quartz/vmr7.c
index dc1a614e2c1..7d29e38b14a 100644
--- a/dlls/quartz/vmr7.c
+++ b/dlls/quartz/vmr7.c
@@ -125,6 +125,42 @@ static struct vmr7 *impl_from_IBaseFilter(IBaseFilter *iface)
     return CONTAINING_RECORD(iface, struct vmr7, renderer.filter.IBaseFilter_iface);
 }

+static void copy_plane(BYTE **dstp, unsigned int dst_pitch, unsigned int dst_height,
+                       const BYTE **srcp, unsigned int src_pitch, int src_height)
+{
+    size_t copy_size = min(src_pitch, dst_pitch);
+    const BYTE *src = *srcp;
+    BYTE *dst = *dstp;
+    unsigned int i;
+
+    if (src_height < 0)
+    {
+        TRACE("Inverting image.\n");
+
+        src_height = -src_height;
+        src += src_height * src_pitch;
+
+        for (i = 0; i < src_height; ++i)
+        {
+            src -= src_pitch;
+            memcpy(dst, src, copy_size);
+            dst += dst_pitch;
+        }
+    }
+    else
+    {
+        for (i = 0; i < src_height; ++i)
+        {
+            memcpy(dst, src, copy_size);
+            dst += dst_pitch;
+            src += src_pitch;
+        }
+    }
+
+    *srcp += src_pitch * src_height;
+    *dstp += dst_pitch * dst_height;
+}
+
 static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
 {
     struct vmr7 *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface);
@@ -202,36 +238,40 @@ static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
                 surface_desc.dwWidth, surface_desc.dwHeight);
     }

-    if (height > 0 && bitmap_header->biCompression == BI_RGB)
+    if (bitmap_header->biCompression == mmioFOURCC('N','V','1','2'))
+    {
+        BYTE *dst = surface_desc.lpSurface;
+        const BYTE *src = data;
+
+        copy_plane(&dst, surface_desc.lPitch, surface_desc.dwHeight, &src, src_pitch, height);
+        copy_plane(&dst, surface_desc.lPitch, surface_desc.dwHeight / 2, &src, src_pitch, height / 2);
+    }
+    else if (bitmap_header->biCompression == mmioFOURCC('Y','V','1','2'))
     {
-        BYTE *dst = (BYTE *)surface_desc.lpSurface + (height * surface_desc.lPitch);
+        BYTE *dst = surface_desc.lpSurface;
         const BYTE *src = data;

-        TRACE("Inverting image.\n");
+        copy_plane(&dst, surface_desc.lPitch, surface_desc.dwHeight, &src, src_pitch, height);
+        copy_plane(&dst, surface_desc.lPitch / 2, surface_desc.dwHeight / 2, &src, src_pitch / 2, height / 2);
+        copy_plane(&dst, surface_desc.lPitch / 2, surface_desc.dwHeight / 2, &src, src_pitch / 2, height / 2);
+    }
+    else if (height > 0 && bitmap_header->biCompression == BI_RGB)
+    {
+        BYTE *dst = surface_desc.lpSurface;
+        const BYTE *src = data;

-        while (height--)
-        {
-            dst -= surface_desc.lPitch;
-            memcpy(dst, src, width * depth / 8);
-            src += src_pitch;
-        }
+        copy_plane(&dst, surface_desc.lPitch, surface_desc.dwHeight, &src, src_pitch, -height);
     }
     else if (surface_desc.lPitch != src_pitch)
     {
         BYTE *dst = surface_desc.lpSurface;
         const BYTE *src = data;

-        height = abs(height);
-
         TRACE("Source pitch %u does not match dest pitch %lu; copying manually.\n",
                 src_pitch, surface_desc.lPitch);

-        while (height--)
-        {
-            memcpy(dst, src, width * depth / 8);
-            src += src_pitch;
-            dst += surface_desc.lPitch;
-        }
+        height = abs(height);
+        copy_plane(&dst, surface_desc.lPitch, surface_desc.dwHeight, &src, src_pitch, height);
     }
     else
     {