@@ -74,6 +74,7 @@ typedef struct FPSContext {
char *framerate; ///< expression that defines the target framerate
int rounding; ///< AVRounding method for timestamps
int eof_action; ///< action performed for last frame in FIFO
+ int requantize; ///< whether to requantize timestamps of cfr inputs
/* Set during outlink configuration */
int64_t in_pts_off; ///< input frame pts offset for start_time handling
@@ -111,6 +112,8 @@ static const AVOption fps_options[] = {
{ "eof_action", "action performed for last frame", OFFSET(eof_action), AV_OPT_TYPE_INT, { .i64 = EOF_ACTION_ROUND }, 0, EOF_ACTION_NB-1, V|F, "eof_action" },
{ "round", "round similar to other frames", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ROUND }, 0, 0, V|F, "eof_action" },
{ "pass", "pass through last frame", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS }, 0, 0, V|F, "eof_action" },
+ { "requantize", "requantize input timestamps in CFR video based on framerate",
+ OFFSET(requantize), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V|F },
{ NULL }
};
@@ -177,6 +180,7 @@ static int config_props(AVFilterLink* outlink)
FPSContext *s = ctx->priv;
double var_values[VARS_NB], res;
+ AVRational in_time_base;
int ret;
var_values[VAR_SOURCE_FPS] = av_q2d(inlink->frame_rate);
@@ -193,6 +197,18 @@ static int config_props(AVFilterLink* outlink)
outlink->frame_rate = av_d2q(res, INT_MAX);
outlink->time_base = av_inv_q(outlink->frame_rate);
+ /* Disable requantization if input video is VFR */
+ if (s->requantize && inlink->frame_rate.num == 1 && inlink->frame_rate.den == 0) {
+ av_log(ctx, AV_LOG_INFO, "Not requantizing input timestamps; video is VFR\n");
+ s->requantize = 0;
+ }
+
+ in_time_base = inlink->time_base;
+ if (s->requantize) {
+ in_time_base = av_inv_q(inlink->frame_rate);
+ av_log(ctx, AV_LOG_VERBOSE, "Requantizing input timestamps to time_base=%d/%d\n", in_time_base.num, in_time_base.den);
+ }
+
/* Calculate the input and output pts offsets for start_time */
if (s->start_time != DBL_MAX && s->start_time != AV_NOPTS_VALUE) {
double first_pts = s->start_time * AV_TIME_BASE;
@@ -201,7 +217,7 @@ static int config_props(AVFilterLink* outlink)
s->start_time);
return AVERROR(EINVAL);
}
- s->in_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, inlink->time_base,
+ s->in_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, in_time_base,
s->rounding | AV_ROUND_PASS_MINMAX);
s->out_pts_off = av_rescale_q_rnd(first_pts, AV_TIME_BASE_Q, outlink->time_base,
s->rounding | AV_ROUND_PASS_MINMAX);
@@ -220,7 +236,8 @@ static int read_frame(AVFilterContext *ctx, FPSContext *s, AVFilterLink *inlink,
{
AVFrame *frame;
int ret;
- int64_t in_pts;
+ AVRational in_time_base;
+ int64_t orig_pts, in_pts;
/* Must only be called when we have buffer room available */
av_assert1(s->frames_count < 2);
@@ -231,16 +248,24 @@ static int read_frame(AVFilterContext *ctx, FPSContext *s, AVFilterLink *inlink,
if (ret < 0)
return ret;
+ /* Requantize CFR video pts based on frame rate */
+ in_time_base = inlink->time_base;
+ orig_pts = in_pts = frame->pts;
+ if (s->requantize) {
+ in_time_base = av_inv_q(inlink->frame_rate);
+ in_pts = av_rescale_q_rnd(in_pts, inlink->time_base, in_time_base,
+ s->rounding | AV_ROUND_PASS_MINMAX);
+ }
+
/* Convert frame pts to output timebase.
* The dance with offsets is required to match the rounding behaviour of the
* previous version of the fps filter when using the start_time option. */
- in_pts = frame->pts;
frame->pts = s->out_pts_off + av_rescale_q_rnd(in_pts - s->in_pts_off,
- inlink->time_base, outlink->time_base,
+ in_time_base, outlink->time_base,
s->rounding | AV_ROUND_PASS_MINMAX);
- av_log(ctx, AV_LOG_DEBUG, "Read frame with in pts %"PRId64", out pts %"PRId64"\n",
- in_pts, frame->pts);
+ av_log(ctx, AV_LOG_DEBUG, "Read frame with in pts %"PRId64", req pts %"PRId64", out pts %"PRId64"\n",
+ orig_pts, in_pts, frame->pts);
s->frames[s->frames_count++] = frame;
s->frames_in++;
@@ -304,7 +329,16 @@ static int write_frame(AVFilterContext *ctx, FPSContext *s, AVFilterLink *outlin
static void update_eof_pts(AVFilterContext *ctx, FPSContext *s, AVFilterLink *inlink, AVFilterLink *outlink, int64_t status_pts)
{
int eof_rounding = (s->eof_action == EOF_ACTION_PASS) ? AV_ROUND_UP : s->rounding;
- s->status_pts = av_rescale_q_rnd(status_pts, inlink->time_base, outlink->time_base,
+ AVRational in_time_base;
+
+ /* Requantize CFR video pts based on frame rate */
+ in_time_base = inlink->time_base;
+ if (s->requantize) {
+ in_time_base = av_inv_q(inlink->frame_rate);
+ status_pts = av_rescale_q_rnd(status_pts, inlink->time_base, in_time_base,
+ eof_rounding | AV_ROUND_PASS_MINMAX);
+ }
+ s->status_pts = av_rescale_q_rnd(status_pts, in_time_base, outlink->time_base,
eof_rounding | AV_ROUND_PASS_MINMAX);
av_log(ctx, AV_LOG_DEBUG, "EOF is at pts %"PRId64"\n", s->status_pts);
This is mostly to avoid oddities in small framerate adjustments when you have input videos from containers such as matroska, where the pts values are quantized with a large enough error to cause issues. An example, when converting from 24/1.001 fps to 24 fps with round=down from an mkv source (inlink time base is 1/1000, outlink is 1001/24000): In PTS | Out PTS | Rounded Out PTS 69292 | 1663.008 | 1663 69333 | 1663.992 | 1663 69375 | 1665.000 | 1665 In this example, the fps filter would drop the frame with pts 69292, then duplicate the frame with pts 69333, an undesirable result. By first requantizing the input pts to the inlink frame rate, the result looks much nicer: In PTS | Req. PTS | Out PTS 69292 | 1661 | 1662 69333 | 1662 | 1663 69375 | 1663 | 1664 (Note that the same rounding mode is used for both conversions, resulting in the final out pts being a bit lower in this case. With the normal nearest mode, it would be closer.) I've verified that in conversions of longer mkv files to "close" framerates that previously had issues due to quantization, this significantly reduces the number of incorrectly dropped or duplicated frames. The potential downside of this change is that if an input file is probed as CFR but is actually VFR, then the results will be poor (you'll get unnecessarily dropped frames or added judder). A new option, "requantize", is added to allow disabling this behaviour in those cases. Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca> --- libavfilter/vf_fps.c | 48 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-)