Add 'pitch' support to video decoders (pitch != width)

CVS patchset: 2282
CVS date: 2002/07/15 21:42:33

1 files changed, 10 insertions, 17 deletions

diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index ebe1c7d35..bc88d44af 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.1 2002/07/15 00:56:12 tmmm Exp $
+ * $Id: rgb.c,v 1.2 2002/07/15 21:42:34 esnel Exp $
  */
 
 #include <stdio.h>
@@ -219,26 +219,19 @@ static void rgb_decode_data (video_decoder_t *this_gen,
           this->yuv_planes.v[row_ptr + pixel_ptr - 2];
       }
 
-      yuv444_to_yuy2(&this->yuv_planes, img->base[0]);
+      yuv444_to_yuy2(&this->yuv_planes, img->base[0], img->pitches[0]);
 
-/*
       if (img->copy) {
+	int height = img->height;
+	uint8_t *src[3];
 
-        int height = abs(this->biHeight);
-        int stride = this->biWidth;
-        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 * stride;
-          src[1] +=  4 * stride;
-          src[2] +=  4 * stride;
-        }
+	src[0] = img->base[0];
+
+	while ((height -= 16) >= 0) {
+	  img->copy(img, src);
+	  src[0] += 16 * img->pitches[0];
+	}
       }
-*/
 
       img->draw(img);
       img->free(img);