#include "libavutil/opt.h"
#include "libavutil/random_seed.h"
#include "libavutil/samplefmt.h"
+#include "libavutil/stereo3d.h"
#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
int num_entries;
} mkv_seekhead;
-typedef struct {
+typedef struct mkv_cuepoint {
uint64_t pts;
int tracknum;
int64_t cluster_pos; ///< file offset of the cluster containing the block
} mkv_cuepoint;
-typedef struct {
+typedef struct mkv_cues {
int64_t segment_offset;
mkv_cuepoint *entries;
int num_entries;
} mkv_cues;
-typedef struct {
+typedef struct mkv_track {
int write_dts;
int64_t ts_offset;
} mkv_track;
int numelements)
{
mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
- if (new_seekhead == NULL)
+ if (!new_seekhead)
return NULL;
new_seekhead->segment_offset = segment_offset;
static mkv_cues *mkv_start_cues(int64_t segment_offset)
{
mkv_cues *cues = av_mallocz(sizeof(mkv_cues));
- if (cues == NULL)
+ if (!cues)
return NULL;
cues->segment_offset = segment_offset;
return 0;
}
-static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec,
- int *sample_rate, int *output_sample_rate)
+static int get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec,
+ int *sample_rate, int *output_sample_rate)
{
MPEG4AudioConfig mp4ac;
if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata,
codec->extradata_size * 8, 1) < 0) {
- av_log(s, AV_LOG_WARNING,
+ av_log(s, AV_LOG_ERROR,
"Error parsing AAC extradata, unable to determine samplerate.\n");
- return;
+ return AVERROR(EINVAL);
}
*sample_rate = mp4ac.sample_rate;
*output_sample_rate = mp4ac.ext_sample_rate;
+ return 0;
+}
+
+static int mkv_write_native_codecprivate(AVFormatContext *s,
+ AVCodecContext *codec,
+ AVIOContext *dyn_cp)
+{
+ switch (codec->codec_id) {
+ case AV_CODEC_ID_VORBIS:
+ case AV_CODEC_ID_THEORA:
+ return put_xiph_codecpriv(s, dyn_cp, codec);
+ case AV_CODEC_ID_FLAC:
+ return put_flac_codecpriv(s, dyn_cp, codec);
+ case AV_CODEC_ID_WAVPACK:
+ return put_wv_codecpriv(dyn_cp, codec);
+ case AV_CODEC_ID_H264:
+ return ff_isom_write_avcc(dyn_cp, codec->extradata,
+ codec->extradata_size);
+ case AV_CODEC_ID_HEVC:
+ return ff_isom_write_hvcc(dyn_cp, codec->extradata,
+ codec->extradata_size, 0);
+ case AV_CODEC_ID_ALAC:
+ if (codec->extradata_size < 36) {
+ av_log(s, AV_LOG_ERROR,
+ "Invalid extradata found, ALAC expects a 36-byte "
+ "QuickTime atom.");
+ return AVERROR_INVALIDDATA;
+ } else
+ avio_write(dyn_cp, codec->extradata + 12,
+ codec->extradata_size - 12);
+ break;
+ default:
+ if (codec->extradata_size)
+ avio_write(dyn_cp, codec->extradata, codec->extradata_size);
+ }
+
+ return 0;
}
static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
return ret;
if (native_id) {
- if (codec->codec_id == AV_CODEC_ID_VORBIS ||
- codec->codec_id == AV_CODEC_ID_THEORA)
- ret = put_xiph_codecpriv(s, dyn_cp, codec);
- else if (codec->codec_id == AV_CODEC_ID_FLAC)
- ret = put_flac_codecpriv(s, dyn_cp, codec);
- else if (codec->codec_id == AV_CODEC_ID_WAVPACK)
- ret = put_wv_codecpriv(dyn_cp, codec);
- else if (codec->codec_id == AV_CODEC_ID_H264)
- ret = ff_isom_write_avcc(dyn_cp, codec->extradata,
- codec->extradata_size);
- else if (codec->codec_id == AV_CODEC_ID_HEVC)
- ret = ff_isom_write_hvcc(dyn_cp, codec->extradata,
- codec->extradata_size, 0);
- else if (codec->codec_id == AV_CODEC_ID_ALAC) {
- if (codec->extradata_size < 36) {
- av_log(s, AV_LOG_ERROR,
- "Invalid extradata found, ALAC expects a 36-byte "
- "QuickTime atom.");
- ret = AVERROR_INVALIDDATA;
- } else
- avio_write(dyn_cp, codec->extradata + 12,
- codec->extradata_size - 12);
- } else if (codec->extradata_size)
- avio_write(dyn_cp, codec->extradata, codec->extradata_size);
+ ret = mkv_write_native_codecprivate(s, codec, dyn_cp);
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (qt_id) {
if (!codec->codec_tag)
return ret;
}
-static int mkv_write_tracks(AVFormatContext *s)
+static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
+ AVStream *st, int mode)
{
- MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb;
- ebml_master tracks;
- int i, j, ret;
+ int i;
+ int display_width, display_height;
+ int h_width = 1, h_height = 1;
+ AVCodecContext *codec = st->codec;
+ AVDictionaryEntry *tag;
+ MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
+
+ // convert metadata into proper side data and add it to the stream
+ if ((tag = av_dict_get(s->metadata, "stereo_mode", NULL, 0))) {
+ int stereo_mode = atoi(tag->value);
+ if (stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB &&
+ stereo_mode != 10 && stereo_mode != 12) {
+ int ret = ff_mkv_stereo3d_conv(st, stereo_mode);
+ if (ret < 0)
+ return ret;
+ }
+ }
- ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, avio_tell(pb));
- if (ret < 0)
- return ret;
+ // 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;
- tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0);
- for (i = 0; i < s->nb_streams; i++) {
- AVStream *st = s->streams[i];
- AVCodecContext *codec = st->codec;
- ebml_master subinfo, track;
- int native_id = 0;
- int qt_id = 0;
- int bit_depth = av_get_bits_per_sample(codec->codec_id);
- int sample_rate = codec->sample_rate;
- int output_sample_rate = 0;
- AVDictionaryEntry *tag;
-
- // ms precision is the de-facto standard timescale for mkv files
- avpriv_set_pts_info(st, 64, 1, 1000);
-
- if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
- mkv->have_attachments = 1;
- continue;
+ 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;
+ }
+
+ break;
}
+ }
- if (!bit_depth)
- bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
+ // if webm, do not write unsupported modes
+ if (mode == MODE_WEBM &&
+ (format > MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM &&
+ format != MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT))
+ format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
+
+ // write StereoMode if format is valid
+ if (format < MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOSTEREOMODE, format);
+
+ // write DisplayWidth and DisplayHeight, they contain the size of
+ // a single source view and/or the display aspect ratio
+ display_width = codec->width / h_width;
+ display_height = codec->height / h_height;
+ if (st->sample_aspect_ratio.num) {
+ display_width *= av_q2d(st->sample_aspect_ratio);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, 3); // DAR
+ }
+ if (st->sample_aspect_ratio.num ||
+ format < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) {
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH, display_width);
+ put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, display_height);
+ }
- if (codec->codec_id == AV_CODEC_ID_AAC)
- get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate);
+ return 0;
+}
- track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
- put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
- put_ebml_uint (pb, MATROSKA_ID_TRACKUID , i + 1);
- put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
+static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
+ int i, AVIOContext *pb)
+{
+ AVStream *st = s->streams[i];
+ AVCodecContext *codec = st->codec;
+ ebml_master subinfo, track;
+ int native_id = 0;
+ int qt_id = 0;
+ int bit_depth = av_get_bits_per_sample(codec->codec_id);
+ int sample_rate = codec->sample_rate;
+ int output_sample_rate = 0;
+ int j, ret;
+ AVDictionaryEntry *tag;
- 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:"und");
+ // ms precision is the de-facto standard timescale for mkv files
+ avpriv_set_pts_info(st, 64, 1, 1000);
- // The default value for TRACKFLAGDEFAULT is 1, so add element
- // if we need to clear it.
- if (!(st->disposition & AV_DISPOSITION_DEFAULT))
- put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
+ if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
+ mkv->have_attachments = 1;
+ return 0;
+ }
+
+ if (!bit_depth)
+ bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
+
+ if (codec->codec_id == AV_CODEC_ID_AAC) {
+ ret = get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate);
+ if (ret < 0)
+ return ret;
+ }
- if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->delay) {
- mkv->tracks[i].ts_offset = av_rescale_q(codec->delay,
- (AVRational){ 1, codec->sample_rate },
- st->time_base);
+ track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
+ put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
+ put_ebml_uint (pb, MATROSKA_ID_TRACKUID , i + 1);
+ 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:"und");
+
+ // The default value for TRACKFLAGDEFAULT is 1, so add element
+ // if we need to clear it.
+ if (!(st->disposition & AV_DISPOSITION_DEFAULT))
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
+ if (st->disposition & AV_DISPOSITION_FORCED)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGFORCED, !!(st->disposition & AV_DISPOSITION_FORCED));
+
+ if (codec->codec_type == AVMEDIA_TYPE_AUDIO && codec->initial_padding) {
+ mkv->tracks[i].ts_offset = av_rescale_q(codec->initial_padding,
+ (AVRational){ 1, codec->sample_rate },
+ st->time_base);
+
+ put_ebml_uint(pb, MATROSKA_ID_CODECDELAY,
+ av_rescale_q(codec->initial_padding,
+ (AVRational){ 1, codec->sample_rate },
+ (AVRational){ 1, 1000000000 }));
+ }
- put_ebml_uint(pb, MATROSKA_ID_CODECDELAY,
- av_rescale_q(codec->delay, (AVRational){ 1, codec->sample_rate },
- (AVRational){ 1, 1000000000 }));
+ // look for a codec ID string specific to mkv to use,
+ // if none are found, use AVI codes
+ for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) {
+ if (ff_mkv_codec_tags[j].id == codec->codec_id) {
+ put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
+ native_id = 1;
+ break;
}
+ }
- // look for a codec ID string specific to mkv to use,
- // if none are found, use AVI codes
- for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) {
- if (ff_mkv_codec_tags[j].id == codec->codec_id) {
- put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
- native_id = 1;
- break;
- }
+ if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 ||
+ codec->codec_id == AV_CODEC_ID_VP9 ||
+ codec->codec_id == AV_CODEC_ID_OPUS ||
+ codec->codec_id == AV_CODEC_ID_VORBIS)) {
+ av_log(s, AV_LOG_ERROR,
+ "Only VP8 or VP9 video and Vorbis or Opus audio are supported for WebM.\n");
+ return AVERROR(EINVAL);
+ }
+
+ switch (codec->codec_type) {
+ case AVMEDIA_TYPE_VIDEO:
+ put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
+ if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1E9 / av_q2d(st->avg_frame_rate));
+
+ if (!native_id &&
+ ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
+ (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id) ||
+ codec->codec_id == AV_CODEC_ID_SVQ1 ||
+ codec->codec_id == AV_CODEC_ID_SVQ3 ||
+ codec->codec_id == AV_CODEC_ID_CINEPAK))
+ qt_id = 1;
+
+ if (qt_id)
+ put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
+ else if (!native_id) {
+ // if there is no mkv-specific codec ID, use VFW mode
+ put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
+ mkv->tracks[i].write_dts = 1;
}
- if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 ||
- codec->codec_id == AV_CODEC_ID_VP9 ||
- codec->codec_id == AV_CODEC_ID_OPUS ||
- codec->codec_id == AV_CODEC_ID_VORBIS)) {
- av_log(s, AV_LOG_ERROR,
- "Only VP8 or VP9 video and Vorbis or Opus audio are supported for WebM.\n");
- return AVERROR(EINVAL);
+ subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
+ // XXX: interlace flag?
+ put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
+ put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
+
+ // check both side data and metadata for stereo information,
+ // write the result to the bitstream if any is found
+ ret = mkv_write_stereo_mode(s, pb, st, mkv->mode);
+ if (ret < 0)
+ return ret;
+
+ end_ebml_master(pb, subinfo);
+ break;
+
+ case AVMEDIA_TYPE_AUDIO:
+ put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
+
+ if (!native_id)
+ // no mkv-specific ID, use ACM mode
+ put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
+
+ subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
+ put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels);
+ put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);
+ if (output_sample_rate)
+ put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
+ if (bit_depth)
+ put_ebml_uint(pb, MATROSKA_ID_AUDIOBITDEPTH, bit_depth);
+ end_ebml_master(pb, subinfo);
+ break;
+
+ case AVMEDIA_TYPE_SUBTITLE:
+ put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE);
+ if (!native_id) {
+ av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", codec->codec_id);
+ return AVERROR(ENOSYS);
}
+ break;
+ default:
+ av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");
+ break;
+ }
+ ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id);
+ if (ret < 0)
+ return ret;
- switch (codec->codec_type) {
- case AVMEDIA_TYPE_VIDEO:
- put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
- if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0)
- put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1E9 / av_q2d(st->avg_frame_rate));
-
- if (!native_id &&
- ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
- (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id) ||
- codec->codec_id == AV_CODEC_ID_SVQ1 ||
- codec->codec_id == AV_CODEC_ID_SVQ3 ||
- codec->codec_id == AV_CODEC_ID_CINEPAK))
- qt_id = 1;
-
- if (qt_id)
- put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
- else if (!native_id) {
- // if there is no mkv-specific codec ID, use VFW mode
- put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
- mkv->tracks[i].write_dts = 1;
- }
+ end_ebml_master(pb, track);
- subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
- // XXX: interlace flag?
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
- put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
- if ((tag = av_dict_get(s->metadata, "stereo_mode", NULL, 0))) {
- uint8_t stereo_fmt = atoi(tag->value);
- int valid_fmt = 0;
-
- switch (mkv->mode) {
- case MODE_WEBM:
- if (stereo_fmt <= MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM ||
- stereo_fmt == MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT)
- valid_fmt = 1;
- break;
- case MODE_MATROSKAv2:
- if (stereo_fmt <= MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_RL)
- valid_fmt = 1;
- break;
- }
+ return 0;
+}
- if (valid_fmt)
- put_ebml_uint (pb, MATROSKA_ID_VIDEOSTEREOMODE, stereo_fmt);
- }
- if (st->sample_aspect_ratio.num) {
- int d_width = codec->width*av_q2d(st->sample_aspect_ratio);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height);
- put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, 3);
- }
- end_ebml_master(pb, subinfo);
- break;
+static int mkv_write_tracks(AVFormatContext *s)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+ AVIOContext *pb = s->pb;
+ ebml_master tracks;
+ int i, ret;
- case AVMEDIA_TYPE_AUDIO:
- put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
-
- if (!native_id)
- // no mkv-specific ID, use ACM mode
- put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
-
- subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
- put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels);
- put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);
- if (output_sample_rate)
- put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
- if (bit_depth)
- put_ebml_uint(pb, MATROSKA_ID_AUDIOBITDEPTH, bit_depth);
- end_ebml_master(pb, subinfo);
- break;
+ ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, avio_tell(pb));
+ if (ret < 0)
+ return ret;
- case AVMEDIA_TYPE_SUBTITLE:
- put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE);
- if (!native_id) {
- av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", codec->codec_id);
- return AVERROR(ENOSYS);
- }
- break;
- default:
- av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");
- break;
- }
- ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id);
+ tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0);
+ for (i = 0; i < s->nb_streams; i++) {
+ ret = mkv_write_track(s, mkv, i, pb);
if (ret < 0)
return ret;
-
- end_ebml_master(pb, track);
}
end_ebml_master(pb, tracks);
return 0;
for (i = 0; i < s->nb_chapters; i++) {
ebml_master chapteratom, chapterdisplay;
AVChapter *c = s->chapters[i];
+ int chapterstart = av_rescale_q(c->start, c->time_base, scale);
+ int chapterend = av_rescale_q(c->end, c->time_base, scale);
AVDictionaryEntry *t = NULL;
+ if (chapterstart < 0 || chapterstart > chapterend)
+ return AVERROR_INVALIDDATA;
chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0);
put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id);
- put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART,
- av_rescale_q(c->start, c->time_base, scale));
- put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND,
- av_rescale_q(c->end, c->time_base, scale));
+ put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
+ put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGHIDDEN , 0);
put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1);
if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
return 0;
}
-static void mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t)
+static int mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t)
{
uint8_t *key = av_strdup(t->key);
uint8_t *p = key;
const uint8_t *lang = NULL;
ebml_master tag;
+ if (!key)
+ return AVERROR(ENOMEM);
+
if ((p = strrchr(p, '-')) &&
(lang = av_convert_lang_to(p + 1, AV_LANG_ISO639_2_BIBL)))
*p = 0;
end_ebml_master(pb, tag);
av_freep(&key);
+ return 0;
}
static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid,
put_ebml_uint(s->pb, elementid, uid);
end_ebml_master(s->pb, targets);
- while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
+ while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) {
if (av_strcasecmp(t->key, "title") &&
- av_strcasecmp(t->key, "encoding_tool"))
- mkv_write_simpletag(s->pb, t);
+ av_strcasecmp(t->key, "encoding_tool")) {
+ ret = mkv_write_simpletag(s->pb, t);
+ if (ret < 0)
+ return ret;
+ }
+ }
end_ebml_master(s->pb, tag);
return 0;
mkv_write_seekhead(pb, mkv->main_seekhead);
mkv->cues = mkv_start_cues(mkv->segment_offset);
- if (mkv->cues == NULL)
+ if (!mkv->cues)
return AVERROR(ENOMEM);
if (pb->seekable && mkv->reserve_cues_space) {
return size;
}
-static int ass_get_duration(const uint8_t *p)
+static int ass_get_duration(AVFormatContext *s, const uint8_t *p)
{
int sh, sm, ss, sc, eh, em, es, ec;
uint64_t start, end;
if (sscanf(p, "%*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d",
&sh, &sm, &ss, &sc, &eh, &em, &es, &ec) != 8)
return 0;
+
+ if (sh > 9 || sm > 59 || ss > 59 || sc > 99 ||
+ eh > 9 || em > 59 || es > 59 || ec > 99) {
+ av_log(s, AV_LOG_WARNING,
+ "Non-standard time reference %d:%d:%d.%d,%d:%d:%d.%d\n",
+ sh, sm, ss, sc, eh, em, es, ec);
+ return 0;
+ }
+
start = 3600000 * sh + 60000 * sm + 1000 * ss + 10 * sc;
end = 3600000 * eh + 60000 * em + 1000 * es + 10 * ec;
+
+ if (start > end) {
+ av_log(s, AV_LOG_WARNING,
+ "Unexpected time reference %d:%d:%d.%d,%d:%d:%d.%d\n",
+ sh, sm, ss, sc, eh, em, es, ec);
+ return 0;
+ }
+
return end - start;
}
char buffer[2048];
while (data_size) {
- int duration = ass_get_duration(data);
+ int duration = ass_get_duration(s, data);
max_duration = FFMAX(duration, max_duration);
end = memchr(data, '\n', data_size);
size = line_size = end ? end - data + 1 : data_size;
ts += mkv->tracks[pkt->stream_index].ts_offset;
if (!s->pb->seekable) {
- if (!mkv->dyn_bc)
- avio_open_dyn_buf(&mkv->dyn_bc);
+ if (!mkv->dyn_bc) {
+ ret = avio_open_dyn_buf(&mkv->dyn_bc);
+ if (ret < 0)
+ return ret;
+ }
pb = mkv->dyn_bc;
}
projects / ffmpeg / blobdiff