[xine-cvs] CVS: xine-lib/src/libffmpeg xine_decoder.c,1.137,1.138

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

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

Modified Files:
	xine_decoder.c 
Log Message:
Account for changes in libavcodec buffer allocation logic - stops deadlocks with b-frames and makes direct rendering work again


Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- xine_decoder.c	16 Nov 2003 23:33:44 -0000	1.137
+++ xine_decoder.c	22 Nov 2003 20:29:41 -0000	1.138
@@ -170,12 +170,6 @@
 					    this->output_format,
 					    VO_BOTH_FIELDS|this->frame_flags);
 
-  /* use drawn as a decoder flag.
-   * if true: free this frame on release_buffer.
-   * if false: free this frame after drawing it.
-   */
-  img->drawn = av_frame->reference;
-  
   av_frame->opaque = img;
 
   av_frame->data[0]= img->base[0];
@@ -206,8 +200,7 @@
   av_frame->data[1]= NULL;
   av_frame->data[2]= NULL;
   
-  if(img->drawn)
-    img->free(img);
+  img->free(img);
 
   av_frame->opaque = NULL;
 }
@@ -992,7 +985,7 @@
     if ( (buf->decoder_flags & (BUF_FLAG_FRAME_END|BUF_FLAG_FRAME_START))
 	  || this->is_continous) {
 
-      vo_frame_t *img, *tmp_img = NULL;
+      vo_frame_t *img;
       int         free_img;
       int         got_picture, len;
       int         offset;
@@ -1060,11 +1053,7 @@
 	this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) * 
             (double) this->context->width / (double) this->context->height;
 
-
-	if(this->av_frame->type == FF_BUFFER_TYPE_USER){
-	  img = (vo_frame_t*)this->av_frame->opaque;
-	  free_img = !img->drawn;
-	} else {
+	if(this->av_frame->type == FF_BUFFER_TYPE_INTERNAL) {
 	  img = this->stream->video_out->get_frame (this->stream->video_out,
 						    this->context->width,
 						    this->context->height,
@@ -1072,6 +1061,11 @@
 						    this->output_format,
 						    VO_BOTH_FIELDS|this->frame_flags);
 	  free_img = 1;
+	} else {
+	  assert(this->av_frame->opaque);
+
+	  img = (vo_frame_t*) this->av_frame->opaque;
+	  free_img = 0;
 	}
 
 	if (len<0 || this->skipframes) {
@@ -1086,10 +1080,7 @@
 
 	  if(this->pp_available && this->pp_quality) {
 
-	    if(this->av_frame->type == FF_BUFFER_TYPE_USER) {
-	      if(free_img)
-	        tmp_img = img;
-
+	    if(this->av_frame->type != FF_BUFFER_TYPE_INTERNAL) {
 	      img = this->stream->video_out->get_frame (this->stream->video_out,
 						        img->width,
 						        img->height,
@@ -1107,12 +1098,7 @@
 			   this->pp_mode, this->pp_context, 
 			   this->av_frame->pict_type);
 
-	    if(tmp_img) {
-	      tmp_img->free(tmp_img);
-	      tmp_img = NULL;
-	    }
-
-	  } else if(this->av_frame->type != FF_BUFFER_TYPE_USER) {
+	  } else if(this->av_frame->type == FF_BUFFER_TYPE_INTERNAL) {
 	    ff_convert_frame(this, img);
 	  }
 	}