RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/vf_libplacebo: set time_base/frame_rate dynamically 

Use the gcd of all input timebases to ensure PTS accuracy. For the
framerate, just pick the highest of all the inputs, under the assumption
that we will render frames with approximately this frequency. Of course,
this is not 100% accurate, in particular if the input frames are badly
misaligned. But this field is informational to begin with.

Importantly, it covers the "common" case of combining high FPS and low
FPS streams with aligned frames.
This commit is contained in:
Niklas Haas 2023-06-15 17:02:48 +02:00
parent 1b2c6c9a03
commit 9049ea6763
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_libplacebo.c
View File

@ -1158,6 +1158,11 @@ static int libplacebo_config_input(AVFilterLink *inlink)
return 0;
}
static inline AVRational max_q(AVRational a, AVRational b)
{
return av_cmp_q(a, b) < 0 ? b : a;
}
static int libplacebo_config_output(AVFilterLink *outlink)
{
int err;
@ -1198,6 +1203,16 @@ static int libplacebo_config_output(AVFilterLink *outlink)
if (s->fps.num) {
outlink->frame_rate = s->fps;
outlink->time_base = av_inv_q(s->fps);
} else {
outlink->frame_rate = avctx->inputs[0]->frame_rate;
outlink->time_base = avctx->inputs[0]->time_base;
for (int i = 1; i < s->nb_inputs; i++) {
outlink->frame_rate = max_q(outlink->frame_rate,
avctx->inputs[i]->frame_rate);
outlink->time_base = av_gcd_q(outlink->time_base,
avctx->inputs[i]->time_base,
AV_TIME_BASE / 2, AV_TIME_BASE_Q);
}
}
/* Static variables */