Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/xine-engine video_out.c,1.86,1.87 video_out.h,1.51,1.52
|
From: Miguel F. <mig...@us...> - 2002-03-25 01:02:54
|
Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory usw-pr-cvs1:/tmp/cvs-serv28918/src/xine-engine
Modified Files:
video_out.c video_out.h
Log Message:
- fix frames leaking
- big video_out locking cleanup: no more decoder_locked, display_locked,
driver_locked madness!
Index: video_out.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_out.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- video_out.c 22 Mar 2002 17:38:21 -0000 1.86
+++ video_out.c 25 Mar 2002 01:02:51 -0000 1.87
@@ -167,16 +167,23 @@
}
/*
- * function called by video output driver
+ * functions to maintain lock_counter
*/
+static void vo_frame_inc_lock (vo_frame_t *img) {
+
+ pthread_mutex_lock (&img->mutex);
-static void vo_frame_displayed (vo_frame_t *img) {
+ img->lock_counter++;
- pthread_mutex_lock (&img->mutex);
+ pthread_mutex_unlock (&img->mutex);
+}
- img->driver_locked = 0;
+static void vo_frame_dec_lock (vo_frame_t *img) {
+
+ pthread_mutex_lock (&img->mutex);
- if (!img->decoder_locked) {
+ img->lock_counter--;
+ if (!img->lock_counter) {
vos_t *this = (vos_t *) img->instance;
vo_append_to_img_buf_queue (this->free_img_buf_queue, img);
}
@@ -184,6 +191,7 @@
pthread_mutex_unlock (&img->mutex);
}
+
/*
*
* functions called by video decoder:
@@ -215,9 +223,7 @@
#endif
pthread_mutex_lock (&img->mutex);
- img->display_locked = 0;
- img->decoder_locked = 1;
- img->driver_locked = 0;
+ img->lock_counter = 1;
img->width = width;
img->height = height;
img->ratio = ratio;
@@ -270,7 +276,7 @@
diff, cur_vpts, frames_to_skip);
#endif
- if (img->display_locked) {
+ if (img->lock_counter > 1) {
printf ("video_out: ALERT! frame is already locked for displaying\n");
return frames_to_skip;
}
@@ -286,10 +292,7 @@
this->last_frame = img;
- pthread_mutex_lock (&img->mutex);
- img->display_locked = 1;
- pthread_mutex_unlock (&img->mutex);
-
+ vo_frame_inc_lock( img );
vo_append_to_img_buf_queue (this->display_img_buf_queue, img);
} else {
@@ -298,12 +301,6 @@
#endif
this->num_frames_skipped++;
-
- pthread_mutex_lock (&img->mutex);
- img->display_locked = 0;
- pthread_mutex_unlock (&img->mutex);
-
- vo_frame_displayed (img);
}
/*
@@ -324,21 +321,6 @@
return frames_to_skip;
}
-static void vo_frame_free (vo_frame_t *img) {
-
- pthread_mutex_lock (&img->mutex);
- img->decoder_locked = 0;
-
- if (!img->display_locked && !img->driver_locked ) {
- vos_t *this = (vos_t *) img->instance;
- vo_append_to_img_buf_queue (this->free_img_buf_queue, img);
- }
-
- pthread_mutex_unlock (&img->mutex);
-}
-
-
-
/*
*
* video out loop related functions
@@ -380,21 +362,13 @@
if (!this->display_img_buf_queue->first) {
if (this->img_backup) {
- pthread_mutex_lock (&this->img_backup->mutex);
#ifdef LOG
printf("video_out: overwriting frame backup\n");
#endif
- this->img_backup->display_locked = 0;
- if (!img->decoder_locked)
- vo_append_to_img_buf_queue (this->free_img_buf_queue,
- this->img_backup);
-
- pthread_mutex_unlock (&this->img_backup->mutex);
+ vo_frame_dec_lock( this->img_backup );
}
printf("video_out: possible still frame (old)\n");
- /* we must not clear display_locked from img_backup.
- without it decoder may try to free our backup. */
this->img_backup = img;
this->backup_is_logo = 0;
@@ -402,13 +376,7 @@
this allow slower systems to recover. */
this->redraw_needed = 4;
} else {
- pthread_mutex_lock (&img->mutex);
-
- img->display_locked = 0;
- if (!img->decoder_locked)
- vo_append_to_img_buf_queue (this->free_img_buf_queue, img);
-
- pthread_mutex_unlock (&img->mutex);
+ vo_frame_dec_lock( img );
}
img = this->display_img_buf_queue->first;
@@ -441,16 +409,10 @@
if (!this->video_opened && (!this->img_backup || !this->backup_is_logo)) {
if (this->img_backup) {
- pthread_mutex_lock (&this->img_backup->mutex);
#ifdef LOG
printf("video_out: overwriting frame backup\n");
#endif
- this->img_backup->display_locked = 0;
- if (!this->img_backup->decoder_locked)
- vo_append_to_img_buf_queue (this->free_img_buf_queue,
- this->img_backup);
-
- pthread_mutex_unlock (&this->img_backup->mutex);
+ vo_frame_dec_lock( this->img_backup );
}
printf("video_out: copying logo image\n");
@@ -458,9 +420,6 @@
this->img_backup = vo_get_frame (&this->vo, this->logo_w, this->logo_h,
42, IMGFMT_YUY2, VO_BOTH_FIELDS);
- this->img_backup->decoder_locked = 0;
- this->img_backup->display_locked = 1;
- this->img_backup->driver_locked = 0;
this->img_backup->duration = 3000;
xine_fast_memcpy(this->img_backup->base[0], this->logo_yuy2,
@@ -479,7 +438,6 @@
/* keep playing still frames */
img = this->vo.duplicate_frame (&this->vo, this->img_backup );
- img->display_locked = 1;
do {
/* always restore duration so drift correction shouldn't cause any trouble */
@@ -518,14 +476,8 @@
}
if (this->img_backup) {
- pthread_mutex_lock (&this->img_backup->mutex);
printf("video_out: freeing frame backup\n");
-
- this->img_backup->display_locked = 0;
- if( !this->img_backup->decoder_locked )
- vo_append_to_img_buf_queue (this->free_img_buf_queue,
- this->img_backup);
- pthread_mutex_unlock (&this->img_backup->mutex);
+ vo_frame_dec_lock( this->img_backup );
this->img_backup = NULL;
}
@@ -561,22 +513,6 @@
img->vpts);
#endif
- pthread_mutex_lock (&img->mutex);
- img->driver_locked = 1;
-
-#ifdef LOG
- if (!img->display_locked)
- printf ("video_out: ALERT! frame was not locked for display queue\n");
-#endif
-
- img->display_locked = 0;
- pthread_mutex_unlock (&img->mutex);
-
-#ifdef LOG
- printf ("video_out: passing to video driver image with pts = %lld\n",
- img->vpts);
-#endif
-
if (this->overlay_source) {
/* This is the only way for the overlay manager to get pts values
* for flushing its buffers. So don't remove it! */
@@ -713,25 +649,14 @@
while (img) {
img = vo_remove_from_img_buf_queue (this->display_img_buf_queue);
- pthread_mutex_lock (&img->mutex);
-
- img->display_locked = 0;
- if (!img->decoder_locked)
- vo_append_to_img_buf_queue (this->free_img_buf_queue, img);
-
- pthread_mutex_unlock (&img->mutex);
+ vo_frame_dec_lock( img );
img = this->display_img_buf_queue->first;
}
if (this->img_backup) {
- pthread_mutex_lock (&this->img_backup->mutex);
-
- this->img_backup->display_locked = 0;
- if (!this->img_backup->decoder_locked)
- vo_append_to_img_buf_queue (this->free_img_buf_queue, this->img_backup);
-
- pthread_mutex_unlock (&this->img_backup->mutex);
+ vo_frame_dec_lock( this->img_backup );
+ this->img_backup = NULL;
}
pthread_exit(NULL);
@@ -750,12 +675,6 @@
dupl = vo_get_frame (this_gen, img->width, img->height, img->ratio,
img->format, VO_BOTH_FIELDS );
-
- pthread_mutex_lock (&dupl->mutex);
-
- dupl->display_locked = 0;
- dupl->decoder_locked = 0;
- dupl->driver_locked = 0;
image_size = img->width * img->height;
@@ -776,7 +695,6 @@
dupl->bad_frame = 0;
dupl->pts = 0;
dupl->vpts = 0;
- dupl->scr = 0;
dupl->duration = img->duration;
/* Support copy; Dangerous, since some decoders may use a source that's
@@ -812,8 +730,6 @@
}
}
- pthread_mutex_unlock (&dupl->mutex);
-
return dupl;
}
@@ -968,8 +884,8 @@
img->id = i;
img->instance = &this->vo;
- img->free = vo_frame_free ;
- img->displayed = vo_frame_displayed;
+ img->free = vo_frame_dec_lock;
+ img->displayed = vo_frame_dec_lock;
img->draw = vo_frame_draw;
vo_append_to_img_buf_queue (this->free_img_buf_queue,
Index: video_out.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_out.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- video_out.h 21 Mar 2002 16:21:02 -0000 1.51
+++ video_out.h 25 Mar 2002 01:02:51 -0000 1.52
@@ -75,7 +75,6 @@
int64_t pts; /* presentation time stamp (1/90000 sec) */
int64_t vpts; /* virtual pts, generated by metronom */
- int64_t scr; /* system clock reference (discont. detection) */
int bad_frame; /* e.g. frame skipped or based on skipped frame */
int duration; /* frame length in time, in 1/90000 sec */
@@ -98,8 +97,8 @@
int drawn; /* used by decoder, frame has already been drawn */
- int display_locked, decoder_locked, driver_locked;
- pthread_mutex_t mutex; /* so the various locks will be serialized */
+ int lock_counter;
+ pthread_mutex_t mutex; /* protect access to lock_count */
/* "backward" references to where this frame originates from */
vo_instance_t *instance;
|