From 105d4748cfc08bef7e0ab9f2be39a9777f985ccc Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 27 Oct 2013 15:51:41 +0100 Subject: [PATCH 1/3] ffplay: avoid code duplication in AVFILTER enabled and disabled case Signed-off-by: Marton Balint --- ffplay.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ffplay.c b/ffplay.c index 5d3d18946e..cd14428d7a 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1911,6 +1911,7 @@ static int video_thread(void *arg) double pts; int ret; int serial = 0; + AVRational tb = is->video_st->time_base; #if CONFIG_AVFILTER AVFilterGraph *graph = avfilter_graph_alloc(); @@ -1984,15 +1985,13 @@ static int video_thread(void *arg) is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time; if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0) is->frame_last_filter_delay = 0; - - pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(filt_out->inputs[0]->time_base); + tb = filt_out->inputs[0]->time_base; +#endif + pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb); ret = queue_picture(is, frame, pts, av_frame_get_pkt_pos(frame), serial); av_frame_unref(frame); +#if CONFIG_AVFILTER } -#else - pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(is->video_st->time_base); - ret = queue_picture(is, frame, pts, av_frame_get_pkt_pos(frame), serial); - av_frame_unref(frame); #endif if (ret < 0) From 61dd31977066b00ff64cb4f6c7116f65def4882b Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 27 Oct 2013 15:55:42 +0100 Subject: [PATCH 2/3] ffplay: add frame duration estimated from frame rate to VideoPicture Signed-off-by: Marton Balint --- ffplay.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ffplay.c b/ffplay.c index cd14428d7a..e4fbdd4df5 100644 --- a/ffplay.c +++ b/ffplay.c @@ -121,6 +121,7 @@ typedef struct PacketQueue { typedef struct VideoPicture { double pts; // presentation timestamp for this picture + double duration; // estimated duration based on frame rate int64_t pos; // byte position in file SDL_Overlay *bmp; int width, height; /* source height & width */ @@ -1549,7 +1550,7 @@ static void duplicate_right_border_pixels(SDL_Overlay *bmp) { } } -static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos, int serial) +static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, double duration, int64_t pos, int serial) { VideoPicture *vp; @@ -1646,6 +1647,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t SDL_UnlockYUVOverlay(vp->bmp); vp->pts = pts; + vp->duration = duration; vp->pos = pos; vp->serial = serial; @@ -1909,9 +1911,11 @@ static int video_thread(void *arg) VideoState *is = arg; AVFrame *frame = av_frame_alloc(); double pts; + double duration; int ret; int serial = 0; AVRational tb = is->video_st->time_base; + AVRational frame_rate = av_guess_frame_rate(is->ic, is->video_st, NULL); #if CONFIG_AVFILTER AVFilterGraph *graph = avfilter_graph_alloc(); @@ -1962,6 +1966,7 @@ static int video_thread(void *arg) last_h = frame->height; last_format = frame->format; last_serial = serial; + frame_rate = filt_out->inputs[0]->frame_rate; } ret = av_buffersrc_add_frame(filt_in, frame); @@ -1987,8 +1992,9 @@ static int video_thread(void *arg) is->frame_last_filter_delay = 0; tb = filt_out->inputs[0]->time_base; #endif + duration = (frame_rate.num && frame_rate.den ? av_q2d((AVRational){frame_rate.den, frame_rate.num}) : 0); pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb); - ret = queue_picture(is, frame, pts, av_frame_get_pkt_pos(frame), serial); + ret = queue_picture(is, frame, pts, duration, av_frame_get_pkt_pos(frame), serial); av_frame_unref(frame); #if CONFIG_AVFILTER } From 5ecfcc7dff04ff0e86d8b6b3a33709ae956dfef7 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sat, 2 Feb 2013 12:37:29 +0100 Subject: [PATCH 3/3] ffplay: add smarter method for determining video picture duration - consider it an invalid PTS when the next PTS value is the same as the current one - in case of invalid or unknown PTS, return vp->duration This fixes ffplay part of ticket #3005. Signed-off-by: Marton Balint --- ffplay.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index e4fbdd4df5..22c269bfbe 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1293,6 +1293,18 @@ static double compute_target_delay(double delay, VideoState *is) return delay; } +static double vp_duration(VideoState *is, VideoPicture *vp, VideoPicture *nextvp) { + if (vp->serial == nextvp->serial) { + double duration = nextvp->pts - vp->pts; + if (isnan(duration) || duration <= 0 || duration > is->max_frame_duration) + return vp->duration; + else + return duration; + } else { + return 0.0; + } +} + static void pictq_next_picture(VideoState *is) { /* update queue size and signal for next picture */ if (++is->pictq_rindex == VIDEO_PICTURE_QUEUE_SIZE) @@ -1407,7 +1419,7 @@ retry: if (is->pictq_size > 1) { VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE]; - duration = nextvp->pts - vp->pts; + duration = vp_duration(is, vp, nextvp); if(!is->step && (redisplay || framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) && time > is->frame_timer + duration){ if (!redisplay) is->frame_drops_late++;