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

movenc: add write_btrt option 

supports forcing or disabling the writing of the btrt atom.
the default behavior is to write the atom only for mp4 mode.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
erankor 2022-04-07 11:33:56 +03:00 committed by Zhao Zhili
parent 40f2ea971f
commit 4d52d8c9f6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/movenc.c
View File

@ -109,6 +109,7 @@ static const AVOption options[] = {
{ "encryption_key", "The media encryption key (hex)", offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM },
{ "encryption_kid", "The media encryption key identifier (hex)", offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM },
{ "use_stream_ids_as_track_ids", "use stream ids as track ids", offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ "write_btrt", "force or disable writing btrt", offsetof(MOVMuxContext, write_btrt), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext, write_tmcd), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ "write_prft", "Write producer reference time box with specified time source", offsetof(MOVMuxContext, write_prft), AV_OPT_TYPE_INT, {.i64 = MOV_PRFT_NONE}, 0, MOV_PRFT_NB-1, AV_OPT_FLAG_ENCODING_PARAM, "prft"},
{ "wallclock", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = MOV_PRFT_SRC_WALLCLOCK}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM, "prft"},
@ -1308,7 +1309,7 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
return ret;
}
if (track->mode == MODE_MP4 &&
if (mov->write_btrt &&
((ret = mov_write_btrt_tag(pb, track)) < 0))
return ret;
@ -1809,8 +1810,9 @@ static int mov_write_fiel_tag(AVIOContext *pb, MOVTrack *track, int field_order)
return 10;
}
static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)
static int mov_write_subtitle_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)
{
MOVMuxContext *mov = s->priv_data;
int ret = AVERROR_BUG;
int64_t pos = avio_tell(pb);
avio_wb32(pb, 0); /* size */
@ -1846,7 +1848,7 @@ static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track)
} else if (track->par->extradata_size)
avio_write(pb, track->par->extradata, track->par->extradata_size);
if (track->mode == MODE_MP4 &&
if (mov->write_btrt &&
((ret = mov_write_btrt_tag(pb, track)) < 0))
return ret;
@ -2313,7 +2315,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
ff_mov_cenc_write_sinf_tag(track, pb, mov->encryption_kid);
}
if (track->mode == MODE_MP4 &&
if (mov->write_btrt &&
((ret = mov_write_btrt_tag(pb, track)) < 0))
return ret;
@ -2438,7 +2440,7 @@ static int mov_write_stsd_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext
else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO)
ret = mov_write_audio_tag(s, pb, mov, track);
else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE)
ret = mov_write_subtitle_tag(pb, track);
ret = mov_write_subtitle_tag(s, pb, track);
else if (track->par->codec_tag == MKTAG('r','t','p',' '))
ret = mov_write_rtp_tag(pb, track);
else if (track->par->codec_tag == MKTAG('t','m','c','d'))
@ -6677,6 +6679,10 @@ static int mov_init(AVFormatContext *s)
mov->nb_streams++;
}
if (mov->write_btrt < 0) {
mov->write_btrt = mov->mode == MODE_MP4;
}
if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4)
|| mov->write_tmcd == 1) {
AVDictionaryEntry *global_tcr = av_dict_get(s->metadata, "timecode",

1
libavformat/movenc.h
View File

@ -239,6 +239,7 @@ typedef struct MOVMuxContext {
int use_stream_ids_as_track_ids;
int track_ids_ok;
int write_btrt;
int write_tmcd;
MOVPrftBox write_prft;
int empty_hdlr_name;