* Info, Tracks, Chapters, Attachments, Tags and Cues */
#define MAX_SEEKHEAD_ENTRIES 6
+#define IS_SEEKABLE(pb, mkv) (((pb)->seekable & AVIO_SEEKABLE_NORMAL) && \
+ !(mkv)->is_live)
+
enum {
DEFAULT_MODE_INFER,
DEFAULT_MODE_INFER_NO_SUBS,
int sizebytes; ///< how many bytes were reserved for the size
} ebml_master;
+typedef struct ebml_stored_master {
+ AVIOContext *bc;
+ int64_t pos;
+} ebml_stored_master;
+
typedef struct mkv_seekhead_entry {
uint32_t elementid;
uint64_t segmentpos;
} mkv_cuepoint;
typedef struct mkv_cues {
- mkv_cuepoint *entries;
+ mkv_cuepoint *entries;
int num_entries;
} mkv_cues;
#define MODE_WEBM 0x02
typedef struct MatroskaMuxContext {
- const AVClass *class;
- int mode;
- AVIOContext *tags_bc;
- int64_t tags_pos;
- AVIOContext *info_bc;
- int64_t info_pos;
- AVIOContext *tracks_bc;
- int64_t tracks_pos;
- ebml_master segment;
- int64_t segment_offset;
- AVIOContext *cluster_bc;
- int64_t cluster_pos; ///< file offset of the current cluster
- int64_t cluster_pts;
- int64_t duration_offset;
- int64_t duration;
- mkv_seekhead seekhead;
- mkv_cues cues;
- mkv_track *tracks;
-
- AVPacket cur_audio_pkt;
-
- unsigned nb_attachments;
- int have_video;
-
- int reserve_cues_space;
- int cluster_size_limit;
- int64_t cues_pos;
- int64_t cluster_time_limit;
- int is_dash;
- int dash_track_number;
- int is_live;
- int write_crc;
-
- uint32_t chapter_id_offset;
- int wrote_chapters;
-
- int allow_raw_vfw;
- int default_mode;
-
- uint32_t segment_uid[4];
+ const AVClass *class;
+ int mode;
+ ebml_stored_master info;
+ ebml_stored_master track;
+ ebml_stored_master tags;
+ int64_t segment_offset;
+ AVIOContext *cluster_bc;
+ int64_t cluster_pos; ///< file offset of the current Cluster
+ int64_t cluster_pts;
+ int64_t duration_offset;
+ int64_t duration;
+ mkv_track *tracks;
+ mkv_seekhead seekhead;
+ mkv_cues cues;
+ int64_t cues_pos;
+
+ AVPacket cur_audio_pkt;
+
+ unsigned nb_attachments;
+ int have_video;
+
+ uint32_t chapter_id_offset;
+ int wrote_chapters;
+
+ int reserve_cues_space;
+ int cluster_size_limit;
+ int64_t cluster_time_limit;
+ int write_crc;
+ int is_live;
+
+ int is_dash;
+ int dash_track_number;
+ int allow_raw_vfw;
+ int default_mode;
+
+ uint32_t segment_uid[4];
} MatroskaMuxContext;
/** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint,
avio_seek(pb, pos, SEEK_SET);
}
+static void mkv_add_seekhead_entry(MatroskaMuxContext *mkv, uint32_t elementid,
+ uint64_t filepos)
+{
+ mkv_seekhead *seekhead = &mkv->seekhead;
+
+ av_assert1(seekhead->num_entries < MAX_SEEKHEAD_ENTRIES);
+
+ seekhead->entries[seekhead->num_entries].elementid = elementid;
+ seekhead->entries[seekhead->num_entries++].segmentpos = filepos - mkv->segment_offset;
+}
+
static int start_ebml_master_crc32(AVIOContext **dyn_cp, MatroskaMuxContext *mkv)
{
int ret;
return 0;
}
-static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp,
- MatroskaMuxContext *mkv, uint32_t id,
- int length_size, int keep_buffer)
+static int end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp,
+ MatroskaMuxContext *mkv, uint32_t id,
+ int length_size, int keep_buffer,
+ int add_seekentry)
{
uint8_t *buf, crc[4];
- int size, skip = 0;
+ int ret, size, skip = 0;
- put_ebml_id(pb, id);
size = avio_get_dyn_buf(*dyn_cp, &buf);
+ if ((ret = (*dyn_cp)->error) < 0)
+ goto fail;
+
+ if (add_seekentry)
+ mkv_add_seekhead_entry(mkv, id, avio_tell(pb));
+
+ put_ebml_id(pb, id);
put_ebml_length(pb, size, length_size);
if (mkv->write_crc) {
skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */
}
avio_write(pb, buf + skip, size - skip);
+fail:
if (keep_buffer) {
ffio_reset_dyn_buf(*dyn_cp);
} else {
ffio_free_dyn_buf(dyn_cp);
}
+ return ret;
}
/**
-* Complete ebml master without destroying the buffer, allowing for later updates
-*/
-static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext *dyn_cp,
- uint32_t id, int64_t *pos)
+ * Output EBML master. Keep the buffer if seekable, allowing for later updates.
+ * Furthermore always add a SeekHead Entry for this element.
+ */
+static int end_ebml_master_crc32_tentatively(AVIOContext *pb,
+ ebml_stored_master *elem,
+ MatroskaMuxContext *mkv, uint32_t id)
{
- uint8_t *buf;
- int size = avio_get_dyn_buf(dyn_cp, &buf);
+ if (IS_SEEKABLE(pb, mkv)) {
+ uint8_t *buf;
+ int size = avio_get_dyn_buf(elem->bc, &buf);
- *pos = avio_tell(pb);
+ if (elem->bc->error < 0)
+ return elem->bc->error;
- put_ebml_id(pb, id);
- put_ebml_length(pb, size, 0);
- avio_write(pb, buf, size);
+ elem->pos = avio_tell(pb);
+ mkv_add_seekhead_entry(mkv, id, elem->pos);
+
+ put_ebml_id(pb, id);
+ put_ebml_length(pb, size, 0);
+ avio_write(pb, buf, size);
+
+ return 0;
+ } else
+ return end_ebml_master_crc32(pb, &elem->bc, mkv, id, 0, 0, 1);
}
static void put_xiph_size(AVIOContext *pb, int size)
av_packet_unref(&mkv->cur_audio_pkt);
ffio_free_dyn_buf(&mkv->cluster_bc);
- ffio_free_dyn_buf(&mkv->info_bc);
- ffio_free_dyn_buf(&mkv->tracks_bc);
- ffio_free_dyn_buf(&mkv->tags_bc);
+ ffio_free_dyn_buf(&mkv->info.bc);
+ ffio_free_dyn_buf(&mkv->track.bc);
+ ffio_free_dyn_buf(&mkv->tags.bc);
av_freep(&mkv->cues.entries);
av_freep(&mkv->tracks);
put_ebml_void(pb, mkv->seekhead.reserved_size);
}
-static void mkv_add_seekhead_entry(MatroskaMuxContext *mkv, uint32_t elementid,
- uint64_t filepos)
-{
- mkv_seekhead *seekhead = &mkv->seekhead;
-
- av_assert1(seekhead->num_entries < MAX_SEEKHEAD_ENTRIES);
-
- seekhead->entries[seekhead->num_entries].elementid = elementid;
- seekhead->entries[seekhead->num_entries++].segmentpos = filepos - mkv->segment_offset;
-}
-
/**
* Write the SeekHead to the file at the location reserved for it
* and seek to destpos afterwards. When error_on_seek_failure
put_ebml_uint(dyn_cp, MATROSKA_ID_SEEKPOSITION, entry->segmentpos);
end_ebml_master(dyn_cp, seekentry);
}
- end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_SEEKHEAD, 0, 0);
+ ret = end_ebml_master_crc32(pb, &dyn_cp, mkv,
+ MATROSKA_ID_SEEKHEAD, 0, 0, 0);
+ if (ret < 0)
+ return ret;
remaining = seekhead->filepos + seekhead->reserved_size - avio_tell(pb);
put_ebml_void(pb, remaining);
end_ebml_master(cuepoint, track_positions);
} while (++entry < end && entry->pts == pts);
size = avio_get_dyn_buf(cuepoint, &buf);
+ if ((ret = cuepoint->error) < 0)
+ break;
put_ebml_binary(dyn_cp, MATROSKA_ID_POINTENTRY, buf, size);
ffio_reset_dyn_buf(cuepoint);
}
ffio_free_dyn_buf(&cuepoint);
- return 0;
+ return ret;
}
static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb,
return 0;
}
-static int get_aac_sample_rates(AVFormatContext *s, const uint8_t *extradata,
- int extradata_size, int *sample_rate,
- int *output_sample_rate)
+static int get_aac_sample_rates(AVFormatContext *s, MatroskaMuxContext *mkv,
+ const uint8_t *extradata, int extradata_size,
+ int *sample_rate, int *output_sample_rate)
{
MPEG4AudioConfig mp4ac;
int ret;
* first packet.
* Abort however if s->pb is not seekable, as we would not be able to seek back
* to write the sample rate elements once the extradata shows up, anyway. */
- if (ret < 0 && (extradata_size || !(s->pb->seekable & AVIO_SEEKABLE_NORMAL))) {
+ if (ret < 0 && (extradata_size || !IS_SEEKABLE(s->pb, mkv))) {
av_log(s, AV_LOG_ERROR,
"Error parsing AAC extradata, unable to determine samplerate.\n");
return AVERROR(EINVAL);
ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX);
}
- codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv);
- if (codecpriv_size)
- put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv,
- codecpriv_size);
+ if (ret >= 0) {
+ codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv);
+ if ((ret = dyn_cp->error) >= 0 && codecpriv_size)
+ put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv,
+ codecpriv_size);
+ }
ffio_free_dyn_buf(&dyn_cp);
return ret;
}
-static int mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par,
- const AVStream *st)
+static void mkv_write_video_color(AVIOContext *pb, const AVStream *st,
+ const AVCodecParameters *par)
{
- AVIOContext *dyn_cp;
- uint8_t *colorinfo_ptr;
+ /* 18 Elements with two bytes ID, one byte length field, 8 bytes payload
+ * a master element with two bytes ID and one byte length field
+ * plus another byte to stay clear of the end. */
+ uint8_t colour[(2 + 1 + 8) * 18 + (2 + 1) + 1];
+ AVIOContext buf, *dyn_cp = &buf;
int side_data_size = 0;
- int ret, colorinfo_size;
+ int colorinfo_size;
const uint8_t *side_data;
- ret = avio_open_dyn_buf(&dyn_cp);
- if (ret < 0)
- return ret;
+ ffio_init_context(dyn_cp, colour, sizeof(colour), 1, NULL, NULL, NULL, NULL);
if (par->color_trc != AVCOL_TRC_UNSPECIFIED &&
par->color_trc < AVCOL_TRC_NB) {
end_ebml_master(dyn_cp, meta_element);
}
- colorinfo_size = avio_get_dyn_buf(dyn_cp, &colorinfo_ptr);
- if (colorinfo_size) {
- ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, colorinfo_size);
- avio_write(pb, colorinfo_ptr, colorinfo_size);
- end_ebml_master(pb, colorinfo);
- }
- ffio_free_dyn_buf(&dyn_cp);
- return 0;
+ colorinfo_size = avio_tell(dyn_cp);
+ if (colorinfo_size)
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLOR, colour, colorinfo_size);
}
static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
return 0;
if (par->codec_id == AV_CODEC_ID_AAC) {
- ret = get_aac_sample_rates(s, par->extradata, par->extradata_size, &sample_rate,
- &output_sample_rate);
+ ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size,
+ &sample_rate, &output_sample_rate);
if (ret < 0)
return ret;
}
uint32_t color_space = av_le2ne32(par->codec_tag);
put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
}
- ret = mkv_write_video_color(pb, par, st);
- if (ret < 0)
- return ret;
+ mkv_write_video_color(pb, st, par);
+
ret = mkv_write_video_projection(s, pb, st);
if (ret < 0)
return ret;
if (mkv->nb_attachments == s->nb_streams)
return 0;
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_TRACKS, avio_tell(pb));
-
- ret = start_ebml_master_crc32(&mkv->tracks_bc, mkv);
+ ret = start_ebml_master_crc32(&mkv->track.bc, mkv);
if (ret < 0)
return ret;
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, is_default);
+ mkv->track.bc, is_default);
if (ret < 0)
return ret;
}
- if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(pb, mkv->tracks_bc,
- MATROSKA_ID_TRACKS, &mkv->tracks_pos);
- else
- end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0);
-
- return 0;
+ return end_ebml_master_crc32_tentatively(pb, &mkv->track, mkv,
+ MATROSKA_ID_TRACKS);
}
static int mkv_write_chapters(AVFormatContext *s)
if (!s->nb_chapters || mkv->wrote_chapters)
return 0;
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_CHAPTERS, avio_tell(pb));
+ for (i = 0; i < s->nb_chapters; i++)
+ if (!s->chapters[i]->id) {
+ mkv->chapter_id_offset = 1;
+ break;
+ }
ret = start_ebml_master_crc32(&dyn_cp, mkv);
if (ret < 0)
av_log(s, AV_LOG_ERROR,
"Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
chapterstart, chapterend);
+ ffio_free_dyn_buf(&dyn_cp);
return AVERROR_INVALIDDATA;
}
end_ebml_master(dyn_cp, chapteratom);
}
end_ebml_master(dyn_cp, editionentry);
- end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_CHAPTERS, 0, 0);
-
mkv->wrote_chapters = 1;
- return 0;
+
+ return end_ebml_master_crc32(pb, &dyn_cp, mkv,
+ MATROSKA_ID_CHAPTERS, 0, 0, 1);
}
static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t)
ebml_master targets;
int ret;
- if (!mkv->tags_bc) {
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_TAGS, avio_tell(s->pb));
-
- ret = start_ebml_master_crc32(&mkv->tags_bc, mkv);
+ if (!mkv->tags.bc) {
+ ret = start_ebml_master_crc32(&mkv->tags.bc, mkv);
if (ret < 0)
return ret;
}
- pb = mkv->tags_bc;
+ pb = mkv->tags.bc;
*tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0);
targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 4 + 1 + 8);
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) {
if (mkv_check_tag_name(t->key, elementid)) {
- ret = mkv_write_simpletag(mkv->tags_bc, t);
+ ret = mkv_write_simpletag(mkv->tags.bc, t);
if (ret < 0)
return ret;
}
}
if (!tag)
- end_ebml_master(mkv->tags_bc, tag2);
+ end_ebml_master(mkv->tags.bc, tag2);
return 0;
}
static int mkv_write_tags(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- ebml_master tag, *tagp;
+ ebml_master tag, *tagp = IS_SEEKABLE(s->pb, mkv) ? &tag : NULL;
int i, ret;
ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
return ret;
}
- tagp = (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live ? &tag : NULL;
for (i = 0; i < s->nb_streams; i++) {
const AVStream *st = s->streams[i];
mkv_track *track = &mkv->tracks[i];
return ret;
if (tagp) {
- AVIOContext *pb = mkv->tags_bc;
+ AVIOContext *pb = mkv->tags.bc;
ebml_master simpletag;
simpletag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG,
}
}
- if (mkv->tags_bc) {
- if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(s->pb, mkv->tags_bc,
- MATROSKA_ID_TAGS, &mkv->tags_pos);
- else
- end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0, 0);
+ if (mkv->tags.bc) {
+ return end_ebml_master_crc32_tentatively(s->pb, &mkv->tags, mkv,
+ MATROSKA_ID_TAGS);
}
return 0;
}
+static const char *get_mimetype(const AVStream *st)
+{
+ const AVDictionaryEntry *t;
+
+ if (t = av_dict_get(st->metadata, "mimetype", NULL, 0))
+ return t->value;
+ if (st->codecpar->codec_id != AV_CODEC_ID_NONE) {
+ const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id);
+ if (desc && desc->mime_types) {
+ return desc->mime_types[0];
+ } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT)
+ return "text/plain";
+ }
+
+ return NULL;
+}
+
static int mkv_write_attachments(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
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;
mkv_track *track = &mkv->tracks[i];
ebml_master attached_file;
const AVDictionaryEntry *t;
- const char *mimetype = NULL;
+ const char *mimetype;
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue;
return AVERROR(EINVAL);
}
put_ebml_string(dyn_cp, MATROSKA_ID_FILENAME, t->value);
- if (t = av_dict_get(st->metadata, "mimetype", NULL, 0))
- mimetype = t->value;
- else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) {
- 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)
- mimetype = "text/plain";
- }
- if (!mimetype) {
- av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and "
- "it cannot be deduced from the codec id.\n", i);
- return AVERROR(EINVAL);
- }
+ mimetype = get_mimetype(st);
+ av_assert0(mimetype);
put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype);
put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
put_ebml_uid(dyn_cp, MATROSKA_ID_FILEUID, track->uid);
end_ebml_master(dyn_cp, attached_file);
}
- end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_ATTACHMENTS, 0, 0);
-
- return 0;
+ return end_ebml_master_crc32(pb, &dyn_cp, mkv,
+ MATROSKA_ID_ATTACHMENTS, 0, 0, 1);
}
static int64_t get_metadata_duration(AVFormatContext *s)
put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION, 2);
end_ebml_master(pb, ebml_header);
- mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT, 0);
+ put_ebml_id(pb, MATROSKA_ID_SEGMENT);
+ put_ebml_size_unknown(pb, 8);
mkv->segment_offset = avio_tell(pb);
- // we write a seek head at the beginning to point to all other level
+ // We write a SeekHead at the beginning to point to all other level
// one elements (except Clusters).
mkv_start_seekhead(mkv, pb);
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_INFO, avio_tell(pb));
-
- ret = start_ebml_master_crc32(&mkv->info_bc, mkv);
+ ret = start_ebml_master_crc32(&mkv->info.bc, mkv);
if (ret < 0)
return ret;
- pb = mkv->info_bc;
+ pb = mkv->info.bc;
put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
if ((tag = av_dict_get(s->metadata, "title", NULL, 0)))
int64_t scaledDuration = av_rescale(metadata_duration, 1000, AV_TIME_BASE);
put_ebml_float(pb, MATROSKA_ID_DURATION, scaledDuration);
av_log(s, AV_LOG_DEBUG, "Write early duration from metadata = %" PRIu64 "\n", scaledDuration);
- } else {
+ } else if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
put_ebml_void(pb, 11); // assumes double-precision float to be written
}
}
- if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(s->pb, mkv->info_bc,
- MATROSKA_ID_INFO, &mkv->info_pos);
- else
- end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0);
+ ret = end_ebml_master_crc32_tentatively(s->pb, &mkv->info,
+ mkv, MATROSKA_ID_INFO);
+ if (ret < 0)
+ return ret;
pb = s->pb;
ret = mkv_write_tracks(s);
if (ret < 0)
return ret;
- for (i = 0; i < s->nb_chapters; i++)
- if (!s->chapters[i]->id) {
- mkv->chapter_id_offset = 1;
- break;
- }
-
ret = mkv_write_chapters(s);
if (ret < 0)
return ret;
return ret;
}
+ /* Must come after mkv_write_chapters() because of chapter_id_offset */
ret = mkv_write_tags(s);
if (ret < 0)
return ret;
- if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) || mkv->is_live) {
+ if (!IS_SEEKABLE(pb, mkv)) {
ret = mkv_write_seekhead(pb, mkv, 0, avio_tell(pb));
if (ret < 0)
return ret;
put_ebml_void(pb, s->metadata_header_padding);
}
- if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && mkv->reserve_cues_space) {
- mkv->cues_pos = avio_tell(pb);
- if (mkv->reserve_cues_space == 1)
- mkv->reserve_cues_space++;
- put_ebml_void(pb, mkv->reserve_cues_space);
+ if (mkv->reserve_cues_space) {
+ if (IS_SEEKABLE(pb, mkv)) {
+ mkv->cues_pos = avio_tell(pb);
+ if (mkv->reserve_cues_space == 1)
+ mkv->reserve_cues_space++;
+ put_ebml_void(pb, mkv->reserve_cues_space);
+ } else
+ mkv->reserve_cues_space = -1;
}
av_init_packet(&mkv->cur_audio_pkt);
// start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
// after 4k and on a keyframe
- if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
+ if (IS_SEEKABLE(pb, mkv)) {
if (mkv->cluster_time_limit < 0)
mkv->cluster_time_limit = 5000;
if (mkv->cluster_size_limit < 0)
return pkt->duration;
}
-static void mkv_end_cluster(AVFormatContext *s)
+static int mkv_end_cluster(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
+ int ret;
- end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv, MATROSKA_ID_CLUSTER, 0, 1);
if (!mkv->have_video) {
for (unsigned i = 0; i < s->nb_streams; i++)
mkv->tracks[i].has_cue = 0;
}
mkv->cluster_pos = -1;
+ ret = end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv,
+ MATROSKA_ID_CLUSTER, 0, 1, 0);
+ if (ret < 0)
+ return ret;
+
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
+ return 0;
}
static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt)
switch (par->codec_id) {
case AV_CODEC_ID_AAC:
- if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
+ if (side_data_size && mkv->track.bc) {
int filler, output_sample_rate = 0;
- ret = get_aac_sample_rates(s, side_data, side_data_size, &track->sample_rate,
- &output_sample_rate);
+ ret = get_aac_sample_rates(s, mkv, side_data, side_data_size,
+ &track->sample_rate, &output_sample_rate);
if (ret < 0)
return ret;
if (!output_sample_rate)
if (ret < 0)
return ret;
memcpy(par->extradata, side_data, side_data_size);
- avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
- mkv_write_codecprivate(s, mkv->tracks_bc, par, 1, 0);
- filler = MAX_PCE_SIZE + 2 + 4 - (avio_tell(mkv->tracks_bc) - track->codecpriv_offset);
+ avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET);
+ mkv_write_codecprivate(s, mkv->track.bc, par, 1, 0);
+ filler = MAX_PCE_SIZE + 2 + 4 - (avio_tell(mkv->track.bc) - track->codecpriv_offset);
if (filler)
- put_ebml_void(mkv->tracks_bc, filler);
- avio_seek(mkv->tracks_bc, track->sample_rate_offset, SEEK_SET);
- put_ebml_float(mkv->tracks_bc, MATROSKA_ID_AUDIOSAMPLINGFREQ, track->sample_rate);
- put_ebml_float(mkv->tracks_bc, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
+ put_ebml_void(mkv->track.bc, filler);
+ avio_seek(mkv->track.bc, track->sample_rate_offset, SEEK_SET);
+ put_ebml_float(mkv->track.bc, MATROSKA_ID_AUDIOSAMPLINGFREQ, track->sample_rate);
+ put_ebml_float(mkv->track.bc, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
} else if (!par->extradata_size && !track->sample_rate) {
// No extradata (codecpar or packet side data).
av_log(s, AV_LOG_ERROR, "Error parsing AAC extradata, unable to determine samplerate.\n");
}
break;
case AV_CODEC_ID_FLAC:
- if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
+ if (side_data_size && mkv->track.bc) {
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",
return AVERROR(EINVAL);
}
par->extradata = side_data;
- avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
- mkv_write_codecprivate(s, mkv->tracks_bc, par, 1, 0);
+ avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET);
+ mkv_write_codecprivate(s, mkv->track.bc, par, 1, 0);
par->extradata = old_extradata;
}
break;
// FIXME: Remove the following once libaom starts propagating extradata during init()
// See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012
case AV_CODEC_ID_AV1:
- if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live &&
- !par->extradata_size) {
+ if (side_data_size && mkv->track.bc && !par->extradata_size) {
AVIOContext *dyn_cp;
uint8_t *codecpriv;
int codecpriv_size;
if (ret < 0)
return ret;
ff_isom_write_av1c(dyn_cp, side_data, side_data_size);
- codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv);
- if (!codecpriv_size) {
- av_free(codecpriv);
- return AVERROR_INVALIDDATA;
+ codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv);
+ if ((ret = dyn_cp->error) < 0 ||
+ !codecpriv_size && (ret = AVERROR_INVALIDDATA)) {
+ ffio_free_dyn_buf(&dyn_cp);
+ return ret;
}
- avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
+ avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET);
// Do not write the OBUs as we don't have space saved for them
- put_ebml_binary(mkv->tracks_bc, MATROSKA_ID_CODECPRIVATE, codecpriv, 4);
- av_free(codecpriv);
+ put_ebml_binary(mkv->track.bc, MATROSKA_ID_CODECPRIVATE, codecpriv, 4);
+ ffio_free_dyn_buf(&dyn_cp);
ret = ff_alloc_extradata(par, side_data_size);
if (ret < 0)
return ret;
if (mkv->cluster_pos != -1) {
int64_t cluster_time = ts - mkv->cluster_pts;
if ((int16_t)cluster_time != cluster_time) {
- mkv_end_cluster(s);
+ ret = mkv_end_cluster(s);
+ if (ret < 0)
+ return ret;
av_log(s, AV_LOG_WARNING, "Starting new cluster due to timestamp\n");
}
}
ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
if (ret < 0)
return ret;
- if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && keyframe &&
+ if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
(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);
end_ebml_master(pb, blockgroup);
}
- if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
+ if (IS_SEEKABLE(s->pb, mkv)) {
ret = mkv_add_cuepoint(mkv, pkt->stream_index, ts,
mkv->cluster_pos, relative_packet_pos, duration);
if (ret < 0)
} else
start_new_cluster = 0;
- if (start_new_cluster)
- mkv_end_cluster(s);
+ if (start_new_cluster) {
+ ret = mkv_end_cluster(s);
+ if (ret < 0)
+ return ret;
+ }
}
if (!mkv->cluster_pos)
if (!pkt) {
if (mkv->cluster_pos != -1) {
- mkv_end_cluster(s);
+ int ret = mkv_end_cluster(s);
+ if (ret < 0)
+ return ret;
av_log(s, AV_LOG_DEBUG,
"Flushing cluster at offset %" PRIu64 " bytes\n",
avio_tell(s->pb));
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb = s->pb;
- int ret;
+ int64_t endpos, ret64;
+ int ret, ret2 = 0;
// check if we have an audio packet cached
if (mkv->cur_audio_pkt.size > 0) {
}
if (mkv->cluster_pos != -1) {
- end_ebml_master_crc32(pb, &mkv->cluster_bc, mkv,
- MATROSKA_ID_CLUSTER, 0, 0);
+ ret = end_ebml_master_crc32(pb, &mkv->cluster_bc, mkv,
+ MATROSKA_ID_CLUSTER, 0, 0, 0);
+ if (ret < 0)
+ return ret;
}
ret = mkv_write_chapters(s);
if (ret < 0)
return ret;
+ if (!IS_SEEKABLE(pb, mkv))
+ return 0;
- if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
- int64_t endpos, ret64;
-
- endpos = avio_tell(pb);
+ endpos = avio_tell(pb);
- if (mkv->cues.num_entries) {
- AVIOContext *cues = NULL;
- uint64_t size;
- int64_t cuespos = endpos;
- int length_size = 0;
+ if (mkv->cues.num_entries && mkv->reserve_cues_space >= 0) {
+ AVIOContext *cues = NULL;
+ uint64_t size;
+ int length_size = 0;
- ret = start_ebml_master_crc32(&cues, mkv);
- if (ret < 0)
- return ret;
+ ret = start_ebml_master_crc32(&cues, mkv);
+ if (ret < 0)
+ return ret;
- ret = mkv_assemble_cues(s->streams, cues, &mkv->cues,
- mkv->tracks, s->nb_streams);
- if (ret < 0) {
- ffio_free_dyn_buf(&cues);
- return ret;
- }
+ ret = mkv_assemble_cues(s->streams, cues, &mkv->cues,
+ mkv->tracks, s->nb_streams);
+ if (ret < 0) {
+ ffio_free_dyn_buf(&cues);
+ return ret;
+ }
- if (mkv->reserve_cues_space) {
- size = avio_tell(cues);
- length_size = ebml_length_size(size);
- size += 4 + length_size;
- if (mkv->reserve_cues_space < size) {
- av_log(s, AV_LOG_WARNING,
- "Insufficient space reserved for Cues: "
- "%d < %"PRIu64". No Cues will be output.\n",
- mkv->reserve_cues_space, size);
- mkv->reserve_cues_space = -1;
+ if (mkv->reserve_cues_space) {
+ size = avio_tell(cues);
+ length_size = ebml_length_size(size);
+ size += 4 + length_size;
+ if (mkv->reserve_cues_space < size) {
+ av_log(s, AV_LOG_WARNING,
+ "Insufficient space reserved for Cues: "
+ "%d < %"PRIu64". No Cues will be output.\n",
+ mkv->reserve_cues_space, size);
+ ret2 = AVERROR(EINVAL);
+ goto after_cues;
+ } else {
+ if ((ret64 = avio_seek(pb, mkv->cues_pos, SEEK_SET)) < 0) {
ffio_free_dyn_buf(&cues);
- goto after_cues;
- } else {
- cuespos = mkv->cues_pos;
- if ((ret64 = avio_seek(pb, mkv->cues_pos, SEEK_SET)) < 0) {
- ffio_free_dyn_buf(&cues);
- return ret64;
- }
- if (mkv->reserve_cues_space == size + 1) {
- /* There is no way to reserve a single byte because
- * the minimal size of an EBML Void element is 2
- * (1 byte ID, 1 byte length field). This problem
- * is solved by writing the Cues' length field on
- * one byte more than necessary. */
- length_size++;
- size++;
- }
+ return ret64;
+ }
+ if (mkv->reserve_cues_space == size + 1) {
+ /* There is no way to reserve a single byte because
+ * the minimal size of an EBML Void element is 2
+ * (1 byte ID, 1 byte length field). This problem
+ * is solved by writing the Cues' length field on
+ * one byte more than necessary. */
+ length_size++;
+ size++;
}
}
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_CUES, cuespos);
- end_ebml_master_crc32(pb, &cues, mkv, MATROSKA_ID_CUES,
- length_size, 0);
- if (mkv->reserve_cues_space) {
- if (size < mkv->reserve_cues_space)
- put_ebml_void(pb, mkv->reserve_cues_space - size);
- } else
- endpos = avio_tell(pb);
}
-
- after_cues:
- ret = mkv_write_seekhead(pb, mkv, 1, mkv->info_pos);
+ ret = end_ebml_master_crc32(pb, &cues, mkv, MATROSKA_ID_CUES,
+ length_size, 0, 1);
if (ret < 0)
return ret;
+ if (mkv->reserve_cues_space) {
+ if (size < mkv->reserve_cues_space)
+ put_ebml_void(pb, mkv->reserve_cues_space - size);
+ } else
+ endpos = avio_tell(pb);
+ }
+
+after_cues:
+ /* Lengths greater than (1ULL << 56) - 1 can't be represented
+ * via an EBML number, so leave the unknown length field. */
+ if (endpos - mkv->segment_offset < (1ULL << 56) - 1) {
+ if ((ret64 = avio_seek(pb, mkv->segment_offset - 8, SEEK_SET)) < 0)
+ return ret64;
+ put_ebml_length(pb, endpos - mkv->segment_offset, 8);
+ }
+ ret = mkv_write_seekhead(pb, mkv, 1, mkv->info.pos);
+ if (ret < 0)
+ return ret;
+
+ if (mkv->info.bc) {
// update the duration
av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
- avio_seek(mkv->info_bc, mkv->duration_offset, SEEK_SET);
- 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);
-
- 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);
- }
+ avio_seek(mkv->info.bc, mkv->duration_offset, SEEK_SET);
+ put_ebml_float(mkv->info.bc, MATROSKA_ID_DURATION, mkv->duration);
+ ret = end_ebml_master_crc32(pb, &mkv->info.bc, mkv,
+ MATROSKA_ID_INFO, 0, 0, 0);
+ if (ret < 0)
+ return ret;
+ }
- // update stream durations
- if (mkv->tags_bc) {
- int i;
- for (i = 0; i < s->nb_streams; ++i) {
- const AVStream *st = s->streams[i];
- const mkv_track *track = &mkv->tracks[i];
+ if (mkv->track.bc) {
+ // write Tracks master
+ avio_seek(pb, mkv->track.pos, SEEK_SET);
+ ret = end_ebml_master_crc32(pb, &mkv->track.bc, mkv,
+ MATROSKA_ID_TRACKS, 0, 0, 0);
+ if (ret < 0)
+ return ret;
+ }
- if (track->duration_offset > 0) {
- double duration_sec = track->duration * av_q2d(st->time_base);
- char duration_string[20] = "";
+ // update stream durations
+ if (mkv->tags.bc) {
+ int i;
+ for (i = 0; i < s->nb_streams; ++i) {
+ const AVStream *st = s->streams[i];
+ const mkv_track *track = &mkv->tracks[i];
- av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i,
- track->duration);
+ if (track->duration_offset > 0) {
+ double duration_sec = track->duration * av_q2d(st->time_base);
+ char duration_string[20] = "";
- avio_seek(mkv->tags_bc, track->duration_offset, SEEK_SET);
+ av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i,
+ track->duration);
- snprintf(duration_string, 20, "%02d:%02d:%012.9f",
- (int) duration_sec / 3600, ((int) duration_sec / 60) % 60,
- fmod(duration_sec, 60));
+ avio_seek(mkv->tags.bc, track->duration_offset, SEEK_SET);
- put_ebml_binary(mkv->tags_bc, MATROSKA_ID_TAGSTRING, duration_string, 20);
- }
- }
+ snprintf(duration_string, 20, "%02d:%02d:%012.9f",
+ (int) duration_sec / 3600, ((int) duration_sec / 60) % 60,
+ fmod(duration_sec, 60));
- avio_seek(pb, mkv->tags_pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0, 0);
+ put_ebml_binary(mkv->tags.bc, MATROSKA_ID_TAGSTRING, duration_string, 20);
+ }
}
- avio_seek(pb, endpos, SEEK_SET);
+ avio_seek(pb, mkv->tags.pos, SEEK_SET);
+ ret = end_ebml_master_crc32(pb, &mkv->tags.bc, mkv,
+ MATROSKA_ID_TAGS, 0, 0, 0);
+ if (ret < 0)
+ return ret;
}
- if (!mkv->is_live)
- end_ebml_master(pb, mkv->segment);
+ avio_seek(pb, endpos, SEEK_SET);
- return mkv->reserve_cues_space < 0 ? AVERROR(EINVAL) : 0;
+ return ret2;
}
static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance)
if (mkv->mode == MODE_WEBM) {
av_log(s, AV_LOG_WARNING, "Stream %d will be ignored "
"as WebM doesn't support attachments.\n", i);
+ } else if (!get_mimetype(st)) {
+ av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype "
+ "tag and it cannot be deduced from the codec id.\n", i);
+ return AVERROR(EINVAL);
}
mkv->nb_attachments++;
continue;
projects / ffmpeg / blobdiff