From: Niklas Haas <g...@haasn.dev>
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.
---
libavfilter/vf_libplacebo.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 9b1526f19e..7840677b06 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -1156,6 +1156,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;
@@ -1196,6 +1201,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 */
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
