X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmatroskaenc.c;h=ef3140ee8bee060277bf8359937a8d703b1f94cb;hb=ff13ba92fd6bfee75db3d1e2f593474946cbfb68;hp=029c5fc6ddab6e7be119fc9483b44f48e3b33337;hpb=cfde5d18f52446461beafb2c092059f72073d666;p=ffmpeg diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 029c5fc6dda..ef3140ee8be 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1,5 +1,5 @@ /* - * Matroska file muxer + * Matroska muxer * Copyright (c) 2007 David Conrad * * This file is part of FFmpeg. @@ -20,10 +20,13 @@ */ #include "avformat.h" -#include "md5.h" #include "riff.h" -#include "xiph.h" +#include "isom.h" #include "matroska.h" +#include "avc.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 @@ -73,15 +76,15 @@ typedef struct MatroskaMuxContext { } MatroskaMuxContext; -// 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit -// offset, 4 bytes for target EBML ID +/** 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit + * offset, 4 bytes for target EBML ID */ #define MAX_SEEKENTRY_SIZE 21 -// per-cuepoint-track - 3 1-byte EBML IDs, 3 1-byte EBML sizes, 2 -// 8-byte uint max +/** per-cuepoint-track - 3 1-byte EBML IDs, 3 1-byte EBML sizes, 2 + * 8-byte uint max */ #define MAX_CUETRACKPOS_SIZE 22 -// per-cuepoint - 2 1-byte EBML IDs, 2 1-byte EBML sizes, 8-byte uint max +/** per-cuepoint - 2 1-byte EBML IDs, 2 1-byte EBML sizes, 8-byte uint max */ #define MAX_CUEPOINT_SIZE(num_tracks) 12 + MAX_CUETRACKPOS_SIZE*num_tracks @@ -98,73 +101,61 @@ static void put_ebml_id(ByteIOContext *pb, unsigned int id) } /** - * Write an EBML size meaning "unknown size" + * Write an EBML size meaning "unknown size". * - * @param bytes The number of bytes the size should occupy. Maximum of 8. + * @param bytes The number of bytes the size should occupy (maximum: 8). */ static void put_ebml_size_unknown(ByteIOContext *pb, int bytes) { - uint64_t value = 0; - int i; - - bytes = FFMIN(bytes, 8); - for (i = 0; i < bytes*7 + 1; i++) - value |= 1ULL << i; - for (i = bytes-1; i >= 0; i--) - put_byte(pb, value >> i*8); + assert(bytes <= 8); + put_byte(pb, 0x1ff >> bytes); + while (--bytes) + put_byte(pb, 0xff); } /** - * Calculate how many bytes are needed to represent a given size in EBML + * Calculate how many bytes are needed to represent a given number in EBML. */ -static int ebml_size_bytes(uint64_t size) +static int ebml_num_size(uint64_t num) { int bytes = 1; - while ((size+1) >> bytes*7) bytes++; + while ((num+1) >> bytes*7) bytes++; return bytes; } /** - * Write a size in EBML variable length format. + * Write a number in EBML variable length format. * - * @param bytes The number of bytes that need to be used to write the size. + * @param bytes The number of bytes that need to be used to write the number. * If zero, any number of bytes can be used. */ -static void put_ebml_size(ByteIOContext *pb, uint64_t size, int bytes) +static void put_ebml_num(ByteIOContext *pb, uint64_t num, int bytes) { - int i, needed_bytes = ebml_size_bytes(size); + int i, needed_bytes = ebml_num_size(num); // sizes larger than this are currently undefined in EBML - // so write "unknown" size - if (size >= (1ULL<<56)-1) { - put_ebml_size_unknown(pb, 1); - return; - } + assert(num < (1ULL<<56)-1); if (bytes == 0) // don't care how many bytes are used, so use the min bytes = needed_bytes; - else if (needed_bytes > bytes) { - // the bytes needed to write the given size would exceed the bytes - // that we need to use, so write unknown size. This shouldn't happen. - av_log(NULL, AV_LOG_WARNING, "Size of %" PRIu64 " needs %d bytes but only %d bytes reserved\n", - size, needed_bytes, bytes); - put_ebml_size_unknown(pb, bytes); - return; - } + // the bytes needed to write the given size would exceed the bytes + // that we need to use, so write unknown size. This shouldn't happen. + assert(bytes >= needed_bytes); - size |= 1ULL << bytes*7; + num |= 1ULL << bytes*7; for (i = bytes - 1; i >= 0; i--) - put_byte(pb, size >> i*8); + put_byte(pb, num >> i*8); } 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_size(pb, bytes, 0); + put_ebml_num(pb, bytes, 0); for (i = bytes - 1; i >= 0; i--) put_byte(pb, val >> i*8); } @@ -172,7 +163,7 @@ static void put_ebml_uint(ByteIOContext *pb, unsigned int elementid, uint64_t va static void put_ebml_float(ByteIOContext *pb, unsigned int elementid, double val) { put_ebml_id(pb, elementid); - put_ebml_size(pb, 8, 0); + put_ebml_num(pb, 8, 0); put_be64(pb, av_dbl2int(val)); } @@ -180,7 +171,7 @@ static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid, const uint8_t *buf, int size) { put_ebml_id(pb, elementid); - put_ebml_size(pb, size, 0); + put_ebml_num(pb, size, 0); put_buffer(pb, buf, size); } @@ -199,23 +190,23 @@ static void put_ebml_void(ByteIOContext *pb, uint64_t size) { offset_t currentpos = url_ftell(pb); - if (size < 2) - return; + assert(size >= 2); put_ebml_id(pb, EBML_ID_VOID); // we need to subtract the length needed to store the size from the // size we need to reserve so 2 cases, we use 8 bytes to store the // size if possible, 1 byte otherwise if (size < 10) - put_ebml_size(pb, size-1, 0); + put_ebml_num(pb, size-1, 0); else - put_ebml_size(pb, size-9, 8); - url_fseek(pb, currentpos + size, SEEK_SET); + put_ebml_num(pb, size-9, 8); + while(url_ftell(pb) < currentpos + size) + put_byte(pb, 0); } static ebml_master start_ebml_master(ByteIOContext *pb, unsigned int elementid, uint64_t expectedsize) { - int bytes = expectedsize ? ebml_size_bytes(expectedsize) : 8; + int bytes = expectedsize ? ebml_num_size(expectedsize) : 8; put_ebml_id(pb, elementid); put_ebml_size_unknown(pb, bytes); return (ebml_master){ url_ftell(pb), bytes }; @@ -225,8 +216,12 @@ static void end_ebml_master(ByteIOContext *pb, ebml_master master) { offset_t pos = url_ftell(pb); + // leave the unknown size for masters when streaming + if (url_is_streamed(pb)) + return; + url_fseek(pb, master.pos - master.sizebytes, SEEK_SET); - put_ebml_size(pb, pos - master.pos, master.sizebytes); + put_ebml_num(pb, pos - master.pos, master.sizebytes); url_fseek(pb, pos, SEEK_SET); } @@ -245,8 +240,8 @@ static void put_xiph_size(ByteIOContext *pb, int size) * that size. * * @param segment_offset The absolute offset to the position in the file - * where the segment begins - * @param numelements the maximum number of elements that will be indexed + * where the segment begins. + * @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) @@ -272,7 +267,6 @@ static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_off static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos) { mkv_seekhead_entry *entries = seekhead->entries; - int new_entry = seekhead->num_entries; // don't store more elements than we reserved space for if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries) @@ -280,14 +274,12 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry)); if (entries == NULL) - return -1; + return AVERROR(ENOMEM); - entries[new_entry].elementid = elementid; - entries[new_entry].segmentpos = filepos - seekhead->segment_offset; + entries[seekhead->num_entries ].elementid = elementid; + entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset; seekhead->entries = entries; - seekhead->num_entries++; - return 0; } @@ -297,7 +289,7 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid * be written at the location reserved for it. Otherwise, it is written * at the current location in the file. * - * @return the file offset where the seekhead was written + * @return The file offset where the seekhead was written. */ static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) { @@ -317,7 +309,7 @@ static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) seekentry = start_ebml_master(pb, MATROSKA_ID_SEEKENTRY, MAX_SEEKENTRY_SIZE); put_ebml_id(pb, MATROSKA_ID_SEEKID); - put_ebml_size(pb, ebml_id_size(entry->elementid), 0); + put_ebml_num(pb, ebml_id_size(entry->elementid), 0); put_ebml_id(pb, entry->elementid); put_ebml_uint(pb, MATROSKA_ID_SEEKPOSITION, entry->segmentpos); @@ -351,18 +343,16 @@ static mkv_cues * mkv_start_cues(offset_t segment_offset) static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos) { mkv_cuepoint *entries = cues->entries; - int new_entry = cues->num_entries; entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint)); if (entries == NULL) - return -1; + return AVERROR(ENOMEM); - entries[new_entry].pts = pkt->pts; - entries[new_entry].tracknum = pkt->stream_index + 1; - entries[new_entry].cluster_pos = cluster_pos - cues->segment_offset; + entries[cues->num_entries ].pts = pkt->pts; + entries[cues->num_entries ].tracknum = pkt->stream_index + 1; + entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset; cues->entries = entries; - cues->num_entries++; return 0; } @@ -401,9 +391,8 @@ static offset_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues, int num_tracks return currentpos; } -static int put_xiph_codecpriv(ByteIOContext *pb, AVCodecContext *codec) +static int put_xiph_codecpriv(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec) { - ebml_master codecprivate; uint8_t *header_start[3]; int header_len[3]; int first_header_size; @@ -416,84 +405,132 @@ static int put_xiph_codecpriv(ByteIOContext *pb, AVCodecContext *codec) if (ff_split_xiph_headers(codec->extradata, codec->extradata_size, first_header_size, header_start, header_len) < 0) { - av_log(codec, AV_LOG_ERROR, "Extradata corrupt.\n"); + av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); return -1; } - codecprivate = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE, 0); put_byte(pb, 2); // number packets - 1 for (j = 0; j < 2; j++) { put_xiph_size(pb, header_len[j]); } for (j = 0; j < 3; j++) put_buffer(pb, header_start[j], header_len[j]); - end_ebml_master(pb, codecprivate); return 0; } #define FLAC_STREAMINFO_SIZE 34 -static int put_flac_codecpriv(ByteIOContext *pb, AVCodecContext *codec) +static int put_flac_codecpriv(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec) { - ebml_master codecpriv = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE, 0); - // if the extradata_size is greater than FLAC_STREAMINFO_SIZE, - // assume that it's in Matroska's format already + // assume that it's in Matroska format already if (codec->extradata_size < FLAC_STREAMINFO_SIZE) { - av_log(codec, AV_LOG_ERROR, "Invalid FLAC extradata\n"); + 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(codec, AV_LOG_ERROR, "Only one packet\n"); + put_buffer(pb, "fLaC", 4); + put_byte(pb, 0x80); + put_be24(pb, FLAC_STREAMINFO_SIZE); + } else if(memcmp("fLaC", codec->extradata, 4)) { + av_log(s, AV_LOG_ERROR, "Invalid FLAC extradata\n"); + return -1; } put_buffer(pb, codec->extradata, codec->extradata_size); - end_ebml_master(pb, codecpriv); return 0; } -static void get_aac_sample_rates(AVCodecContext *codec, int *sample_rate, int *output_sample_rate) +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) { - av_log(codec, AV_LOG_WARNING, "no aac extradata, unable to determine sample rate\n"); + av_log(s, AV_LOG_WARNING, "No AAC extradata, unable to determine samplerate.\n"); return; } sri = ((codec->extradata[0] << 1) & 0xE) | (codec->extradata[1] >> 7); if (sri > 12) { - av_log(codec, AV_LOG_WARNING, "aac samplerate index out of bounds\n"); + 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) { sri = (codec->extradata[4] >> 3) & 0xF; if (sri > 12) { - av_log(codec, AV_LOG_WARNING, "aac output samplerate index out of bounds\n"); + 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, int qt_id) +{ + ByteIOContext *dyn_cp; + uint8_t *codecpriv; + int ret, codecpriv_size; + + ret = url_open_dyn_buf(&dyn_cp); + if(ret < 0) + return ret; + + if (native_id) { + 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); + 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 = 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); + 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); + } + + } else if (codec->codec_type == CODEC_TYPE_AUDIO) { + if (!codec->codec_tag) + codec->codec_tag = codec_get_tag(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); } + + codecpriv_size = url_close_dyn_buf(dyn_cp, &codecpriv); + if (codecpriv_size) + put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size); + av_free(codecpriv); + return ret; } static int mkv_write_tracks(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; ebml_master tracks; - int i, j; + int i, j, ret; - if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, url_ftell(pb)) < 0) - return -1; + ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, url_ftell(pb)); + if (ret < 0) return ret; tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0); for (i = 0; i < s->nb_streams; i++) { @@ -501,6 +538,7 @@ 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; @@ -509,7 +547,7 @@ static int mkv_write_tracks(AVFormatContext *s) bit_depth = av_get_bits_per_sample_format(codec->sample_fmt); if (codec->codec_id == CODEC_ID_AAC) - get_aac_sample_rates(codec, &sample_rate, &output_sample_rate); + get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate); track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1); @@ -521,7 +559,9 @@ static int mkv_write_tracks(AVFormatContext *s) else put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und"); - // look for a codec id string specific to mkv to use, + 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 for (j = 0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) { if (ff_mkv_codec_tags[j].id == codec->codec_id) { @@ -531,41 +571,32 @@ static int mkv_write_tracks(AVFormatContext *s) } } - if (native_id) { - if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) { - if (put_xiph_codecpriv(pb, codec) < 0) - return -1; - } else if (codec->codec_id == CODEC_ID_FLAC) { - if (put_flac_codecpriv(pb, codec) < 0) - return -1; - } else if (codec->extradata_size) { - put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size); - } - } - switch (codec->codec_type) { case CODEC_TYPE_VIDEO: put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO); - if (!native_id) { - ebml_master bmp_header; - // if there is no mkv-specific codec id, use VFW mode - if (!codec->codec_tag) - codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id); + if (!native_id && + codec_get_tag(codec_movvideo_tags, codec->codec_id) && + (!codec_get_tag(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, "V_MS/VFW/FOURCC"); - put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC); - bmp_header = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE, 0); - put_bmp_header(pb, codec, codec_bmp_tags, 0); - end_ebml_master(pb, bmp_header); - } 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; @@ -573,20 +604,10 @@ static int mkv_write_tracks(AVFormatContext *s) case CODEC_TYPE_AUDIO: put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); - if (!native_id) { - ebml_master wav_header; + if (!native_id) // no mkv-specific ID, use ACM mode - codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id); - if (!codec->codec_tag) { - av_log(s, AV_LOG_ERROR, "no codec id found for stream %d", i); - return -1; - } - - put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM); - wav_header = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE, 0); - put_wav_header(pb, codec); - end_ebml_master(pb, wav_header); - } + 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); @@ -597,13 +618,16 @@ static int mkv_write_tracks(AVFormatContext *s) end_ebml_master(pb, subinfo); break; - case CODEC_TYPE_SUBTITLE: - put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE); - break; + case CODEC_TYPE_SUBTITLE: + put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE); + break; default: - av_log(s, AV_LOG_ERROR, "Only audio and video are supported for Matroska."); + 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, qt_id); + if (ret < 0) return ret; + end_ebml_master(pb, track); // ms precision is the de-facto standard timescale for mkv files @@ -616,8 +640,9 @@ static int mkv_write_tracks(AVFormatContext *s) static int mkv_write_header(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; ebml_master ebml_header, segment_info; + int ret; mkv->md5_ctx = av_mallocz(av_md5_size); av_md5_init(mkv->md5_ctx); @@ -642,9 +667,11 @@ static int mkv_write_header(AVFormatContext *s) // currently defined level 1 element mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10); mkv->cluster_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 0); + if (mkv->main_seekhead == NULL || mkv->cluster_seekhead == NULL) + return AVERROR(ENOMEM); - if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, url_ftell(pb)) < 0) - return -1; + ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, url_ftell(pb)); + if (ret < 0) return ret; segment_info = start_ebml_master(pb, MATROSKA_ID_INFO, 0); put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000); @@ -665,11 +692,11 @@ static int mkv_write_header(AVFormatContext *s) put_ebml_void(pb, 11); // assumes double-precision float to be written end_ebml_master(pb, segment_info); - if (mkv_write_tracks(s) < 0) - return -1; + ret = mkv_write_tracks(s); + if (ret < 0) return ret; - if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0) - return -1; + ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)); + if (ret < 0) return ret; mkv->cluster_pos = url_ftell(pb); mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0); @@ -678,7 +705,7 @@ static int mkv_write_header(AVFormatContext *s) mkv->cues = mkv_start_cues(mkv->segment_offset); if (mkv->cues == NULL) - return -1; + return AVERROR(ENOMEM); return 0; } @@ -692,10 +719,10 @@ static int mkv_block_size(AVPacket *pkt) static int mkv_blockgroup_size(AVPacket *pkt) { int size = mkv_block_size(pkt); - size += ebml_size_bytes(size); + size += ebml_num_size(size); size += 2; // EBML ID for block and block duration size += 8; // max size of block duration - size += ebml_size_bytes(size); + size += ebml_num_size(size); size += 1; // blockgroup EBML ID return size; } @@ -703,12 +730,13 @@ static int mkv_blockgroup_size(AVPacket *pkt) static void mkv_write_block(AVFormatContext *s, unsigned int blockid, AVPacket *pkt, int flags) { MatroskaMuxContext *mkv = s->priv_data; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; - av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n", + 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); put_ebml_id(pb, blockid); - put_ebml_size(pb, mkv_block_size(pkt), 0); + put_ebml_num(pb, mkv_block_size(pkt), 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); @@ -718,17 +746,20 @@ static void mkv_write_block(AVFormatContext *s, unsigned int blockid, AVPacket * static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; - ByteIOContext *pb = &s->pb; + 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 if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) { - av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64 " bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts); + av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64 + " bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts); end_ebml_master(pb, mkv->cluster); - if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0) - return -1; + ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)); + if (ret < 0) return ret; mkv->cluster_pos = url_ftell(pb); mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0); @@ -737,53 +768,69 @@ 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 { ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt)); + 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_DURATION, duration); end_ebml_master(pb, blockgroup); } if (codec->codec_type == CODEC_TYPE_VIDEO && keyframe) { - if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0) - return -1; + ret = mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos); + if (ret < 0) return ret; } - mkv->duration = pkt->pts + pkt->duration; + mkv->duration = FFMAX(mkv->duration, pkt->pts + duration); return 0; } static int mkv_write_trailer(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; offset_t currentpos, second_seekhead, cuespos; + int ret; end_ebml_master(pb, mkv->cluster); - cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams); - second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead); - - mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos); - mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead); - mkv_write_seekhead(pb, mkv->main_seekhead); - - // update the duration - av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration); - currentpos = url_ftell(pb); - url_fseek(pb, mkv->duration_offset, SEEK_SET); - put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration); - - // write the md5sum of some frames as the segment UID - if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { - uint8_t segment_uid[16]; - av_md5_final(mkv->md5_ctx, segment_uid); - url_fseek(pb, mkv->segment_uid, SEEK_SET); - put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); + if (!url_is_streamed(pb)) { + cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams); + second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead); + + ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos); + if (ret < 0) return ret; + ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead); + if (ret < 0) return ret; + mkv_write_seekhead(pb, mkv->main_seekhead); + + // update the duration + av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration); + currentpos = url_ftell(pb); + url_fseek(pb, mkv->duration_offset, SEEK_SET); + put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration); + + // write the md5sum of some frames as the segment UID + if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + uint8_t segment_uid[16]; + av_md5_final(mkv->md5_ctx, segment_uid); + url_fseek(pb, mkv->segment_uid, SEEK_SET); + put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); + } + url_fseek(pb, currentpos, SEEK_SET); } - url_fseek(pb, currentpos, SEEK_SET); end_ebml_master(pb, mkv->segment); av_free(mkv->md5_ctx); @@ -792,7 +839,7 @@ static int mkv_write_trailer(AVFormatContext *s) AVOutputFormat matroska_muxer = { "matroska", - "Matroska File Format", + NULL_IF_CONFIG_SMALL("Matroska file format"), "video/x-matroska", "mkv", sizeof(MatroskaMuxContext), @@ -801,13 +848,13 @@ AVOutputFormat matroska_muxer = { mkv_write_header, mkv_write_packet, mkv_write_trailer, - .codec_tag = (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0}, + .codec_tag = (const AVCodecTag* const []){codec_bmp_tags, 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), @@ -816,5 +863,5 @@ AVOutputFormat matroska_audio_muxer = { mkv_write_header, mkv_write_packet, mkv_write_trailer, - .codec_tag = (const AVCodecTag*[]){codec_wav_tags, 0}, + .codec_tag = (const AVCodecTag* const []){codec_wav_tags, 0}, };