virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mov: fix timecode with rounded down tmcd nb_frames

Browse Source 
Regression since 8dd5bb7280.
Fixes ticket #5978.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2022-05-01 13:31:40 +02:00
parent 5ccd8f492b
commit 0a58fdfd3e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mov.c
View File

@@ -8034,12 +8034,13 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st)
int64_t cur_pos = avio_tell(sc->pb); int64_t cur_pos = avio_tell(sc->pb);
int64_t value; int64_t value;
AVRational tc_rate = st->avg_frame_rate; AVRational tc_rate = st->avg_frame_rate;
int tmcd_nb_frames = sc->tmcd_nb_frames;
int rounded_tc_rate; int rounded_tc_rate;
if (!sti->nb_index_entries) if (!sti->nb_index_entries)
return -1; return -1;
if (!tc_rate.num || !tc_rate.den || !sc->tmcd_nb_frames) if (!tc_rate.num || !tc_rate.den || !tmcd_nb_frames)
return -1; return -1;
avio_seek(sc->pb, sti->index_entries->pos, SEEK_SET); avio_seek(sc->pb, sti->index_entries->pos, SEEK_SET);
@@ -8056,9 +8057,15 @@ static int mov_read_timecode_track(AVFormatContext *s, AVStream *st)
* format). */ * format). */
/* 60 fps content have tmcd_nb_frames set to 30 but tc_rate set to 60, so /* 60 fps content have tmcd_nb_frames set to 30 but tc_rate set to 60, so
* we multiply the frame number with the quotient. */ * we multiply the frame number with the quotient.
* See tickets #9492, #9710. */
rounded_tc_rate = (tc_rate.num + tc_rate.den / 2) / tc_rate.den; rounded_tc_rate = (tc_rate.num + tc_rate.den / 2) / tc_rate.den;
value = av_rescale(value, rounded_tc_rate, sc->tmcd_nb_frames); /* Work around files where tmcd_nb_frames is rounded down from frame rate
* instead of up. See ticket #5978. */
if (tmcd_nb_frames == tc_rate.num / tc_rate.den &&
s->strict_std_compliance < FF_COMPLIANCE_STRICT)
tmcd_nb_frames = rounded_tc_rate;
value = av_rescale(value, rounded_tc_rate, tmcd_nb_frames);
parse_timecode_in_framenum_format(s, st, value, flags); parse_timecode_in_framenum_format(s, st, value, flags);