[xine-cvs] CVS: xine-lib/src/video_out deinterlace.c,1.19,1.20

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory usw-pr-cvs1:/tmp/cvs-serv14984/src/video_out

Modified Files:
	deinterlace.c 
Log Message:
Pierre Lombard <p-...@wa...> fixed losing the first line in 
linearblend deinterlacer


Index: deinterlace.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/deinterlace.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- deinterlace.c	3 Jun 2002 19:05:03 -0000	1.19
+++ deinterlace.c	30 Jul 2002 13:37:33 -0000	1.20
@@ -643,11 +643,14 @@
   
   int n;
 
-  for (Line = 0; Line < height - 2; ++Line)
+  /* Copy first line */
+  xine_fast_memcpy(pdst, psrc[0], LineLength);
+
+  for (Line = 1; Line < height - 1; ++Line)
   {
-    YVal1 = (uint64_t *)(psrc[0] + Line * LineLength);
-    YVal2 = (uint64_t *)(psrc[0] + (Line + 1) * LineLength);
-    YVal3 = (uint64_t *)(psrc[0] + (Line + 2) * LineLength);
+    YVal1 = (uint64_t *)(psrc[0] + (Line - 1) * LineLength);
+    YVal2 = (uint64_t *)(psrc[0] + (Line) * LineLength);
+    YVal3 = (uint64_t *)(psrc[0] + (Line + 1) * LineLength);
     Dest = (uint64_t *)(pdst + Line * LineLength);
 
     n = LineLength >> 3;
@@ -690,10 +693,7 @@
     }
   }
 
-  /* copy last 2 lines */
-  xine_fast_memcpy(pdst + Line * LineLength, 
-                   psrc[0] + Line * LineLength, LineLength);
-  Line++;
+  /* Copy last line */
   xine_fast_memcpy(pdst + Line * LineLength, 
                    psrc[0] + Line * LineLength, LineLength);
                    
@@ -711,12 +711,12 @@
    screen (psrc[0]) line by line.
 
    The i-th line of the destination screen is the average of 3 lines
-   from the source screen: the i-th, (i+1)-th and (i+2)-th lines, with
-   the (i+1)-th line having weight 2 in the computation.
+   from the source screen: the (i-1)-th, i-th and (i+1)-th lines, with
+   the i-th line having weight 2 in the computation.
 
    Remarks:
    * each line on pdst doesn't depend on previous lines;
-   * due to the way the algorithm is defined, the last two lines of the
+   * due to the way the algorithm is defined, the first & last lines of the
      screen aren't deinterlaced.
    
 */
@@ -731,7 +731,11 @@
   l2 = l1 + width;	/* 2nd source line = line that follows l1 */
   l3 = l2 + width;	/* 3rd source line = line that follows l2 */
 
-  for (y = 0; y < height-1; ++y) { 
+  /* Copy the first line */
+  xine_fast_memcpy(l0, l1, width);
+  l0 += width;
+
+  for (y = 1; y < height-1; ++y) { 
     /* computes avg of: l1 + 2*l2 + l3 */
 
     for (x = 0; x < width; ++x) {
@@ -743,8 +747,8 @@
     l0 += width;
   }
 
-  /* copies the last two lines */
-  xine_fast_memcpy(l0, l1, 2*width);
+  /* Copy the last line */
+  xine_fast_memcpy(l0, l1, width);
 }
 
 static int check_for_mmx(void)