[MPlayer-cvslog] r33690 - trunk/libmpcodecs/vf_stereo3d.c

[reimar]

Author: reimar
Date: Tue Jun 21 19:53:24 2011
New Revision: 33690

Log:
Change memcpy_pic to force it to never write to image parts between
width and stride if creating a row-interleaved format, otherwise
the second memcpy_pic might overwrite what the first wrote.
Changing the first should not be necessary but might result in
better performance.

Patch by Steaphan Greene [sgreene cs.binghamton.edu]

Modified:
   trunk/libmpcodecs/vf_stereo3d.c

Modified: trunk/libmpcodecs/vf_stereo3d.c
==============================================================================
--- trunk/libmpcodecs/vf_stereo3d.c	Tue Jun 21 19:49:21 2011	(r33689)
+++ trunk/libmpcodecs/vf_stereo3d.c	Tue Jun 21 19:53:24 2011	(r33690)
@@ -280,18 +280,20 @@ static int put_image(struct vf_instance 
         case ABOVE_BELOW_2_RL:
         case INTERLEAVE_ROWS_LR:
         case INTERLEAVE_ROWS_RL:
-            memcpy_pic(dmpi->planes[0] + out_off_left,
+            memcpy_pic2(dmpi->planes[0] + out_off_left,
                        mpi->planes[0] + in_off_left,
                        3 * vf->priv->width,
                        vf->priv->height,
                        dmpi->stride[0] * vf->priv->row_step,
-                       mpi->stride[0] * vf->priv->row_step);
-            memcpy_pic(dmpi->planes[0] + out_off_right,
+                       mpi->stride[0] * vf->priv->row_step,
+                       vf->priv->row_step != 1);
+            memcpy_pic2(dmpi->planes[0] + out_off_right,
                        mpi->planes[0] + in_off_right,
                        3 * vf->priv->width,
                        vf->priv->height,
                        dmpi->stride[0] * vf->priv->row_step,
-                       mpi->stride[0] * vf->priv->row_step);
+                       mpi->stride[0] * vf->priv->row_step,
+                       vf->priv->row_step != 1);
             break;
         case MONO_L:
         case MONO_R: