* Info, Tracks, Chapters, Attachments, Tags and Cues */
#define MAX_SEEKHEAD_ENTRIES 6
+enum {
+ DEFAULT_MODE_INFER,
+ DEFAULT_MODE_INFER_NO_SUBS,
+ DEFAULT_MODE_PASSTHROUGH,
+};
+
typedef struct ebml_master {
int64_t pos; ///< absolute offset in the containing AVIOContext where the master's elements start
int sizebytes; ///< how many bytes were reserved for the size
AVPacket cur_audio_pkt;
- int have_attachments;
+ unsigned nb_attachments;
int have_video;
int reserve_cues_space;
int wrote_chapters;
int allow_raw_vfw;
+ int default_mode;
uint32_t segment_uid[4];
} MatroskaMuxContext;
int i, bytes = 1;
uint64_t tmp = 2*(val < 0 ? val^-1 : val);
- while (tmp>>=8) bytes++;
+ while (tmp >>= 8)
+ bytes++;
put_ebml_id(pb, elementid);
put_ebml_length(pb, bytes, 0);
return 0;
}
-static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
+static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb,
+ const AVCodecParameters *par)
{
const uint8_t *header_start[3];
int header_len[3];
return 0;
}
-static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par)
+static int put_wv_codecpriv(AVIOContext *pb, const AVCodecParameters *par)
{
if (par->extradata && par->extradata_size == 2)
avio_write(pb, par->extradata, 2);
return 0;
}
-static int put_flac_codecpriv(AVFormatContext *s,
- AVIOContext *pb, AVCodecParameters *par)
+static int put_flac_codecpriv(AVFormatContext *s, AVIOContext *pb,
+ const AVCodecParameters *par)
{
int write_comment = (par->channel_layout &&
!(par->channel_layout & ~0x3ffffULL) &&
av_dict_set(&dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0);
len = ff_vorbiscomment_length(dict, vendor, NULL, 0);
- if (len >= ((1<<24) - 4)) {
+ if (len >= (1 << 24) - 4) {
av_dict_free(&dict);
return AVERROR(EINVAL);
}
return 0;
}
-static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extradata_size,
- int *sample_rate, int *output_sample_rate)
+static int get_aac_sample_rates(AVFormatContext *s, const uint8_t *extradata,
+ int extradata_size, int *sample_rate,
+ int *output_sample_rate)
{
MPEG4AudioConfig mp4ac;
int ret;
}
static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb,
- AVCodecParameters *par,
+ const AVCodecParameters *par,
AVIOContext *dyn_cp)
{
switch (par->codec_id) {
return ret;
}
-static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStream *st) {
+static int mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par,
+ const AVStream *st)
+{
AVIOContext *dyn_cp;
uint8_t *colorinfo_ptr;
int side_data_size = 0;
&side_data_size);
if (side_data_size == sizeof(AVMasteringDisplayMetadata)) {
ebml_master meta_element = start_ebml_master(
- dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 0);
+ dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 10 * (2 + 1 + 8));
const AVMasteringDisplayMetadata *metadata =
(const AVMasteringDisplayMetadata*)side_data;
if (metadata->has_primaries) {
}
static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
- AVStream *st)
+ const AVStream *st)
{
ebml_master projection;
int side_data_size = 0;
{
int i;
int ret = 0;
- AVDictionaryEntry *tag;
+ const AVDictionaryEntry *tag;
MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
*h_width = 1;
static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
AVStream *st, mkv_track *track, AVIOContext *pb,
- int default_stream_exists)
+ int is_default)
{
AVCodecParameters *par = st->codecpar;
ebml_master subinfo, track_master;
int display_width_div = 1;
int display_height_div = 1;
int j, ret;
- AVDictionaryEntry *tag;
+ const AVDictionaryEntry *tag;
- if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
- mkv->have_attachments = 1;
+ if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT)
return 0;
- }
if (par->codec_id == AV_CODEC_ID_AAC) {
ret = get_aac_sample_rates(s, par->extradata, par->extradata_size, &sample_rate,
track_master = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
put_ebml_uint(pb, MATROSKA_ID_TRACKNUMBER, track->track_num);
put_ebml_uid (pb, MATROSKA_ID_TRACKUID, track->uid);
- put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGLACING, 0); // no lacing (yet)
if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
// The default value for TRACKFLAGDEFAULT is 1, so add element
// if we need to clear it.
- if (default_stream_exists && !(st->disposition & AV_DISPOSITION_DEFAULT))
- put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
+ if (!is_default)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, 0);
if (st->disposition & AV_DISPOSITION_FORCED)
put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGFORCED, 1);
// no mkv-specific ID, use ACM mode
put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
- subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
+ subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 6 + 4 * 9);
put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , par->channels);
track->sample_rate_offset = avio_tell(pb);
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb = s->pb;
- int i, ret, default_stream_exists = 0;
+ int i, ret, video_default_idx, audio_default_idx, subtitle_default_idx;
+
+ if (mkv->nb_attachments == s->nb_streams)
+ return 0;
mkv_add_seekhead_entry(mkv, MATROSKA_ID_TRACKS, avio_tell(pb));
if (ret < 0)
return ret;
- for (i = 0; i < s->nb_streams; i++) {
- AVStream *st = s->streams[i];
- default_stream_exists |= st->disposition & AV_DISPOSITION_DEFAULT;
+ if (mkv->default_mode != DEFAULT_MODE_PASSTHROUGH) {
+ int video_idx, audio_idx, subtitle_idx;
+
+ video_idx = video_default_idx =
+ audio_idx = audio_default_idx =
+ subtitle_idx = subtitle_default_idx = -1;
+
+ for (i = s->nb_streams - 1; i >= 0; i--) {
+ AVStream *st = s->streams[i];
+
+ switch (st->codecpar->codec_type) {
+#define CASE(type, variable) \
+ case AVMEDIA_TYPE_ ## type: \
+ variable ## _idx = i; \
+ if (st->disposition & AV_DISPOSITION_DEFAULT) \
+ variable ## _default_idx = i; \
+ break;
+ CASE(VIDEO, video)
+ CASE(AUDIO, audio)
+ CASE(SUBTITLE, subtitle)
+#undef CASE
+ }
+ }
+
+ video_default_idx = FFMAX(video_default_idx, video_idx);
+ audio_default_idx = FFMAX(audio_default_idx, audio_idx);
+ if (mkv->default_mode != DEFAULT_MODE_INFER_NO_SUBS)
+ subtitle_default_idx = FFMAX(subtitle_default_idx, subtitle_idx);
}
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
+ int is_default = mkv->default_mode == DEFAULT_MODE_PASSTHROUGH ?
+ st->disposition & AV_DISPOSITION_DEFAULT :
+ i == video_default_idx || i == audio_default_idx ||
+ i == subtitle_default_idx;
ret = mkv_write_track(s, mkv, st, &mkv->tracks[i],
- mkv->tracks_bc, default_stream_exists);
+ mkv->tracks_bc, is_default);
if (ret < 0)
return ret;
}
mkv_add_seekhead_entry(mkv, MATROSKA_ID_CHAPTERS, avio_tell(pb));
ret = start_ebml_master_crc32(&dyn_cp, mkv);
- if (ret < 0) return ret;
+ if (ret < 0)
+ return ret;
editionentry = start_ebml_master(dyn_cp, MATROSKA_ID_EDITIONENTRY, 0);
- if (mkv->mode != MODE_WEBM) {
+ if (mkv->mode != MODE_WEBM)
put_ebml_uint(dyn_cp, MATROSKA_ID_EDITIONFLAGDEFAULT, 1);
- }
+
for (i = 0; i < s->nb_chapters; i++) {
ebml_master chapteratom, chapterdisplay;
- AVChapter *c = s->chapters[i];
+ const AVChapter *c = s->chapters[i];
int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale);
int64_t chapterend = av_rescale_q(c->end, c->time_base, scale);
- AVDictionaryEntry *t = NULL;
+ const AVDictionaryEntry *t;
if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
av_log(s, AV_LOG_ERROR,
"Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
return 0;
}
-static int mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t)
+static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t)
{
uint8_t *key = av_strdup(t->key);
uint8_t *p = key;
pb = mkv->tags_bc;
*tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0);
- targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 0);
+ targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 4 + 1 + 8);
if (elementid)
put_ebml_uid(pb, elementid, uid);
end_ebml_master(pb, targets);
av_strcasecmp(name, "mimetype")));
}
-static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, uint32_t elementid,
- uint64_t uid, ebml_master *tag)
+static int mkv_write_tag(AVFormatContext *s, const AVDictionary *m,
+ uint32_t elementid, uint64_t uid, ebml_master *tag)
{
MatroskaMuxContext *mkv = s->priv_data;
+ const AVDictionaryEntry *t = NULL;
ebml_master tag2;
int ret;
- AVDictionaryEntry *t = NULL;
ret = mkv_write_tag_targets(s, elementid, uid, tag ? tag : &tag2);
if (ret < 0)
return 0;
}
-static int mkv_check_tag(AVDictionary *m, uint32_t elementid)
+static int mkv_check_tag(const AVDictionary *m, uint32_t elementid)
{
- AVDictionaryEntry *t = NULL;
+ const AVDictionaryEntry *t = NULL;
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
if (mkv_check_tag_name(t->key, elementid))
if (mkv_check_tag(s->metadata, 0)) {
ret = mkv_write_tag(s, s->metadata, 0, 0, NULL);
- if (ret < 0) return ret;
+ if (ret < 0)
+ return ret;
}
tagp = (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live ? &tag : NULL;
for (i = 0; i < s->nb_streams; i++) {
- AVStream *st = s->streams[i];
+ const AVStream *st = s->streams[i];
mkv_track *track = &mkv->tracks[i];
if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID,
track->uid, tagp);
- if (ret < 0) return ret;
+ if (ret < 0)
+ return ret;
if (tagp) {
AVIOContext *pb = mkv->tags_bc;
ebml_master simpletag;
- simpletag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
+ simpletag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG,
+ 2 + 1 + 8 + 23);
put_ebml_string(pb, MATROSKA_ID_TAGNAME, "DURATION");
- mkv->tracks[i].duration_offset = avio_tell(pb);
+ track->duration_offset = avio_tell(pb);
// Reserve space to write duration as a 20-byte string.
// 2 (ebml id) + 1 (data size) + 20 (data)
}
}
- if (mkv->have_attachments && mkv->mode != MODE_WEBM) {
+ if (mkv->nb_attachments && mkv->mode != MODE_WEBM) {
for (i = 0; i < s->nb_streams; i++) {
- mkv_track *track = &mkv->tracks[i];
- AVStream *st = s->streams[i];
+ const mkv_track *track = &mkv->tracks[i];
+ const AVStream *st = s->streams[i];
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue;
AVIOContext *dyn_cp = NULL, *pb = s->pb;
int i, ret;
- if (!mkv->have_attachments)
+ if (!mkv->nb_attachments)
return 0;
mkv_add_seekhead_entry(mkv, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
ret = start_ebml_master_crc32(&dyn_cp, mkv);
- if (ret < 0) return ret;
+ if (ret < 0)
+ return ret;
for (i = 0; i < s->nb_streams; i++) {
- AVStream *st = s->streams[i];
+ const AVStream *st = s->streams[i];
mkv_track *track = &mkv->tracks[i];
ebml_master attached_file;
- AVDictionaryEntry *t;
+ const AVDictionaryEntry *t;
const char *mimetype = NULL;
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id);
if (desc && desc->mime_types) {
mimetype = desc->mime_types[0];
- } else if (st->codecpar->codec_id = AV_CODEC_ID_TEXT)
+ } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT)
mimetype = "text/plain";
}
if (!mimetype) {
static int64_t get_metadata_duration(AVFormatContext *s)
{
- int i = 0;
+ const AVDictionaryEntry *duration = av_dict_get(s->metadata, "DURATION",
+ NULL, 0);
int64_t max = 0;
int64_t us;
- AVDictionaryEntry *explicitDuration = av_dict_get(s->metadata, "DURATION", NULL, 0);
- if (explicitDuration && (av_parse_time(&us, explicitDuration->value, 1) == 0) && us > 0) {
+ if (duration && (av_parse_time(&us, duration->value, 1) == 0) && us > 0) {
av_log(s, AV_LOG_DEBUG, "get_metadata_duration found duration in context metadata: %" PRId64 "\n", us);
return us;
}
- for (i = 0; i < s->nb_streams; i++) {
+ for (unsigned i = 0; i < s->nb_streams; i++) {
int64_t us;
- AVDictionaryEntry *duration = av_dict_get(s->streams[i]->metadata, "DURATION", NULL, 0);
+ duration = av_dict_get(s->streams[i]->metadata, "DURATION", NULL, 0);
if (duration && (av_parse_time(&us, duration->value, 1) == 0))
max = FFMAX(max, us);
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb = s->pb;
ebml_master ebml_header;
- AVDictionaryEntry *tag;
+ const AVDictionaryEntry *tag;
int ret, i, version = 2;
int64_t creation_time;
- if (!strcmp(s->oformat->name, "webm")) {
- mkv->mode = MODE_WEBM;
- mkv->write_crc = 0;
- } else
- mkv->mode = MODE_MATROSKAv2;
-
if (mkv->mode != MODE_WEBM ||
av_dict_get(s->metadata, "stereo_mode", NULL, 0) ||
av_dict_get(s->metadata, "alpha_mode", NULL, 0))
else
put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
- if (mkv->mode != MODE_WEBM) {
+ if (mkv->mode != MODE_WEBM)
put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, mkv->segment_uid, 16);
- }
} else {
const char *ident = "Lavf";
put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , ident);
}
static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
- uint32_t blockid, AVPacket *pkt, int keyframe)
+ uint32_t blockid, const AVPacket *pkt, int keyframe)
{
MatroskaMuxContext *mkv = s->priv_data;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
if (data != pkt->data)
av_free(data);
- if (blockid == MATROSKA_ID_BLOCK && !keyframe) {
+ if (blockid == MATROSKA_ID_BLOCK && !keyframe)
put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
- }
track->last_timestamp = ts;
- if (discard_padding) {
+ if (discard_padding)
put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
- }
if (side_data_size) {
block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0);
end_ebml_master(pb, block_more);
end_ebml_master(pb, block_additions);
}
- if (side_data_size || discard_padding) {
+ if (side_data_size || discard_padding)
end_ebml_master(pb, block_group);
- }
return 0;
}
-static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
+static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPacket *pkt)
{
MatroskaMuxContext *mkv = s->priv_data;
mkv_track *track = &mkv->tracks[pkt->stream_index];
ebml_master blockgroup;
int id_size, settings_size, size;
uint8_t *id, *settings;
- int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
+ int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
const int flags = 0;
id_size = 0;
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
}
-static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt)
+static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
{
MatroskaMuxContext *mkv = s->priv_data;
mkv_track *track = &mkv->tracks[pkt->stream_index];
break;
case AV_CODEC_ID_FLAC:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
- AVCodecParameters *codecpriv_par;
+ uint8_t *old_extradata = par->extradata;
if (side_data_size != par->extradata_size) {
av_log(s, AV_LOG_ERROR, "Invalid FLAC STREAMINFO metadata for output stream %d\n",
pkt->stream_index);
return AVERROR(EINVAL);
}
- codecpriv_par = avcodec_parameters_alloc();
- if (!codecpriv_par)
- return AVERROR(ENOMEM);
- ret = avcodec_parameters_copy(codecpriv_par, par);
- if (ret < 0) {
- avcodec_parameters_free(&codecpriv_par);
- return ret;
- }
- memcpy(codecpriv_par->extradata, side_data, side_data_size);
+ par->extradata = side_data;
avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
- mkv_write_codecprivate(s, mkv->tracks_bc, codecpriv_par, 1, 0);
- avcodec_parameters_free(&codecpriv_par);
+ mkv_write_codecprivate(s, mkv->tracks_bc, par, 1, 0);
+ par->extradata = old_extradata;
}
break;
// FIXME: Remove the following once libaom starts propagating extradata during init()
return 0;
}
-static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt)
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb;
(par->codec_type == AVMEDIA_TYPE_VIDEO || !mkv->have_video && !track->has_cue)) {
ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
mkv->cluster_pos, relative_packet_pos, -1);
- if (ret < 0) return ret;
+ if (ret < 0)
+ return ret;
track->has_cue = 1;
}
} else {
return 0;
}
-static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int mkv_write_packet(AVFormatContext *s, const AVPacket *pkt)
{
MatroskaMuxContext *mkv = s->priv_data;
int codec_type = s->streams[pkt->stream_index]->codecpar->codec_type;
return ret;
if (mkv->cluster_pos != -1) {
- if (mkv->tracks[pkt->stream_index].write_dts)
- cluster_time = pkt->dts - mkv->cluster_pts;
- else
- cluster_time = pkt->pts - mkv->cluster_pts;
- cluster_time += mkv->tracks[pkt->stream_index].ts_offset;
-
- cluster_size = avio_tell(mkv->cluster_bc);
-
- if (mkv->is_dash && codec_type == AVMEDIA_TYPE_VIDEO) {
- // WebM DASH specification states that the first block of every cluster
- // has to be a key frame. So for DASH video, we only create a cluster
- // on seeing key frames.
- start_new_cluster = keyframe;
- } else if (mkv->is_dash && codec_type == AVMEDIA_TYPE_AUDIO &&
- cluster_time > mkv->cluster_time_limit) {
- // For DASH audio, we create a Cluster based on cluster_time_limit
- start_new_cluster = 1;
- } else if (!mkv->is_dash &&
- (cluster_size > mkv->cluster_size_limit ||
- cluster_time > mkv->cluster_time_limit ||
- (codec_type == AVMEDIA_TYPE_VIDEO && keyframe &&
- cluster_size > 4 * 1024))) {
- start_new_cluster = 1;
- } else {
- start_new_cluster = 0;
- }
+ if (mkv->tracks[pkt->stream_index].write_dts)
+ cluster_time = pkt->dts - mkv->cluster_pts;
+ else
+ cluster_time = pkt->pts - mkv->cluster_pts;
+ cluster_time += mkv->tracks[pkt->stream_index].ts_offset;
+
+ cluster_size = avio_tell(mkv->cluster_bc);
+
+ if (mkv->is_dash && codec_type == AVMEDIA_TYPE_VIDEO) {
+ // WebM DASH specification states that the first block of
+ // every Cluster has to be a key frame. So for DASH video,
+ // we only create a Cluster on seeing key frames.
+ start_new_cluster = keyframe;
+ } else if (mkv->is_dash && codec_type == AVMEDIA_TYPE_AUDIO &&
+ cluster_time > mkv->cluster_time_limit) {
+ // For DASH audio, we create a Cluster based on cluster_time_limit.
+ start_new_cluster = 1;
+ } else if (!mkv->is_dash &&
+ (cluster_size > mkv->cluster_size_limit ||
+ cluster_time > mkv->cluster_time_limit ||
+ (codec_type == AVMEDIA_TYPE_VIDEO && keyframe &&
+ cluster_size > 4 * 1024))) {
+ start_new_cluster = 1;
+ } else
+ start_new_cluster = 0;
- if (start_new_cluster) {
- mkv_end_cluster(s);
- }
+ if (start_new_cluster)
+ mkv_end_cluster(s);
}
if (!mkv->cluster_pos)
put_ebml_float(mkv->info_bc, MATROSKA_ID_DURATION, mkv->duration);
end_ebml_master_crc32(pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0);
- // write tracks master
- avio_seek(pb, mkv->tracks_pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0);
+ if (mkv->tracks_bc) {
+ // write Tracks master
+ avio_seek(pb, mkv->tracks_pos, SEEK_SET);
+ end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv,
+ MATROSKA_ID_TRACKS, 0, 0);
+ }
// update stream durations
if (mkv->tags_bc) {
int i;
for (i = 0; i < s->nb_streams; ++i) {
- AVStream *st = s->streams[i];
- mkv_track *track = &mkv->tracks[i];
+ const AVStream *st = s->streams[i];
+ const mkv_track *track = &mkv->tracks[i];
if (track->duration_offset > 0) {
double duration_sec = track->duration * av_q2d(st->time_base);
avio_seek(pb, endpos, SEEK_SET);
}
- if (!mkv->is_live) {
+ if (!mkv->is_live)
end_ebml_master(pb, mkv->segment);
- }
return mkv->reserve_cues_space < 0 ? AVERROR(EINVAL) : 0;
}
s->internal->avoid_negative_ts_use_pts = 1;
}
+ if (!strcmp(s->oformat->name, "webm")) {
+ mkv->mode = MODE_WEBM;
+ mkv->write_crc = 0;
+ } else
+ mkv->mode = MODE_MATROSKAv2;
+
mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks));
- if (!mkv->tracks) {
+ if (!mkv->tracks)
return AVERROR(ENOMEM);
- }
if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
av_lfg_init(&c, av_get_random_seed());
}
// ms precision is the de-facto standard timescale for mkv files
- avpriv_set_pts_info(s->streams[i], 64, 1, 1000);
+ avpriv_set_pts_info(st, 64, 1, 1000);
- if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
+ if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
+ if (mkv->mode == MODE_WEBM) {
+ av_log(s, AV_LOG_WARNING, "Stream %d will be ignored "
+ "as WebM doesn't support attachments.\n", i);
+ }
+ mkv->nb_attachments++;
continue;
+ }
nb_tracks++;
track->track_num = mkv->is_dash ? mkv->dash_track_number : nb_tracks;
{ "live", "Write files assuming it is a live stream.", OFFSET(is_live), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "allow_raw_vfw", "allow RAW VFW mode", OFFSET(allow_raw_vfw), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
{ "write_crc32", "write a CRC32 element inside every Level 1 element", OFFSET(write_crc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS },
+ { "default_mode", "Controls how a track's FlagDefault is inferred", OFFSET(default_mode), AV_OPT_TYPE_INT, { .i64 = DEFAULT_MODE_INFER }, DEFAULT_MODE_INFER, DEFAULT_MODE_PASSTHROUGH, FLAGS, "default_mode" },
+ { "infer", "For each track type, mark the first track of disposition default as default; if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER }, 0, 0, FLAGS, "default_mode" },
+ { "infer_no_subs", "For each track type, mark the first track of disposition default as default; for audio and video: if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER_NO_SUBS }, 0, 0, FLAGS, "default_mode" },
+ { "passthrough", "Use the disposition flag as-is", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_PASSTHROUGH }, 0, 0, FLAGS, "default_mode" },
{ NULL },
};
projects / ffmpeg / blobdiff