virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/imf: refactor to use ff_rescale_interval()

Browse Source 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Pierre-Anthony Lemieux 2022-03-11 09:16:52 -08:00 committed by Zane van Iperen
parent 8744b103da
commit f409c78517
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/imfdec.c
View File

@ -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)