[xine-cvs] CVS: xine-lib/src/libtheora xine_decoder.c,1.11,1.12

[Andreas H. <hei...@us...>]

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

Modified Files:
	xine_decoder.c 
Log Message:
reviewed and improved comments from Philip Jägenstedt

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libtheora/xine_decoder.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xine_decoder.c	8 Jul 2003 12:24:40 -0000	1.11
+++ xine_decoder.c	13 Jul 2003 18:36:34 -0000	1.12
@@ -84,10 +84,19 @@
 static void yuv2frame(yuv_buffer *yuv, vo_frame_t *frame, int offset_x, int offset_y) {
   int i;
   int crop_offset;
-  /*fixme - clarify if the frame must be copied or if there is a faster solution
-   like exchanging the pointers*/
 
-  /*copy yuv data onto the frame, respecting offsets*/
+  /* fixme - direct rendering (exchaning pointers) may be possible.
+   * frame->base[0] = yuv->y could work if one could change the
+   * pitches[0,1,2] values, and rely on the drawing routine using
+   * the new pitches. With cropping and offsets, it's a bit trickier,
+   * but it would still be possible.
+   * Attempts at doing this have yielded nothing but SIGSEVs so far.
+   */
+
+  /* Copy yuv data onto the frame. Cropping and offset as specified
+   * by the frame_width, frame_height, offset_x and offset_y fields
+   * in the theora header is carried out.
+   */
 
   crop_offset=offset_x+yuv->y_stride*offset_y;
   for(i=0;i<frame->height;i++)
@@ -218,7 +227,7 @@
       /*fixme - aspectratio from theora is not considered*/
       frame = this->stream->video_out->get_frame( this->stream->video_out,
 						  this->width, this->height,
-						  ASPECT_SQUARE,
+						  XINE_VO_ASPECT_SQUARE,
 						  XINE_IMGFMT_YV12,
 						  VO_BOTH_FIELDS);
       yuv2frame(&yuv, frame, this->offset_x, this->offset_y);