aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Anthony Lemieux <pal@palemieux.com>2022-03-11 09:16:52 -0800
committerZane van Iperen <zane@zanevaniperen.com>2022-03-19 21:34:06 +1000
commitf409c785172fc359e4f00a8afb140873fa4dfb0e (patch)
tree3f4df9442ddebefb3d70cea1dbc18d18db5f9089
parent8744b103da916622b28da5a8d1962188937db3fe (diff)
downloadffmpeg-f409c785172fc359e4f00a8afb140873fa4dfb0e.tar.gz
avformat/imf: refactor to use ff_rescale_interval()
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
-rw-r--r--libavformat/imfdec.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index 7e1007e89d..2fe79dfbad 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -904,14 +904,6 @@ static int imf_probe(const AVProbeData *p)
return AVPROBE_SCORE_MAX;
}
-static void rescale_interval(AVRational tb_in, AVRational tb_out,
- int64_t *min_ts, int64_t *ts, int64_t *max_ts)
-{
- *ts = av_rescale_q(*ts, tb_in, tb_out);
- *min_ts = av_rescale_q_rnd(*min_ts, tb_in, tb_out, AV_ROUND_UP | AV_ROUND_PASS_MINMAX);
- *max_ts = av_rescale_q_rnd(*max_ts, tb_in, tb_out, AV_ROUND_DOWN | AV_ROUND_PASS_MINMAX);
-}
-
static int coherent_ts(int64_t ts, AVRational in_tb, AVRational out_tb)
{
int dst_num;
@@ -937,13 +929,13 @@ static int imf_seek(AVFormatContext *s, int stream_index, int64_t min_ts,
/* rescale timestamps to Composition edit units */
if (stream_index < 0)
- rescale_interval(AV_TIME_BASE_Q,
- av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num),
- &min_ts, &ts, &max_ts);
+ ff_rescale_interval(AV_TIME_BASE_Q,
+ av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num),
+ &min_ts, &ts, &max_ts);
else
- rescale_interval(s->streams[stream_index]->time_base,
- av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num),
- &min_ts, &ts, &max_ts);
+ ff_rescale_interval(s->streams[stream_index]->time_base,
+ av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num),
+ &min_ts, &ts, &max_ts);
/* requested timestamp bounds are too close */
if (max_ts < min_ts)