copy: fix download from VA surface with odd sizes.

Fix download from Uncacheable Speculative Write Combining (USWC) memory,
e.g. VA surfaces, when the dimensions are odd. In particular, make sure
to get the very last chroma component for each row.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index 9eed17f7d72fcb9e163244f9c43c3afe69558eb3..d29843c037e494170f0d6bc976bea8439dd6115b 100644 (file)
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -325,7 +325,7 @@ static void SSE_CopyFromNv12(picture_t *dst,
                     dst->p[1].p_pixels, dst->p[1].i_pitch,
                     src[1], src_pitch[1],
                     cache->buffer, cache->size,
-                    width/2, height/2, cpu);
+                    (width+1)/2, (height+1)/2, cpu);
     asm volatile ("emms");
 }
 
@@ -339,7 +339,7 @@ static void SSE_CopyFromYv12(picture_t *dst,
         SSE_CopyPlane(dst->p[n].p_pixels, dst->p[n].i_pitch,
                       src[n], src_pitch[n],
                       cache->buffer, cache->size,
-                      width/d, height/d, cpu);
+                      (width+d-1)/d, (height+d-1)/d, cpu);
     }
     asm volatile ("emms");
 }