diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-18 13:33:19 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-18 13:33:19 +0000 |
| commit | 6b8d8fbccaf932cc8d02d6fd56000839894ab41a (patch) | |
| tree | ed69515a01c6d7c9c180d0a6a940a494dbf43434 /src | |
| parent | 498f9c065bcf4fcd5aa0353e874a9e04ba0acbef (diff) | |
| download | xine-lib-6b8d8fbccaf932cc8d02d6fd56000839894ab41a.tar.gz xine-lib-6b8d8fbccaf932cc8d02d6fd56000839894ab41a.tar.bz2 | |
do not discard frames in vo_frame_draw as they may be needed for still
frame creation
CVS patchset: 1507
CVS date: 2002/02/18 13:33:19
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/metronom.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/video_out.c | 24 |
2 files changed, 3 insertions, 25 deletions
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index 7a04735c4..27db93c7d 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.56 2002/02/17 17:32:50 guenter Exp $ + * $Id: metronom.c,v 1.57 2002/02/18 13:33:19 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -396,7 +396,7 @@ static void metronom_got_video_frame (metronom_t *this, vo_frame_t *img) { else this->video_wrap_offset = this->audio_wrap_offset; - printf (this->xine, " to %d\n", this->video_wrap_offset); + printf (this->xine, " to %lld\n", this->video_wrap_offset); this->wrap_diff_counter = 0; } diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index b864cb116..8e408ee5d 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.75 2002/02/17 17:32:51 guenter Exp $ + * $Id: video_out.c,v 1.76 2002/02/18 13:33:19 guenter Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -288,28 +288,6 @@ static int vo_frame_draw (vo_frame_t *img) { return frames_to_skip; } - if (cur_vpts>0) { - - if (diff<(-1 * img->duration) && img->drawn != 2 ) { - - this->num_frames_discarded++; -#ifdef LOG - printf ("video_out: frame rejected, %d frames to skip\n", frames_to_skip); -#endif - - pthread_mutex_lock (&img->mutex); - img->display_locked = 0; - pthread_mutex_unlock (&img->mutex); - - vo_frame_displayed (img); - - this->last_frame = img; - - return frames_to_skip; - - } - } /* else: we are probably in precaching mode */ - if (!img->bad_frame) { /* * put frame into FIFO-Buffer |