From 02b76aa3774cc97c1633a767e7e8e56a28e58bcc Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sat, 25 May 2013 21:51:35 +0200 Subject: [PATCH] ffplay: simplify early frame drop code Also never early frame drop the first frame after a flush. Signed-off-by: Marton Balint --- ffplay.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ffplay.c b/ffplay.c index 22c269bfbe..30ba847c90 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1722,12 +1722,11 @@ static int get_video_frame(VideoState *is, AVFrame *frame, AVPacket *pkt, int *s if (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) { SDL_LockMutex(is->pictq_mutex); - if (is->frame_last_pts != AV_NOPTS_VALUE && frame->pts != AV_NOPTS_VALUE) { - double clockdiff = get_clock(&is->vidclk) - get_master_clock(is); - double ptsdiff = dpts - is->frame_last_pts; - if (!isnan(clockdiff) && fabs(clockdiff) < AV_NOSYNC_THRESHOLD && - !isnan(ptsdiff) && ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD && - clockdiff + ptsdiff - is->frame_last_filter_delay < 0 && + if (frame->pts != AV_NOPTS_VALUE) { + double diff = dpts - get_master_clock(is); + if (!isnan(diff) && fabs(diff) < AV_NOSYNC_THRESHOLD && + diff - is->frame_last_filter_delay < 0 && + *serial == is->vidclk.serial && is->videoq.nb_packets) { is->frame_last_dropped_pos = av_frame_get_pkt_pos(frame); is->frame_last_dropped_pts = dpts; -- 2.11.0