X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmatroskaenc.c;h=a8f99bf4f72689a764560b2ff20eda78c4188970;hb=5af41508310b856b1e5ca605e50e956bf81eeef9;hp=2c1f542e1fd665257016e45d7a3200c6b9e97299;hpb=2024c2262b16acdb7fec850766ad06bd494355f7;p=ffmpeg diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 2c1f542e1fd..a8f99bf4f72 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -20,14 +20,18 @@ */ #include "avformat.h" -#include "md5.h" #include "riff.h" -#include "xiph.h" +#include "isom.h" #include "matroska.h" #include "avc.h" +#include "flacenc.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/md5.h" +#include "libavcodec/xiph.h" +#include "libavcodec/mpeg4audio.h" typedef struct ebml_master { - offset_t pos; ///< absolute offset in the file where the master's elements start + int64_t pos; ///< absolute offset in the file where the master's elements start int sizebytes; ///< how many bytes were reserved for the size } ebml_master; @@ -37,8 +41,8 @@ typedef struct mkv_seekhead_entry { } mkv_seekhead_entry; typedef struct mkv_seekhead { - offset_t filepos; - offset_t segment_offset; ///< the file offset to the beginning of the segment + int64_t filepos; + int64_t segment_offset; ///< the file offset to the beginning of the segment int reserved_size; ///< -1 if appending to file int max_entries; mkv_seekhead_entry *entries; @@ -48,23 +52,23 @@ typedef struct mkv_seekhead { typedef struct { uint64_t pts; int tracknum; - offset_t cluster_pos; ///< file offset of the cluster containing the block + int64_t cluster_pos; ///< file offset of the cluster containing the block } mkv_cuepoint; typedef struct { - offset_t segment_offset; + int64_t segment_offset; mkv_cuepoint *entries; int num_entries; } mkv_cues; typedef struct MatroskaMuxContext { ebml_master segment; - offset_t segment_offset; - offset_t segment_uid; + int64_t segment_offset; + int64_t segment_uid; ebml_master cluster; - offset_t cluster_pos; ///< file offset of the current cluster + int64_t cluster_pos; ///< file offset of the current cluster uint64_t cluster_pts; - offset_t duration_offset; + int64_t duration_offset; uint64_t duration; mkv_seekhead *main_seekhead; mkv_seekhead *cluster_seekhead; @@ -149,7 +153,8 @@ static void put_ebml_num(ByteIOContext *pb, uint64_t num, int bytes) static void put_ebml_uint(ByteIOContext *pb, unsigned int elementid, uint64_t val) { int i, bytes = 1; - while (val >> bytes*8) bytes++; + uint64_t tmp = val; + while (tmp>>=8) bytes++; put_ebml_id(pb, elementid); put_ebml_num(pb, bytes, 0); @@ -185,7 +190,7 @@ static void put_ebml_string(ByteIOContext *pb, unsigned int elementid, const cha */ static void put_ebml_void(ByteIOContext *pb, uint64_t size) { - offset_t currentpos = url_ftell(pb); + int64_t currentpos = url_ftell(pb); assert(size >= 2); @@ -211,7 +216,7 @@ static ebml_master start_ebml_master(ByteIOContext *pb, unsigned int elementid, static void end_ebml_master(ByteIOContext *pb, ebml_master master) { - offset_t pos = url_ftell(pb); + int64_t pos = url_ftell(pb); // leave the unknown size for masters when streaming if (url_is_streamed(pb)) @@ -241,7 +246,7 @@ static void put_xiph_size(ByteIOContext *pb, int size) * @param numelements The maximum number of elements that will be indexed * by this seek head, 0 if unlimited. */ -static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_offset, int numelements) +static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, int64_t segment_offset, int numelements) { mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead)); if (new_seekhead == NULL) @@ -288,10 +293,10 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid * * @return The file offset where the seekhead was written. */ -static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) +static int64_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) { ebml_master metaseek, seekentry; - offset_t currentpos; + int64_t currentpos; int i; currentpos = url_ftell(pb); @@ -327,7 +332,7 @@ static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) return currentpos; } -static mkv_cues * mkv_start_cues(offset_t segment_offset) +static mkv_cues * mkv_start_cues(int64_t segment_offset) { mkv_cues *cues = av_mallocz(sizeof(mkv_cues)); if (cues == NULL) @@ -337,7 +342,7 @@ static mkv_cues * mkv_start_cues(offset_t segment_offset) return cues; } -static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos) +static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, int64_t cluster_pos) { mkv_cuepoint *entries = cues->entries; @@ -353,10 +358,10 @@ static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos) return 0; } -static offset_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues, int num_tracks) +static int64_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues, int num_tracks) { ebml_master cues_element; - offset_t currentpos; + int64_t currentpos; int i, j; currentpos = url_ftell(pb); @@ -416,31 +421,8 @@ static int put_xiph_codecpriv(AVFormatContext *s, ByteIOContext *pb, AVCodecCont return 0; } -#define FLAC_STREAMINFO_SIZE 34 - -static int put_flac_codecpriv(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec) -{ - // if the extradata_size is greater than FLAC_STREAMINFO_SIZE, - // assume that it's in Matroska's format already - if (codec->extradata_size < FLAC_STREAMINFO_SIZE) { - av_log(s, AV_LOG_ERROR, "Invalid FLAC extradata\n"); - return -1; - } else if (codec->extradata_size == FLAC_STREAMINFO_SIZE) { - // only the streaminfo packet - put_byte(pb, 0); - put_xiph_size(pb, codec->extradata_size); - av_log(s, AV_LOG_ERROR, "Only one packet\n"); - } - put_buffer(pb, codec->extradata, codec->extradata_size); - return 0; -} - static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int *sample_rate, int *output_sample_rate) { - static const int aac_sample_rates[] = { - 96000, 88200, 64000, 48000, 44100, 32000, - 24000, 22050, 16000, 12000, 11025, 8000, - }; int sri; if (codec->extradata_size < 2) { @@ -453,7 +435,7 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int av_log(s, AV_LOG_WARNING, "AAC samplerate index out of bounds\n"); return; } - *sample_rate = aac_sample_rates[sri]; + *sample_rate = ff_mpeg4audio_sample_rates[sri]; // if sbr, get output sample rate as well if (codec->extradata_size == 5) { @@ -462,11 +444,11 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int av_log(s, AV_LOG_WARNING, "AAC output samplerate index out of bounds\n"); return; } - *output_sample_rate = aac_sample_rates[sri]; + *output_sample_rate = ff_mpeg4audio_sample_rates[sri]; } } -static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec, int native_id) +static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec, int native_id, int qt_id) { ByteIOContext *dyn_cp; uint8_t *codecpriv; @@ -480,30 +462,37 @@ static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodec if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) ret = put_xiph_codecpriv(s, dyn_cp, codec); else if (codec->codec_id == CODEC_ID_FLAC) - ret = put_flac_codecpriv(s, dyn_cp, codec); + ret = ff_flac_write_header(dyn_cp, codec); else if (codec->codec_id == CODEC_ID_H264) ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); else if (codec->extradata_size) put_buffer(dyn_cp, codec->extradata, codec->extradata_size); } else if (codec->codec_type == CODEC_TYPE_VIDEO) { + if (qt_id) { + if (!codec->codec_tag) + codec->codec_tag = ff_codec_get_tag(codec_movvideo_tags, codec->codec_id); + if (codec->extradata_size) + put_buffer(dyn_cp, codec->extradata, codec->extradata_size); + } else { if (!codec->codec_tag) - codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id); + codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id); if (!codec->codec_tag) { av_log(s, AV_LOG_ERROR, "No bmp codec ID found."); ret = -1; } - put_bmp_header(dyn_cp, codec, codec_bmp_tags, 0); + ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0); + } } else if (codec->codec_type == CODEC_TYPE_AUDIO) { if (!codec->codec_tag) - codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id); + codec->codec_tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id); if (!codec->codec_tag) { av_log(s, AV_LOG_ERROR, "No wav codec ID found."); ret = -1; } - put_wav_header(dyn_cp, codec); + ff_put_wav_header(dyn_cp, codec); } codecpriv_size = url_close_dyn_buf(dyn_cp, &codecpriv); @@ -529,9 +518,11 @@ static int mkv_write_tracks(AVFormatContext *s) 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; + AVMetadataTag *tag; if (!bit_depth) bit_depth = av_get_bits_per_sample_format(codec->sample_fmt); @@ -543,11 +534,15 @@ static int mkv_write_tracks(AVFormatContext *s) 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) + put_ebml_float(pb, MATROSKA_ID_TRACKTIMECODESCALE, 1.0); - if (st->language[0]) - put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language); - else - put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und"); + if ((tag = av_metadata_get(st->metadata, "description", NULL, 0))) + put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value); + tag = av_metadata_get(st->metadata, "language", NULL, 0); + put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und"); + + if (st->disposition) + put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT)); // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes @@ -563,19 +558,28 @@ static int mkv_write_tracks(AVFormatContext *s) case CODEC_TYPE_VIDEO: put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO); - if (!native_id) + if (!native_id && + ff_codec_get_tag(codec_movvideo_tags, codec->codec_id) && + (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id) + || codec->codec_id == CODEC_ID_SVQ1 + || codec->codec_id == CODEC_ID_SVQ3 + || codec->codec_id == 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, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC); + put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC"); 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 (codec->sample_aspect_ratio.num) { - AVRational dar = av_mul_q(codec->sample_aspect_ratio, - (AVRational){codec->width, codec->height}); - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , dar.num); - put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, dar.den); + 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); } end_ebml_master(pb, subinfo); break; @@ -585,7 +589,7 @@ static int mkv_write_tracks(AVFormatContext *s) if (!native_id) // no mkv-specific ID, use ACM mode - put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM); + 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); @@ -604,7 +608,7 @@ static int mkv_write_tracks(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska."); break; } - ret = mkv_write_codecprivate(s, pb, codec, native_id); + ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id); if (ret < 0) return ret; end_ebml_master(pb, track); @@ -616,11 +620,56 @@ static int mkv_write_tracks(AVFormatContext *s) return 0; } +static int mkv_write_chapters(AVFormatContext *s) +{ + MatroskaMuxContext *mkv = s->priv_data; + ByteIOContext *pb = s->pb; + ebml_master chapters, editionentry; + AVRational scale = {1, 1E9}; + int i, ret; + + if (!s->nb_chapters) + return 0; + + ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, url_ftell(pb)); + if (ret < 0) return ret; + + chapters = start_ebml_master(pb, MATROSKA_ID_CHAPTERS , 0); + editionentry = start_ebml_master(pb, MATROSKA_ID_EDITIONENTRY, 0); + put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGDEFAULT, 1); + put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGHIDDEN , 0); + for (i = 0; i < s->nb_chapters; i++) { + ebml_master chapteratom, chapterdisplay; + AVChapter *c = s->chapters[i]; + AVMetadataTag *t = NULL; + + 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_CHAPTERFLAGHIDDEN , 0); + put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1); + if ((t = av_metadata_get(c->metadata, "title", NULL, 0))) { + chapterdisplay = start_ebml_master(pb, MATROSKA_ID_CHAPTERDISPLAY, 0); + put_ebml_string(pb, MATROSKA_ID_CHAPSTRING, t->value); + put_ebml_string(pb, MATROSKA_ID_CHAPLANG , "und"); + end_ebml_master(pb, chapterdisplay); + } + end_ebml_master(pb, chapteratom); + } + end_ebml_master(pb, editionentry); + end_ebml_master(pb, chapters); + return 0; +} + static int mkv_write_header(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = s->pb; ebml_master ebml_header, segment_info; + AVMetadataTag *tag; int ret; mkv->md5_ctx = av_mallocz(av_md5_size); @@ -654,8 +703,8 @@ static int mkv_write_header(AVFormatContext *s) segment_info = start_ebml_master(pb, MATROSKA_ID_INFO, 0); put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000); - if (strlen(s->title)) - put_ebml_string(pb, MATROSKA_ID_TITLE, s->title); + if ((tag = av_metadata_get(s->metadata, "title", NULL, 0))) + put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value); if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); @@ -674,6 +723,9 @@ static int mkv_write_header(AVFormatContext *s) ret = mkv_write_tracks(s); if (ret < 0) return ret; + ret = mkv_write_chapters(s); + if (ret < 0) return ret; + ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)); if (ret < 0) return ret; @@ -686,18 +738,13 @@ static int mkv_write_header(AVFormatContext *s) if (mkv->cues == NULL) return AVERROR(ENOMEM); + put_flush_packet(pb); return 0; } -static int mkv_block_size(AVPacket *pkt) -{ - int size = 4; // track num + timecode + flags - return size + pkt->size; -} - -static int mkv_blockgroup_size(AVPacket *pkt) +static int mkv_blockgroup_size(int pkt_size) { - int size = mkv_block_size(pkt); + int size = pkt_size + 4; size += ebml_num_size(size); size += 2; // EBML ID for block and block duration size += 8; // max size of block duration @@ -706,20 +753,89 @@ static int mkv_blockgroup_size(AVPacket *pkt) return size; } +static int ass_get_duration(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; + start = 3600000*sh + 60000*sm + 1000*ss + 10*sc; + end = 3600000*eh + 60000*em + 1000*es + 10*ec; + return end - start; +} + +static int mkv_write_ass_blocks(AVFormatContext *s, AVPacket *pkt) +{ + MatroskaMuxContext *mkv = s->priv_data; + ByteIOContext *pb = s->pb; + int i, layer = 0, max_duration = 0, size, line_size, data_size = pkt->size; + uint8_t *start, *end, *data = pkt->data; + ebml_master blockgroup; + char buffer[2048]; + + while (data_size) { + int duration = ass_get_duration(data); + max_duration = FFMAX(duration, max_duration); + end = memchr(data, '\n', data_size); + size = line_size = end ? end-data+1 : data_size; + size -= end ? (end[-1]=='\r')+1 : 0; + start = data; + for (i=0; i<3; i++, start++) + if (!(start = memchr(start, ',', size-(start-data)))) + return max_duration; + size -= start - data; + sscanf(data, "Dialogue: %d,", &layer); + i = snprintf(buffer, sizeof(buffer), "%"PRId64",%d,", + s->streams[pkt->stream_index]->nb_frames++, layer); + size = FFMIN(i+size, sizeof(buffer)); + memcpy(buffer+i, start, size-i); + + av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " + "pts %" PRId64 ", duration %d\n", + url_ftell(pb), size, pkt->pts, duration); + blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size)); + put_ebml_id(pb, MATROSKA_ID_BLOCK); + put_ebml_num(pb, size+4, 0); + put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 + put_be16(pb, pkt->pts - mkv->cluster_pts); + put_byte(pb, 0); + put_buffer(pb, buffer, size); + put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); + end_ebml_master(pb, blockgroup); + + data += line_size; + data_size -= line_size; + } + + return max_duration; +} + static void mkv_write_block(AVFormatContext *s, unsigned int blockid, AVPacket *pkt, int flags) { MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = s->pb; + AVCodecContext *codec = s->streams[pkt->stream_index]->codec; + uint8_t *data = NULL; + int size = pkt->size; av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " "pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n", url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags); + if (codec->codec_id == CODEC_ID_H264 && codec->extradata_size > 0 && + (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) + ff_avc_parse_nal_units_buf(pkt->data, &data, &size); + else + data = pkt->data; put_ebml_id(pb, blockid); - put_ebml_num(pb, mkv_block_size(pkt), 0); + put_ebml_num(pb, size+4, 0); put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 put_be16(pb, pkt->pts - mkv->cluster_pts); put_byte(pb, flags); - put_buffer(pb, pkt->data, pkt->size); + put_buffer(pb, data, size); + if (data != pkt->data) + av_free(data); } static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) @@ -728,6 +844,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) ByteIOContext *pb = s->pb; AVCodecContext *codec = s->streams[pkt->stream_index]->codec; int keyframe = !!(pkt->flags & PKT_FLAG_KEY); + int duration = pkt->duration; int ret; // start a new cluster every 5 MB or 5 sec @@ -746,22 +863,15 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) av_md5_update(mkv->md5_ctx, pkt->data, FFMIN(200, pkt->size)); } - if (codec->codec_id == CODEC_ID_H264 && - codec->extradata_size > 0 && AV_RB32(codec->extradata) == 0x00000001) { - /* from x264 or from bytestream h264 */ - /* nal reformating needed */ - int ret = ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size); - if (ret < 0) - return ret; - assert(pkt->size); - } - if (codec->codec_type != CODEC_TYPE_SUBTITLE) { mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); + } else if (codec->codec_id == CODEC_ID_SSA) { + duration = mkv_write_ass_blocks(s, pkt); } else { - ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt)); + ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size)); + duration = pkt->convergence_duration; mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0); - put_ebml_uint(pb, MATROSKA_ID_DURATION, pkt->duration); + put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); end_ebml_master(pb, blockgroup); } @@ -770,7 +880,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; } - mkv->duration = FFMAX(mkv->duration, pkt->pts + pkt->duration); + mkv->duration = FFMAX(mkv->duration, pkt->pts + duration); return 0; } @@ -778,7 +888,7 @@ static int mkv_write_trailer(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = s->pb; - offset_t currentpos, second_seekhead, cuespos; + int64_t currentpos, second_seekhead, cuespos; int ret; end_ebml_master(pb, mkv->cluster); @@ -811,12 +921,13 @@ static int mkv_write_trailer(AVFormatContext *s) end_ebml_master(pb, mkv->segment); av_free(mkv->md5_ctx); + put_flush_packet(pb); return 0; } AVOutputFormat matroska_muxer = { "matroska", - "Matroska File Format", + NULL_IF_CONFIG_SMALL("Matroska file format"), "video/x-matroska", "mkv", sizeof(MatroskaMuxContext), @@ -825,13 +936,14 @@ AVOutputFormat matroska_muxer = { mkv_write_header, mkv_write_packet, mkv_write_trailer, - .codec_tag = (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0}, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .subtitle_codec = CODEC_ID_TEXT, }; AVOutputFormat matroska_audio_muxer = { "matroska", - "Matroska File Format", + NULL_IF_CONFIG_SMALL("Matroska file format"), "audio/x-matroska", "mka", sizeof(MatroskaMuxContext), @@ -840,5 +952,6 @@ AVOutputFormat matroska_audio_muxer = { mkv_write_header, mkv_write_packet, mkv_write_trailer, - .codec_tag = (const AVCodecTag*[]){codec_wav_tags, 0}, + .flags = AVFMT_GLOBALHEADER, + .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, };