From ff24285eb15676dc7519b858be01a1def155e847 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 19 Apr 2018 17:42:14 +0200 Subject: video: pass through container fps to filters This means vf_vapoursynth doesn't need a hack to work around the filter code, and libavfilter filters now actually get the frame_rate field on input pads set. The libavfilter doxygen says the frame_rate field is only to be set if the frame rate is known to be constant, and uses the word "must" (which probably means they really mean it?) - but ffmpeg.c sets the field to mere guesses anyway, and it looks like this normally won't lead to problems. --- filters/f_lavfi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'filters/f_lavfi.c') diff --git a/filters/f_lavfi.c b/filters/f_lavfi.c index 1b41c93aac..2c01eaf59c 100644 --- a/filters/f_lavfi.c +++ b/filters/f_lavfi.c @@ -340,7 +340,8 @@ static bool is_vformat_ok(struct mp_image *a, struct mp_image *b) { return a->imgfmt == b->imgfmt && a->w == b->w && a->h && b->h && - a->params.p_w == b->params.p_w && a->params.p_h == b->params.p_h; + a->params.p_w == b->params.p_w && a->params.p_h == b->params.p_h && + a->nominal_fps == b->nominal_fps; } static bool is_format_ok(struct mp_frame a, struct mp_frame b) { @@ -483,6 +484,7 @@ static bool init_pads(struct lavfi *c) params->sample_aspect_ratio.num = fmt->params.p_w; params->sample_aspect_ratio.den = fmt->params.p_h; params->hw_frames_ctx = fmt->hwctx; + params->frame_rate = av_d2q(fmt->nominal_fps, 1000000); filter_name = "buffer"; } else { assert(0); @@ -680,6 +682,11 @@ static bool read_output_pads(struct lavfi *c) mp_aframe_set_pts(aframe, c->in_pts + (c->in_pts != MP_NOPTS_VALUE ? (out_time - in_time) : 0)); } + if (frame.type == MP_FRAME_VIDEO) { + struct mp_image *vframe = frame.data; + vframe->nominal_fps = + av_q2d(av_buffersink_get_frame_rate(pad->buffer)); + } av_frame_unref(c->tmp_frame); if (frame.type) { mp_pin_in_write(pad->pin, frame); -- cgit v1.2.3