har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mov: Clarify tkhd flag settings

Browse Source
This commit is contained in:
Luca Barbato 2014-07-04 16:53:31 +02:00
parent f90729699d
commit df2aa22203
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/movenc.c
View File

@ -1465,8 +1465,10 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov,
int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE, int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE,
track->timescale, AV_ROUND_UP); track->timescale, AV_ROUND_UP);
int version = duration < INT32_MAX ? 0 : 1; int version = duration < INT32_MAX ? 0 : 1;
int flags = MOV_TKHD_FLAG_IN_MOVIE;
int group = 0; int group = 0;
if (st) { if (st) {
if (mov->per_stream_grouping) if (mov->per_stream_grouping)
group = st->index; group = st->index;
@ -1474,15 +1476,16 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov,
group = st->codec->codec_type; group = st->codec->codec_type;
} }
if (track->flags & MOV_TRACK_ENABLED)
flags |= MOV_TKHD_FLAG_ENABLED;
if (track->mode == MODE_ISM) if (track->mode == MODE_ISM)
version = 1; version = 1;
(version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */ (version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */
ffio_wfourcc(pb, "tkhd"); ffio_wfourcc(pb, "tkhd");
avio_w8(pb, version); avio_w8(pb, version);
avio_wb24(pb, (track->flags & MOV_TRACK_ENABLED) ? avio_wb24(pb, flags);
MOV_TKHD_FLAG_ENABLED | MOV_TKHD_FLAG_IN_MOVIE :
MOV_TKHD_FLAG_IN_MOVIE);
if (version == 1) { if (version == 1) {
avio_wb64(pb, track->time); avio_wb64(pb, track->time);
avio_wb64(pb, track->time); avio_wb64(pb, track->time);