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

avformat/movenc: allow ISMV timescale to be user-set 

As per the PIFF standard, the timescale of 10000000
is recommended but not mandatory, so don't override
the user-set value.

A warning is shown for non-recommended values.
This commit is contained in:
Gyan Doshi 2019-01-04 10:45:47 +05:30
parent 9990cb16d3
commit 75d1d9eb34
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/movenc.c
View File

@ -6389,6 +6389,8 @@ static int mov_init(AVFormatContext *s)
} }
if (mov->video_track_timescale) { if (mov->video_track_timescale) {
track->timescale = mov->video_track_timescale; track->timescale = mov->video_track_timescale;
if (mov->mode == MODE_ISM && mov->video_track_timescale != 10000000)
av_log(s, AV_LOG_WARNING, "Warning: some tools, like mp4split, assume a timescale of 10000000 for ISMV.\n");
} else { } else {
track->timescale = st->time_base.den; track->timescale = st->time_base.den;
while(track->timescale < 10000) while(track->timescale < 10000)
@ -6486,10 +6488,14 @@ static int mov_init(AVFormatContext *s)
} }
if (!track->height) if (!track->height)
track->height = st->codecpar->height; track->height = st->codecpar->height;
/* The ism specific timescale isn't mandatory, but is assumed by /* The Protected Interoperable File Format (PIFF) standard, used by ISMV recommends but
* some tools, such as mp4split. */ doesn't mandate a track timescale of 10,000,000. The muxer allows a custom timescale
if (mov->mode == MODE_ISM) for video tracks, so if user-set, it isn't overwritten */
track->timescale = 10000000; if (mov->mode == MODE_ISM &&
(st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO ||
(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && !mov->video_track_timescale))) {
track->timescale = 10000000;
}
avpriv_set_pts_info(st, 64, 1, track->timescale); avpriv_set_pts_info(st, 64, 1, track->timescale);