[xine-cvs] CVS: xine-lib/src/libffmpeg xine_decoder.c,1.94,1.95

[James S. <jst...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv30843

Modified Files:
	xine_decoder.c 
Log Message:
Support RGBA32 format ffmpeg frames. Allows playback of RGB HuffYUV files


Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- xine_decoder.c	19 Feb 2003 22:15:43 -0000	1.94
+++ xine_decoder.c	20 Feb 2003 02:13:19 -0000	1.95
@@ -85,6 +85,9 @@
   float             aspect_ratio;
   int               xine_aspect_ratio;
   
+  int               output_format;
+  yuv_planes_t      yuv;
+   
 } ff_video_decoder_t;
 
 typedef struct {
@@ -162,6 +165,12 @@
   this->bufsize = VIDEOBUFSIZE;
   
   this->skipframes = 0;
+  
+  if(this->context->pix_fmt == PIX_FMT_RGBA32) {
+    this->output_format = XINE_IMGFMT_YUY2;
+    init_yuv_planes(&this->yuv, this->bih.biWidth, this->bih.biHeight);
+  } else
+    this->output_format = XINE_IMGFMT_YV12;
 }
 
 static void find_sequence_header (ff_video_decoder_t *this,
@@ -526,7 +535,7 @@
 						  this->bih.biWidth,
 						  this->bih.biHeight,
 						  this->xine_aspect_ratio, 
-						  XINE_IMGFMT_YV12,
+						  this->output_format,
 						  VO_BOTH_FIELDS);
 	
 	img->pts      = buf->pts;
@@ -590,7 +599,33 @@
               this->bih.biWidth,
               this->bih.biHeight);
 
-          } else
+          } else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
+          
+            int x, plane_ptr = 0;
+            uint8_t *src;
+            
+            for(y = 0; y < this->bih.biHeight; y++) {
+              src = sy;
+              for(x = 0; x < this->bih.biWidth; x++) {
+                uint8_t r, g, b;
+              
+                /* These probably need to be switched for big endian */
+                b = *src; src++;
+                g = *src; src++;
+                r = *src; src += 2;
+
+                this->yuv.y[plane_ptr] = COMPUTE_Y(r, g, b);
+                this->yuv.u[plane_ptr] = COMPUTE_U(r, g, b);
+                this->yuv.v[plane_ptr] = COMPUTE_V(r, g, b);
+                plane_ptr++;
+	      }
+              sy += this->av_frame->linesize[0];
+            }
+            
+            yuv444_to_yuy2(&this->yuv, img->base[0], img->pitches[0]);
+          
+          } else {
+          
 	  for (y=0; y<this->bih.biHeight; y++) {
 	    
 	    xine_fast_memcpy (dy, sy, this->bih.biWidth);
@@ -600,8 +635,6 @@
 	    sy += this->av_frame->linesize[0];
 	  }
 	
-          if ((this->context->pix_fmt != PIX_FMT_YUV410P) &&
-              (this->context->pix_fmt != PIX_FMT_YUV411P))
           for (y=0; y<(this->bih.biHeight/2); y++) {
 	    
 	    if (this->context->pix_fmt != PIX_FMT_YUV444P) {
@@ -643,6 +676,8 @@
 	      sv += this->av_frame->linesize[2];
 	    }
 	  }
+
+	  }
 	}
       
 	this->skipframes = img->draw(img, this->stream);
@@ -739,6 +774,9 @@
   if(this->context && this->context->extradata)
     free(this->context->extradata);
 
+  if(this->context && this->context->pix_fmt == PIX_FMT_RGBA32)
+    free_yuv_planes(&this->yuv);
+  
   if( this->context )
     free( this->context );