remove img->copy from all decoders

CVS patchset: 3436
CVS date: 2002/12/06 01:44:06

18 files changed, 18 insertions, 260 deletions

diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c
index e03f245b9..34191dafa 100644
--- a/src/libdivx4/xine_decoder.c
+++ b/src/libdivx4/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.43 2002/09/05 22:18:56 mroi Exp $
+ * $Id: xine_decoder.c,v 1.44 2002/12/06 01:44:06 miguelfreitas Exp $
  *
  * xine decoder plugin using divx4
  *
@@ -325,25 +325,6 @@ static inline void divx4_copy_frame(divx4_decoder_t *this, vo_frame_t *img,
       dst_offset_v += img->pitches[2];
     }
   } 
-     
-  /* check for the copy function pointer. If set, we need to call it
-     with slices of 16 lines. Too bad we can't set the y,u and v
-     stride values (because then we wouldn't need the first copy) */
-  if (img->copy && img->bad_frame == 0) {
-    int height = img->height;
-    uint8_t *src[3];
-
-    src[0] = img->base[0];
-    src[1] = img->base[1];
-    src[2] = img->base[2];
-
-    while ((height -= 16) >= 0) {
-      img->copy(img, src);
-      src[0] += 16 * img->pitches[0];
-      src[1] +=  8 * img->pitches[1];
-      src[2] +=  8 * img->pitches[2];
-    }
-  }
 }
 
 static int divx4_can_handle (video_decoder_t *this_gen, int buf_type) {
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 163927f0a..838e7b7a2 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.9 2002/11/26 02:25:26 guenter Exp $
+ * $Id: xine_decoder.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
  *
  * thin layer to use real binary-only codecs in xine
  *
@@ -335,21 +335,6 @@ static void realdec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 			  this->frame_buffer+this->frame_size*5/4, 
 			  this->frame_size/4);
 	
-	if (img->copy) {
-	  int height = img->height;
-	  uint8_t *src[3];
-	  
-	  src[0] = img->base[0];
-	  src[1] = img->base[1];
-	  src[2] = img->base[2];
-	  
-	  while ((height -= 16) >= 0) {
-	    img->copy(img, src);
-	    src[0] += 16 * img->pitches[0];
-	    src[1] +=  8 * img->pitches[1];
-	    src[2] +=  8 * img->pitches[2];
-	  }
-	}
 	img->draw(img, this->stream);
 	img->free(img);
 	
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 9e3babe8a..7e6e772af 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: w32codec.c,v 1.104 2002/12/01 17:05:34 tmmm Exp $
+ * $Id: w32codec.c,v 1.105 2002/12/06 01:44:07 miguelfreitas Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -825,18 +825,6 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
 #endif
       }
       
-      if (img->copy && !this->skipframes) {
-	int height = abs(this->o_bih.biHeight);
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	}
-      }
-
       this->skipframes = img->draw(img, this->stream);
 
 #ifdef LOG
diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c
index c345c31bf..aa9ab5000 100644
--- a/src/libxinevdec/cinepak.c
+++ b/src/libxinevdec/cinepak.c
@@ -22,7 +22,7 @@
  * based on overview of Cinepak algorithm and example decoder
  * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/
  *
- * $Id: cinepak.c,v 1.21 2002/11/20 11:57:46 mroi Exp $
+ * $Id: cinepak.c,v 1.22 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdlib.h>
@@ -431,22 +431,6 @@ static void cvid_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
 	sv += this->biWidth/2;
       }
 	
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-	src[1] = img->base[1];
-	src[2] = img->base[2];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	  src[1] +=  8 * img->pitches[1];
-	  src[2] +=  8 * img->pitches[2];
-	}
-      }      
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index f2d614aaa..a95679877 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: cyuv.c,v 1.12 2002/11/20 11:57:46 mroi Exp $
+ * $Id: cyuv.c,v 1.13 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -192,18 +192,6 @@ static void cyuv_decode_data (video_decoder_t *this_gen,
     cyuv_decode(this->buf, this->size, img->base[0],
       this->width, this->height, 0);
 
-    if (img->copy) {
-      int height = img->height;
-      uint8_t *src[3];
-
-      src[0] = img->base[0];
-
-      while ((height -= 16) >= 0) {
-	img->copy(img, src);
-	src[0] += 16 * img->pitches[0];
-      }
-    }
-
     this->skipframes = img->draw(img, this->stream);
     if( this->skipframes < 0 )
       this->skipframes = 0;
diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c
index 4aae7d418..9e2d26d14 100644
--- a/src/libxinevdec/fli.c
+++ b/src/libxinevdec/fli.c
@@ -23,7 +23,7 @@
  * avoid when implementing a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: fli.c,v 1.10 2002/11/20 11:57:46 mroi Exp $
+ * $Id: fli.c,v 1.11 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -470,18 +470,6 @@ static void fli_decode_data (video_decoder_t *this_gen,
       decode_fli_frame(this);
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	}
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 23e48a6fe..62d87707e 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -23,7 +23,7 @@
  * value from the last frame. This creates a slowly rotating solid color
  * frame when the frames are played in succession.
  *
- * $Id: foovideo.c,v 1.11 2002/11/20 11:57:46 mroi Exp $
+ * $Id: foovideo.c,v 1.12 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -147,18 +147,6 @@ static void foovideo_decode_data (video_decoder_t *this_gen,
         this->width * this->height * 2);
       this->current_yuv_byte += 3;
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index e774d7d1f..17a7feb3d 100644
--- a/src/libxinevdec/idcinvideo.c
+++ b/src/libxinevdec/idcinvideo.c
@@ -21,7 +21,7 @@
  * the Id CIN format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  * 
- * $Id: idcinvideo.c,v 1.9 2002/11/20 11:57:46 mroi Exp $
+ * $Id: idcinvideo.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -298,18 +298,6 @@ static void idcinvideo_decode_data (video_decoder_t *this_gen,
       huff_decode(this);
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index 70e050f07..84c25fd2e 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
  * For more information on the MS RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: msrle.c,v 1.11 2002/11/20 11:57:46 mroi Exp $
+ * $Id: msrle.c,v 1.12 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -256,18 +256,6 @@ static void msrle_decode_data (video_decoder_t *this_gen,
       decode_msrle8(this);
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	}
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index 78260833f..8a68e63fe 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.16 2002/11/20 11:57:47 mroi Exp $
+ * $Id: msvc.c,v 1.17 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdlib.h>
@@ -291,18 +291,6 @@ static void msvc_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
 	}
       }
 
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	}
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/qtrle.c b/src/libxinevdec/qtrle.c
index 4c355b2c1..0deb4c3a4 100644
--- a/src/libxinevdec/qtrle.c
+++ b/src/libxinevdec/qtrle.c
@@ -21,7 +21,7 @@
  * For more information on the QT RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtrle.c,v 1.7 2002/11/20 11:57:47 mroi Exp $
+ * $Id: qtrle.c,v 1.8 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -790,18 +790,6 @@ static void qtrle_decode_data (video_decoder_t *this_gen,
       img->pts       = buf->pts;
       img->bad_frame = 0;
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index 733c41616..140ac1a52 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
  * For more information about the RPZA format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: qtrpza.c,v 1.9 2002/11/20 11:57:47 mroi Exp $
+ * $Id: qtrpza.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -350,18 +350,6 @@ static void qtrpza_decode_data (video_decoder_t *this_gen,
       decode_qtrpza(this);
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index 45194b934..e35e14d27 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
  * For more information on the SMC format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtsmc.c,v 1.9 2002/11/20 11:57:47 mroi Exp $
+ * $Id: qtsmc.c,v 1.10 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -582,18 +582,6 @@ static void qtsmc_decode_data (video_decoder_t *this_gen,
       decode_qtsmc(this);
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 510108383..de392759d 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just converts a raw RGB image to a YUY2 map
  * suitable for display under xine.
  * 
- * $Id: rgb.c,v 1.12 2002/11/20 11:57:47 mroi Exp $
+ * $Id: rgb.c,v 1.13 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -201,18 +201,6 @@ static void rgb_decode_data (video_decoder_t *this_gen,
 
       yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	}
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c
index dc4179cf8..1285b46c0 100644
--- a/src/libxinevdec/roqvideo.c
+++ b/src/libxinevdec/roqvideo.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: roqvideo.c,v 1.15 2002/11/20 11:57:47 mroi Exp $
+ * $Id: roqvideo.c,v 1.16 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 /* And this is the header that came with the RoQ video decoder: */
@@ -473,22 +473,6 @@ static void roqvideo_decode_data (video_decoder_t *this_gen,
     xine_fast_memcpy(img->base[1], this->cur_u, this->c_size);
     xine_fast_memcpy(img->base[2], this->cur_v, this->c_size);
 
-    if (img->copy) {
-      int height = img->height;
-      uint8_t *src[3];
-
-      src[0] = img->base[0];
-      src[1] = img->base[1];
-      src[2] = img->base[2];
-
-      while ((height -= 16) >= 0) {
-	img->copy(img, src);
-	src[0] += 16 * img->pitches[0];
-	src[1] +=  8 * img->pitches[1];
-	src[2] +=  8 * img->pitches[2];
-      }
-    }
-
     this->skipframes = img->draw(img, this->stream);
     if( this->skipframes < 0 )
       this->skipframes = 0;
diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c
index a06c38d58..ae39d01ab 100644
--- a/src/libxinevdec/svq1.c
+++ b/src/libxinevdec/svq1.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: svq1.c,v 1.14 2002/11/20 11:57:47 mroi Exp $
+ * $Id: svq1.c,v 1.15 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -1430,22 +1430,6 @@ static void svq1dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 	  svq1_copy_frame (this->svq1, img->base, img->pitches);
 	}
 
-	if (img->copy) {
-	  int height = img->height;
-	  uint8_t *src[3];
-
-	  src[0] = img->base[0];
-	  src[1] = img->base[1];
-	  src[2] = img->base[2];
-
-	  while ((height -= 16) >= 0) {
-	    img->copy(img, src);
-	    src[0] += 16 * img->pitches[0];
-	    src[1] +=  8 * img->pitches[1];
-	    src[2] +=  8 * img->pitches[2];
-	  }
-	}
-
 	img->draw(img, this->stream);
 	img->free(img);
       }
diff --git a/src/libxinevdec/wc3video.c b/src/libxinevdec/wc3video.c
index bed53b93d..4de621f25 100644
--- a/src/libxinevdec/wc3video.c
+++ b/src/libxinevdec/wc3video.c
@@ -22,7 +22,7 @@
  * For more information on the WC3 Movie format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: wc3video.c,v 1.10 2002/11/20 11:57:48 mroi Exp $
+ * $Id: wc3video.c,v 1.11 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -426,18 +426,6 @@ static void wc3video_decode_data (video_decoder_t *this_gen,
       wc3_decode_frame (this);
       yuv444_to_yuy2(this->current_frame, img->base[0], img->pitches[0]);
 
-      if (img->copy) {
-        int height = img->height;
-        uint8_t *src[3];
-
-        src[0] = img->base[0];
-
-        while ((height -= 16) >= 0) {
-          img->copy(img, src);
-          src[0] += 16 * img->pitches[0];
-        }
-      }
-
       img->draw(img, this->stream);
       img->free(img);
 
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index fcaf7ec09..1c3e85fbb 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
  * 
- * $Id: yuv.c,v 1.14 2002/12/04 05:33:40 tmmm Exp $
+ * $Id: yuv.c,v 1.15 2002/12/06 01:44:06 miguelfreitas Exp $
  */
 
 #include <stdio.h>
@@ -201,22 +201,6 @@ static void yuv_decode_data (video_decoder_t *this_gen,
       img->pts       = buf->pts;
       img->bad_frame = 0;
 
-      if (img->copy) {
-	int height = img->height;
-	uint8_t *src[3];
-
-	src[0] = img->base[0];
-	src[1] = img->base[1];
-	src[2] = img->base[2];
-
-	while ((height -= 16) >= 0) {
-	  img->copy(img, src);
-	  src[0] += 16 * img->pitches[0];
-	  src[1] +=  8 * img->pitches[1];
-	  src[2] +=  8 * img->pitches[2];
-	}
-      }
-
       img->draw(img, this->stream);
       img->free(img);