#include "libavcodec/mpeg4audio.h"
/* Level 1 elements we create a SeekHead entry for:
- * Info, Tracks, Chapters, Attachments, Tags and Cues */
-#define MAX_SEEKHEAD_ENTRIES 6
+ * Info, Tracks, Chapters, Attachments, Tags (potentially twice) and Cues */
+#define MAX_SEEKHEAD_ENTRIES 7
+
+#define IS_SEEKABLE(pb, mkv) (((pb)->seekable & AVIO_SEEKABLE_NORMAL) && \
+ !(mkv)->is_live)
+
+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
} 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;
-
- 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;
+
+ int wrote_chapters;
+ int wrote_tags;
+
+ 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 flipped_raw_rgb;
+ int default_mode;
+
+ uint32_t segment_uid[4];
} MatroskaMuxContext;
/** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint,
{
av_assert0(bytes <= 8);
avio_w8(pb, 0x1ff >> bytes);
+ if (av_builtin_constant_p(bytes) && bytes == 1)
+ return;
ffio_fill(pb, 0xff, bytes - 1);
}
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);
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)
{
MatroskaMuxContext *mkv = s->priv_data;
- av_packet_unref(&mkv->cur_audio_pkt);
+ av_packet_free(&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);
put_ebml_uint(cuepoint, MATROSKA_ID_CUETRACK , tracks[idx].track_num);
put_ebml_uint(cuepoint, MATROSKA_ID_CUECLUSTERPOSITION , entry->cluster_pos);
put_ebml_uint(cuepoint, MATROSKA_ID_CUERELATIVEPOSITION, entry->relative_pos);
- if (entry->duration != -1)
+ if (entry->duration > 0)
put_ebml_uint(cuepoint, MATROSKA_ID_CUEDURATION , entry->duration);
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,
const uint8_t *header_start[3];
int header_len[3];
int first_header_size;
- int j;
+ int err, j;
if (par->codec_id == AV_CODEC_ID_VORBIS)
first_header_size = 30;
else
first_header_size = 42;
- if (avpriv_split_xiph_headers(par->extradata, par->extradata_size,
- first_header_size, header_start, header_len) < 0) {
+ err = avpriv_split_xiph_headers(par->extradata, par->extradata_size,
+ first_header_size, header_start, header_len);
+ if (err < 0) {
av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n");
- return -1;
+ return err;
}
avio_w8(pb, 2); // number packets - 1
return 0;
}
-static int put_flac_codecpriv(AVFormatContext *s,
- AVIOContext *pb, const AVCodecParameters *par)
+static int put_flac_codecpriv(AVFormatContext *s, AVIOContext *pb,
+ const AVCodecParameters *par)
{
int write_comment = (par->channel_layout &&
!(par->channel_layout & ~0x3ffffULL) &&
const char *vendor = (s->flags & AVFMT_FLAG_BITEXACT) ?
"Lavf" : LIBAVFORMAT_IDENT;
AVDictionary *dict = NULL;
- uint8_t buf[32], *data, *p;
+ uint8_t buf[32];
int64_t len;
snprintf(buf, sizeof(buf), "0x%"PRIx64, par->channel_layout);
av_dict_set(&dict, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0);
len = ff_vorbiscomment_length(dict, vendor, NULL, 0);
- if (len >= ((1<<24) - 4)) {
- av_dict_free(&dict);
- return AVERROR(EINVAL);
- }
+ av_assert1(len < (1 << 24) - 4);
- data = av_malloc(len + 4);
- if (!data) {
- av_dict_free(&dict);
- return AVERROR(ENOMEM);
- }
+ avio_w8(pb, 0x84);
+ avio_wb24(pb, len);
- data[0] = 0x84;
- AV_WB24(data + 1, len);
+ ff_vorbiscomment_write(pb, dict, vendor, NULL, 0);
- p = data + 4;
- ff_vorbiscomment_write(&p, &dict, vendor, NULL, 0);
-
- avio_write(pb, data, len + 4);
-
- av_freep(&data);
av_dict_free(&dict);
}
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);
int native_id, int qt_id)
{
AVIOContext *dyn_cp;
+ MatroskaMuxContext *mkv = s->priv_data;
uint8_t *codecpriv;
int ret, codecpriv_size;
ret = AVERROR(EINVAL);
}
- ff_put_bmp_header(dyn_cp, par, 0, 0);
+ ff_put_bmp_header(dyn_cp, par, 0, 0, mkv->flipped_raw_rgb);
}
} else if (par->codec_type == AVMEDIA_TYPE_AUDIO) {
unsigned int tag;
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;
- int side_data_size = 0;
- int ret, colorinfo_size;
- const uint8_t *side_data;
+ /* 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 colorinfo_size;
+ const void *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) {
}
side_data = av_stream_get_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
- &side_data_size);
- if (side_data_size) {
- const AVContentLightMetadata *metadata =
- (const AVContentLightMetadata*)side_data;
+ NULL);
+ if (side_data) {
+ const AVContentLightMetadata *metadata = side_data;
put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXCLL, metadata->MaxCLL);
put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXFALL, metadata->MaxFALL);
}
side_data = av_stream_get_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
- &side_data_size);
- if (side_data_size == sizeof(AVMasteringDisplayMetadata)) {
+ NULL);
+ if (side_data) {
ebml_master meta_element = start_ebml_master(
dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 10 * (2 + 1 + 8));
- const AVMasteringDisplayMetadata *metadata =
- (const AVMasteringDisplayMetadata*)side_data;
+ const AVMasteringDisplayMetadata *metadata = side_data;
if (metadata->has_primaries) {
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOCOLOR_RX,
av_q2d(metadata->display_primaries[0][0]));
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,
- const AVStream *st)
+static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
+ const AVStream *st)
{
ebml_master projection;
- int side_data_size = 0;
uint8_t private[20];
const AVSphericalMapping *spherical =
(const AVSphericalMapping *)av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL,
- &side_data_size);
+ NULL);
- if (!side_data_size)
- return 0;
+ if (!spherical)
+ return;
if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR &&
spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE &&
spherical->projection != AV_SPHERICAL_CUBEMAP) {
av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
- return 0;
+ return;
}
// Maximally 4 8-byte elements with id-length 2 + 1 byte length field
(double) spherical->roll / (1 << 16));
end_ebml_master(pb, projection);
-
- return 0;
}
static void mkv_write_field_order(AVIOContext *pb, int mode,
static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
AVStream *st, int mode, int *h_width, int *h_height)
{
- int i;
- int ret = 0;
const AVDictionaryEntry *tag;
MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
+ const AVStereo3D *stereo;
*h_width = 1;
*h_height = 1;
(tag = av_dict_get( s->metadata, "stereo_mode", NULL, 0))) {
int stereo_mode = atoi(tag->value);
- for (i=0; i<MATROSKA_VIDEO_STEREOMODE_TYPE_NB; i++)
+ for (int i = 0; i < MATROSKA_VIDEO_STEREOMODE_TYPE_NB; i++)
if (!strcmp(tag->value, ff_matroska_video_stereo_mode[i])){
stereo_mode = i;
break;
}
}
- // iterate to find the stereo3d side data
- for (i = 0; i < st->nb_side_data; i++) {
- AVPacketSideData sd = st->side_data[i];
- if (sd.type == AV_PKT_DATA_STEREO3D) {
- AVStereo3D *stereo = (AVStereo3D *)sd.data;
-
- switch (stereo->type) {
- case AV_STEREO3D_2D:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_MONO;
- break;
- case AV_STEREO3D_SIDEBYSIDE:
- format = (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- ? MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT
- : MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT;
- *h_width = 2;
- break;
- case AV_STEREO3D_TOPBOTTOM:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM;
- if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- format--;
- *h_height = 2;
- break;
- case AV_STEREO3D_CHECKERBOARD:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_LR;
- if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- format--;
- break;
- case AV_STEREO3D_LINES:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_LR;
- if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- format--;
- *h_height = 2;
- break;
- case AV_STEREO3D_COLUMNS:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_LR;
- if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- format--;
- *h_width = 2;
- break;
- case AV_STEREO3D_FRAMESEQUENCE:
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_LR;
- if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
- format++;
- break;
- }
+ stereo = (const AVStereo3D*)av_stream_get_side_data(st, AV_PKT_DATA_STEREO3D,
+ NULL);
+ if (stereo) {
+ switch (stereo->type) {
+ case AV_STEREO3D_2D:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_MONO;
+ break;
+ case AV_STEREO3D_SIDEBYSIDE:
+ format = (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ ? MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT
+ : MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT;
+ *h_width = 2;
+ break;
+ case AV_STEREO3D_TOPBOTTOM:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM;
+ if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ format--;
+ *h_height = 2;
+ break;
+ case AV_STEREO3D_CHECKERBOARD:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_LR;
+ if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ format--;
+ break;
+ case AV_STEREO3D_LINES:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_LR;
+ if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ format--;
+ *h_height = 2;
+ break;
+ case AV_STEREO3D_COLUMNS:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_LR;
+ if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ format--;
+ *h_width = 2;
+ break;
+ case AV_STEREO3D_FRAMESEQUENCE:
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_LR;
+ if (stereo->flags & AV_STEREO3D_FLAG_INVERT)
+ format++;
break;
}
}
if (format == MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
- return ret;
+ return 0;
// if webm, do not write unsupported modes
if ((mode == MODE_WEBM &&
|| format >= MATROSKA_VIDEO_STEREOMODE_TYPE_NB) {
av_log(s, AV_LOG_ERROR,
"The specified stereo mode is not valid.\n");
- format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
return AVERROR(EINVAL);
}
// write StereoMode if format is valid
put_ebml_uint(pb, MATROSKA_ID_VIDEOSTEREOMODE, format);
- return ret;
+ return 0;
}
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 j, ret;
const AVDictionaryEntry *tag;
- if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
+ 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,
- &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;
}
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);
tag = av_dict_get(st->metadata, "language", NULL, 0);
put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE,
- tag && tag->value ? tag->value : "und");
+ tag && tag->value[0] ? tag->value : "und");
// 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);
put_ebml_string(pb, MATROSKA_ID_CODECID, codec_id);
} else {
+ if (st->disposition & AV_DISPOSITION_COMMENT)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGCOMMENTARY, 1);
+ if (st->disposition & AV_DISPOSITION_HEARING_IMPAIRED)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGHEARINGIMPAIRED, 1);
+ if (st->disposition & AV_DISPOSITION_VISUAL_IMPAIRED)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGVISUALIMPAIRED, 1);
+ if (st->disposition & (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB) &&
+ (st->disposition & (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB))
+ != (AV_DISPOSITION_ORIGINAL | AV_DISPOSITION_DUB))
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGORIGINAL,
+ !!(st->disposition & AV_DISPOSITION_ORIGINAL));
+
// look for a codec ID string specific to mkv to use,
// if none are found, use AVI codes
if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) {
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;
- ret = mkv_write_video_projection(s, pb, st);
- if (ret < 0)
- return ret;
+ mkv_write_video_color(pb, st, par);
+ mkv_write_video_projection(s, pb, st);
+
end_ebml_master(pb, subinfo);
break;
av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", par->codec_id);
return AVERROR(ENOSYS);
}
+ if (mkv->mode != MODE_WEBM && st->disposition & AV_DISPOSITION_DESCRIPTIONS)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGTEXTDESCRIPTIONS, 1);
if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT)
native_id = MATROSKA_TRACK_TYPE_SUBTITLE;
{
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));
-
- ret = start_ebml_master_crc32(&mkv->tracks_bc, mkv);
+ ret = start_ebml_master_crc32(&mkv->track.bc, mkv);
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->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;
-}
-
-static int mkv_write_chapters(AVFormatContext *s)
-{
- MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *dyn_cp = NULL, *pb = s->pb;
- ebml_master editionentry;
- AVRational scale = {1, 1E9};
- int i, ret;
-
- if (!s->nb_chapters || mkv->wrote_chapters)
- return 0;
-
- mkv_add_seekhead_entry(mkv, MATROSKA_ID_CHAPTERS, avio_tell(pb));
-
- ret = start_ebml_master_crc32(&dyn_cp, mkv);
- if (ret < 0) return ret;
-
- editionentry = start_ebml_master(dyn_cp, MATROSKA_ID_EDITIONENTRY, 0);
- 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;
- 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);
- const AVDictionaryEntry *t;
- if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
- av_log(s, AV_LOG_ERROR,
- "Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
- chapterstart, chapterend);
- return AVERROR_INVALIDDATA;
- }
-
- chapteratom = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERATOM, 0);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERUID,
- (uint32_t)c->id + (uint64_t)mkv->chapter_id_offset);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
- if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
- chapterdisplay = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERDISPLAY, 0);
- put_ebml_string(dyn_cp, MATROSKA_ID_CHAPSTRING, t->value);
- put_ebml_string(dyn_cp, MATROSKA_ID_CHAPLANG , "und");
- end_ebml_master(dyn_cp, chapterdisplay);
- }
- 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_tentatively(pb, &mkv->track, mkv,
+ MATROSKA_ID_TRACKS);
}
static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t)
return 0;
}
-static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid,
- uint64_t uid, ebml_master *tag)
+static int mkv_write_tag_targets(MatroskaMuxContext *mkv, AVIOContext **pb,
+ ebml_master *tag, uint32_t elementid, uint64_t uid)
{
- AVIOContext *pb;
- MatroskaMuxContext *mkv = s->priv_data;
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 (!*pb) {
+ ret = start_ebml_master_crc32(pb, mkv);
if (ret < 0)
return ret;
}
- pb = mkv->tags_bc;
- *tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0);
- targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 4 + 1 + 8);
+ *tag = start_ebml_master(*pb, MATROSKA_ID_TAG, 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);
+ put_ebml_uid(*pb, elementid, uid);
+ end_ebml_master(*pb, targets);
return 0;
}
av_strcasecmp(name, "mimetype")));
}
-static int mkv_write_tag(AVFormatContext *s, const AVDictionary *m, uint32_t elementid,
- uint64_t uid, ebml_master *tag)
+static int mkv_write_tag(MatroskaMuxContext *mkv, const AVDictionary *m,
+ AVIOContext **pb, ebml_master *tag,
+ uint32_t elementid, uint64_t uid)
{
- MatroskaMuxContext *mkv = s->priv_data;
const AVDictionaryEntry *t = NULL;
ebml_master tag2;
int ret;
- ret = mkv_write_tag_targets(s, elementid, uid, tag ? tag : &tag2);
+ ret = mkv_write_tag_targets(mkv, pb, tag ? tag : &tag2, elementid, uid);
if (ret < 0)
return ret;
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(*pb, t);
if (ret < 0)
return ret;
}
}
if (!tag)
- end_ebml_master(mkv->tags_bc, tag2);
+ end_ebml_master(*pb, 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;
+ mkv->wrote_tags = 1;
+
ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
if (mkv_check_tag(s->metadata, 0)) {
- ret = mkv_write_tag(s, s->metadata, 0, 0, NULL);
- if (ret < 0) return ret;
+ ret = mkv_write_tag(mkv, s->metadata, &mkv->tags.bc, NULL, 0, 0);
+ 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++) {
const AVStream *st = s->streams[i];
mkv_track *track = &mkv->tracks[i];
if (!tagp && !mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID))
continue;
- ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID,
- track->uid, tagp);
- if (ret < 0) return ret;
+ ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, tagp,
+ MATROSKA_ID_TAGTARGETS_TRACKUID, track->uid);
+ if (ret < 0)
+ 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,
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->mode != MODE_WEBM) {
- for (i = 0; i < s->nb_chapters; i++) {
- AVChapter *ch = s->chapters[i];
-
- if (!mkv_check_tag(ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID))
- continue;
-
- ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID,
- (uint32_t)ch->id + (uint64_t)mkv->chapter_id_offset,
- NULL);
- if (ret < 0)
- return ret;
- }
- }
-
if (mkv->nb_attachments && mkv->mode != MODE_WEBM) {
for (i = 0; i < s->nb_streams; i++) {
const mkv_track *track = &mkv->tracks[i];
if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID))
continue;
- ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID,
- track->uid, NULL);
+ ret = mkv_write_tag(mkv, st->metadata, &mkv->tags.bc, NULL,
+ MATROSKA_ID_TAGTARGETS_ATTACHUID, track->uid);
if (ret < 0)
return ret;
}
}
- 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 int mkv_new_chapter_ids_needed(const AVFormatContext *s)
+{
+ for (unsigned i = 0; i < s->nb_chapters; i++) {
+ if (!s->chapters[i]->id)
+ return 1;
+ for (unsigned j = 0; j < i; j++)
+ if (s->chapters[j]->id == s->chapters[i]->id)
+ return 1;
+ }
+ return 0;
+}
+
+static int mkv_write_chapters(AVFormatContext *s)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+ AVIOContext *dyn_cp = NULL, *dyn_tags = NULL, **tags, *pb = s->pb;
+ ebml_master editionentry;
+ AVRational scale = {1, 1E9};
+ int ret, create_new_ids;
+
+ if (!s->nb_chapters || mkv->wrote_chapters)
+ return 0;
+
+ ret = start_ebml_master_crc32(&dyn_cp, mkv);
+ if (ret < 0)
+ return ret;
+
+ editionentry = start_ebml_master(dyn_cp, MATROSKA_ID_EDITIONENTRY, 0);
+ if (mkv->mode != MODE_WEBM) {
+ put_ebml_uint(dyn_cp, MATROSKA_ID_EDITIONFLAGDEFAULT, 1);
+ /* If mkv_write_tags() has already been called, then any tags
+ * corresponding to chapters will be put into a new Tags element. */
+ tags = mkv->wrote_tags ? &dyn_tags : &mkv->tags.bc;
+ } else
+ tags = NULL;
+
+ create_new_ids = mkv_new_chapter_ids_needed(s);
+
+ for (unsigned i = 0; i < s->nb_chapters; i++) {
+ ebml_master chapteratom, chapterdisplay;
+ 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);
+ const AVDictionaryEntry *t;
+ uint64_t uid = create_new_ids ? i + 1ULL : c->id;
+ if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) {
+ av_log(s, AV_LOG_ERROR,
+ "Invalid chapter start (%"PRId64") or end (%"PRId64").\n",
+ chapterstart, chapterend);
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ chapteratom = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERATOM, 0);
+ put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERUID, uid);
+ put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
+ put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
+ if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
+ chapterdisplay = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERDISPLAY, 0);
+ put_ebml_string(dyn_cp, MATROSKA_ID_CHAPSTRING, t->value);
+ put_ebml_string(dyn_cp, MATROSKA_ID_CHAPLANG , "und");
+ end_ebml_master(dyn_cp, chapterdisplay);
+ }
+ end_ebml_master(dyn_cp, chapteratom);
+
+ if (tags && mkv_check_tag(c->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID)) {
+ ret = mkv_write_tag(mkv, c->metadata, tags, NULL,
+ MATROSKA_ID_TAGTARGETS_CHAPTERUID, uid);
+ if (ret < 0)
+ goto fail;
+ }
+ }
+ end_ebml_master(dyn_cp, editionentry);
+ mkv->wrote_chapters = 1;
+
+ ret = end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_CHAPTERS, 0, 0, 1);
+ if (ret < 0)
+ goto fail;
+ if (dyn_tags)
+ return end_ebml_master_crc32(pb, &dyn_tags, mkv,
+ MATROSKA_ID_TAGS, 0, 0, 1);
+ return 0;
+
+fail:
+ if (tags) {
+ /* tags == &mkv->tags.bc can only happen if mkv->tags.bc was
+ * initially NULL, so we never free older tags. */
+ ffio_free_dyn_buf(tags);
+ }
+ ffio_free_dyn_buf(&dyn_cp);
+ return ret;
+}
+
+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;
+ if (ret < 0)
+ return ret;
for (i = 0; i < s->nb_streams; i++) {
const AVStream *st = s->streams[i];
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;
put_ebml_string(dyn_cp, MATROSKA_ID_FILEDESC, t->value);
if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) {
av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i);
+ ffio_free_dyn_buf(&dyn_cp);
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)
{
- int i = 0;
+ const AVDictionaryEntry *duration = av_dict_get(s->metadata, "DURATION",
+ NULL, 0);
int64_t max = 0;
int64_t us;
- const 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;
- const 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);
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)))
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);
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() to write chapter tags
+ * into the same Tags element as the other tags. */
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);
- mkv->cur_audio_pkt.size = 0;
mkv->cluster_pos = -1;
// 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)
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
mkv_track *track = &mkv->tracks[pkt->stream_index];
uint8_t *data = NULL, *side_data = NULL;
- int err = 0, offset = 0, size = pkt->size, side_data_size = 0;
+ size_t side_data_size;
+ int err = 0, offset = 0, size = pkt->size;
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
uint64_t additional_id;
int64_t discard_padding = 0;
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;
}
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;
+ size_t id_size, settings_size;
+ int size, id_size_int, settings_size_int;
+ const char *id, *settings;
+ int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
const int flags = 0;
- id_size = 0;
id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,
&id_size);
+ id = id ? id : "";
- settings_size = 0;
settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS,
&settings_size);
+ settings = settings ? settings : "";
+
+ if (id_size > INT_MAX - 2 || settings_size > INT_MAX - id_size - 2 ||
+ pkt->size > INT_MAX - settings_size - id_size - 2)
+ return AVERROR(EINVAL);
size = id_size + 1 + settings_size + 1 + pkt->size;
put_ebml_num(pb, track->track_num, track->track_num_size);
avio_wb16(pb, ts - mkv->cluster_pts);
avio_w8(pb, flags);
- avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size, id, settings_size, settings, pkt->size, pkt->data);
+
+ id_size_int = id_size;
+ settings_size_int = settings_size;
+ avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size_int, id, settings_size_int, settings, pkt->size, pkt->data);
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, pkt->duration);
end_ebml_master(pb, blockgroup);
- return pkt->duration;
+ return 0;
}
-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)
mkv_track *track = &mkv->tracks[pkt->stream_index];
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
uint8_t *side_data;
- int side_data_size = 0, ret;
+ size_t side_data_size;
+ int ret;
side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,
&side_data_size);
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) {
- AVCodecParameters *codecpriv_par;
+ 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",
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);
- 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);
+ par->extradata = side_data;
+ 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;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
mkv_track *track = &mkv->tracks[pkt->stream_index];
int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
- int duration = pkt->duration;
+ int64_t duration = pkt->duration;
int ret;
int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
int64_t relative_packet_pos;
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");
}
}
relative_packet_pos = avio_tell(pb);
- if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) {
+ if (par->codec_type != AVMEDIA_TYPE_SUBTITLE ||
+ (par->codec_id != AV_CODEC_ID_WEBVTT && duration <= 0)) {
ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
if (ret < 0)
return ret;
- if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && keyframe &&
- (par->codec_type == AVMEDIA_TYPE_VIDEO || !mkv->have_video && !track->has_cue)) {
+ if (keyframe && IS_SEEKABLE(s->pb, mkv) &&
+ (par->codec_type == AVMEDIA_TYPE_VIDEO ||
+ par->codec_type == AVMEDIA_TYPE_SUBTITLE ||
+ !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;
+ mkv->cluster_pos, relative_packet_pos, 0);
+ if (ret < 0)
+ return ret;
track->has_cue = 1;
}
} else {
if (par->codec_id == AV_CODEC_ID_WEBVTT) {
- duration = mkv_write_vtt_blocks(s, pb, pkt);
+ ret = mkv_write_vtt_blocks(s, pb, pkt);
+ if (ret < 0)
+ return ret;
} else {
ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
mkv_blockgroup_size(pkt->size,
track->track_num_size));
-#if FF_API_CONVERGENCE_DURATION
-FF_DISABLE_DEPRECATION_WARNINGS
- /* For backward compatibility, prefer convergence_duration. */
- if (pkt->convergence_duration > 0) {
- duration = pkt->convergence_duration;
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
/* All subtitle blocks are considered to be keyframes. */
mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 1);
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
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)
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) {
+ ret = mkv_end_cluster(s);
+ if (ret < 0)
+ return ret;
+ }
}
if (!mkv->cluster_pos)
keyframe && (mkv->have_video ? codec_type == AVMEDIA_TYPE_VIDEO : 1) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT);
// check if we have an audio packet cached
- if (mkv->cur_audio_pkt.size > 0) {
- ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
- av_packet_unref(&mkv->cur_audio_pkt);
+ if (mkv->cur_audio_pkt->size > 0) {
+ ret = mkv_write_packet_internal(s, mkv->cur_audio_pkt);
+ av_packet_unref(mkv->cur_audio_pkt);
if (ret < 0) {
av_log(s, AV_LOG_ERROR,
"Could not write cached audio packet ret:%d\n", ret);
// keyframe's timecode is contained in the same cluster for WebM
if (codec_type == AVMEDIA_TYPE_AUDIO) {
if (pkt->size > 0)
- ret = av_packet_ref(&mkv->cur_audio_pkt, pkt);
+ ret = av_packet_ref(mkv->cur_audio_pkt, pkt);
} else
ret = mkv_write_packet_internal(s, pkt);
return ret;
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) {
- ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
+ if (mkv->cur_audio_pkt->size > 0) {
+ ret = mkv_write_packet_internal(s, mkv->cur_audio_pkt);
if (ret < 0) {
av_log(s, AV_LOG_ERROR,
"Could not write cached audio packet ret:%d\n", ret);
}
}
- if (mkv->cluster_bc) {
- end_ebml_master_crc32(pb, &mkv->cluster_bc, mkv,
- MATROSKA_ID_CLUSTER, 0, 0);
+ if (mkv->cluster_pos != -1) {
+ 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;
+ }
+
+ 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;
+ }
- // 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];
+ // 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 (track->duration_offset > 0) {
- double duration_sec = track->duration * av_q2d(st->time_base);
- char duration_string[20] = "";
+ if (track->duration_offset > 0) {
+ double duration_sec = track->duration * av_q2d(st->time_base);
+ char duration_string[20] = "";
- av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i,
- track->duration);
+ av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i,
+ track->duration);
- avio_seek(mkv->tags_bc, track->duration_offset, SEEK_SET);
+ avio_seek(mkv->tags.bc, track->duration_offset, SEEK_SET);
- snprintf(duration_string, 20, "%02d:%02d:%012.9f",
- (int) duration_sec / 3600, ((int) duration_sec / 60) % 60,
- fmod(duration_sec, 60));
+ snprintf(duration_string, 20, "%02d:%02d:%012.9f",
+ (int) duration_sec / 3600, ((int) duration_sec / 60) % 60,
+ fmod(duration_sec, 60));
- put_ebml_binary(mkv->tags_bc, MATROSKA_ID_TAGSTRING, duration_string, 20);
- }
+ put_ebml_binary(mkv->tags.bc, MATROSKA_ID_TAGSTRING, duration_string, 20);
}
-
- avio_seek(pb, mkv->tags_pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0, 0);
}
- 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)
} else
mkv->mode = MODE_MATROSKAv2;
+ mkv->cur_audio_pkt = av_packet_alloc();
+ if (!mkv->cur_audio_pkt)
+ return AVERROR(ENOMEM);
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 (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;
{ "dash_track_number", "Track number for the DASH stream", OFFSET(dash_track_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, INT_MAX, FLAGS },
{ "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 },
+ { "flipped_raw_rgb", "Raw RGB bitmaps in VFW mode are stored bottom-up", OFFSET(flipped_raw_rgb), 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