highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matroska: K&R formatting cosmetics

Browse Source
This commit is contained in:
Luca Barbato
2014-06-07 00:54:50 +02:00
parent d0449e7545
commit f1f6156b3f
1 changed files with 207 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
libavformat/matroskaenc.c
View File

@ -124,7 +124,6 @@ typedef struct MatroskaMuxContext {
/** 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 #define MAX_CUEPOINT_SIZE(num_tracks) 12 + MAX_CUETRACKPOS_SIZE * num_tracks
static int ebml_id_size(unsigned int id) static int ebml_id_size(unsigned int id)
{ {
return (av_log2(id + 1) - 1) / 7 + 1; return (av_log2(id + 1) - 1) / 7 + 1;
@ -156,7 +155,8 @@ static void put_ebml_size_unknown(AVIOContext *pb, int bytes)
static int ebml_num_size(uint64_t num) static int ebml_num_size(uint64_t num)
{ {
int bytes = 1; int bytes = 1;
while ((num+1) >> bytes*7) bytes++; while ((num + 1) >> bytes * 7)
bytes++;
return bytes; return bytes;
} }
@ -189,7 +189,8 @@ static void put_ebml_uint(AVIOContext *pb, unsigned int elementid, uint64_t val)
{ {
int i, bytes = 1; int i, bytes = 1;
uint64_t tmp = val; uint64_t tmp = val;
while (tmp>>=8) bytes++; while (tmp >>= 8)
bytes++;
put_ebml_id(pb, elementid); put_ebml_id(pb, elementid);
put_ebml_num(pb, bytes, 0); put_ebml_num(pb, bytes, 0);
@ -212,7 +213,8 @@ static void put_ebml_binary(AVIOContext *pb, unsigned int elementid,
avio_write(pb, buf, size); avio_write(pb, buf, size);
} }
static void put_ebml_string(AVIOContext *pb, unsigned int elementid, const char *str) static void put_ebml_string(AVIOContext *pb, unsigned int elementid,
const char *str)
{ {
put_ebml_binary(pb, elementid, str, strlen(str)); put_ebml_binary(pb, elementid, str, strlen(str));
} }
@ -241,7 +243,8 @@ static void put_ebml_void(AVIOContext *pb, uint64_t size)
avio_w8(pb, 0); avio_w8(pb, 0);
} }
static ebml_master start_ebml_master(AVIOContext *pb, unsigned int elementid, uint64_t expectedsize) static ebml_master start_ebml_master(AVIOContext *pb, unsigned int elementid,
uint64_t expectedsize)
{ {
int bytes = expectedsize ? ebml_num_size(expectedsize) : 8; int bytes = expectedsize ? ebml_num_size(expectedsize) : 8;
put_ebml_id(pb, elementid); put_ebml_id(pb, elementid);
@ -278,7 +281,8 @@ static void put_xiph_size(AVIOContext *pb, int size)
* @param numelements The maximum number of elements that will be indexed * @param numelements The maximum number of elements that will be indexed
* by this seek head, 0 if unlimited. * by this seek head, 0 if unlimited.
*/ */
static mkv_seekhead * mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset, int numelements) static mkv_seekhead *mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset,
int numelements)
{ {
mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead)); mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
if (new_seekhead == NULL) if (new_seekhead == NULL)
@ -515,13 +519,15 @@ static int put_flac_codecpriv(AVFormatContext *s,
return 0; return 0;
} }
static void get_aac_sample_rates(AVFormatContext *s, 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)
{ {
MPEG4AudioConfig mp4ac; MPEG4AudioConfig mp4ac;
if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata, if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata,
codec->extradata_size * 8, 1) < 0) { codec->extradata_size * 8, 1) < 0) {
av_log(s, AV_LOG_WARNING, "Error parsing AAC extradata, unable to determine samplerate.\n"); av_log(s, AV_LOG_WARNING,
"Error parsing AAC extradata, unable to determine samplerate.\n");
return; return;
} }
@ -529,7 +535,9 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int
*output_sample_rate = mp4ac.ext_sample_rate; *output_sample_rate = mp4ac.ext_sample_rate;
} }
static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec, int native_id, int qt_id) static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
AVCodecContext *codec, int native_id,
int qt_id)
{ {
AVIOContext *dyn_cp; AVIOContext *dyn_cp;
uint8_t *codecpriv; uint8_t *codecpriv;
@ -540,16 +548,19 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
return ret; return ret;
if (native_id) { if (native_id) {
if (codec->codec_id == AV_CODEC_ID_VORBIS || codec->codec_id == AV_CODEC_ID_THEORA) if (codec->codec_id == AV_CODEC_ID_VORBIS ||
codec->codec_id == AV_CODEC_ID_THEORA)
ret = put_xiph_codecpriv(s, dyn_cp, codec); ret = put_xiph_codecpriv(s, dyn_cp, codec);
else if (codec->codec_id == AV_CODEC_ID_FLAC) else if (codec->codec_id == AV_CODEC_ID_FLAC)
ret = put_flac_codecpriv(s, dyn_cp, codec); ret = put_flac_codecpriv(s, dyn_cp, codec);
else if (codec->codec_id == AV_CODEC_ID_WAVPACK) else if (codec->codec_id == AV_CODEC_ID_WAVPACK)
ret = put_wv_codecpriv(dyn_cp, codec); ret = put_wv_codecpriv(dyn_cp, codec);
else if (codec->codec_id == AV_CODEC_ID_H264) else if (codec->codec_id == AV_CODEC_ID_H264)
ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); ret = ff_isom_write_avcc(dyn_cp, codec->extradata,
codec->extradata_size);
else if (codec->codec_id == AV_CODEC_ID_HEVC) else if (codec->codec_id == AV_CODEC_ID_HEVC)
ret = ff_isom_write_hvcc(dyn_cp, codec->extradata, codec->extradata_size, 0); ret = ff_isom_write_hvcc(dyn_cp, codec->extradata,
codec->extradata_size, 0);
else if (codec->codec_id == AV_CODEC_ID_ALAC) { else if (codec->codec_id == AV_CODEC_ID_ALAC) {
if (codec->extradata_size < 36) { if (codec->extradata_size < 36) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
@ -559,18 +570,19 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
} else } else
avio_write(dyn_cp, codec->extradata + 12, avio_write(dyn_cp, codec->extradata + 12,
codec->extradata_size - 12); codec->extradata_size - 12);
} } else if (codec->extradata_size)
else if (codec->extradata_size)
avio_write(dyn_cp, codec->extradata, codec->extradata_size); avio_write(dyn_cp, codec->extradata, codec->extradata_size);
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { } else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (qt_id) { if (qt_id) {
if (!codec->codec_tag) if (!codec->codec_tag)
codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id); codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags,
codec->codec_id);
if (codec->extradata_size) if (codec->extradata_size)
avio_write(dyn_cp, codec->extradata, codec->extradata_size); avio_write(dyn_cp, codec->extradata, codec->extradata_size);
} else { } else {
if (!codec->codec_tag) if (!codec->codec_tag)
codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id); codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags,
codec->codec_id);
if (!codec->codec_tag) { if (!codec->codec_tag) {
av_log(s, AV_LOG_ERROR, "No bmp codec ID found.\n"); av_log(s, AV_LOG_ERROR, "No bmp codec ID found.\n");
ret = -1; ret = -1;
@ -578,7 +590,6 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0); ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0);
} }
} else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) { } else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
unsigned int tag; unsigned int tag;
tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id); tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
@ -594,7 +605,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv); codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv);
if (codecpriv_size) if (codecpriv_size)
put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size); put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv,
codecpriv_size);
av_free(codecpriv); av_free(codecpriv);
return ret; return ret;
} }
@ -607,7 +619,8 @@ static int mkv_write_tracks(AVFormatContext *s)
int i, j, ret; int i, j, ret;
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, avio_tell(pb)); ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, avio_tell(pb));
if (ret < 0) return ret; if (ret < 0)
return ret;
tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0); tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0);
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
@ -687,10 +700,10 @@ static int mkv_write_tracks(AVFormatContext *s)
if (!native_id && if (!native_id &&
ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) && ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
(!ff_codec_get_tag(ff_codec_bmp_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_SVQ1 ||
|| codec->codec_id == AV_CODEC_ID_SVQ3 codec->codec_id == AV_CODEC_ID_SVQ3 ||
|| codec->codec_id == AV_CODEC_ID_CINEPAK)) codec->codec_id == AV_CODEC_ID_CINEPAK))
qt_id = 1; qt_id = 1;
if (qt_id) if (qt_id)
@ -711,8 +724,8 @@ static int mkv_write_tracks(AVFormatContext *s)
switch (mkv->mode) { switch (mkv->mode) {
case MODE_WEBM: case MODE_WEBM:
if (stereo_fmt <= MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM if (stereo_fmt <= MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM ||
|| stereo_fmt == MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT) stereo_fmt == MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT)
valid_fmt = 1; valid_fmt = 1;
break; break;
case MODE_MATROSKAv2: case MODE_MATROSKAv2:
@ -762,7 +775,8 @@ static int mkv_write_tracks(AVFormatContext *s)
break; break;
} }
ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id); ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id);
if (ret < 0) return ret; if (ret < 0)
return ret;
end_ebml_master(pb, track); end_ebml_master(pb, track);
} }
@ -983,8 +997,10 @@ static int mkv_write_header(AVFormatContext *s)
AVDictionaryEntry *tag; AVDictionaryEntry *tag;
int ret, i; int ret, i;
if (!strcmp(s->oformat->name, "webm")) mkv->mode = MODE_WEBM; if (!strcmp(s->oformat->name, "webm"))
else mkv->mode = MODE_MATROSKAv2; mkv->mode = MODE_WEBM;
else
mkv->mode = MODE_MATROSKAv2;
mkv->tracks = av_mallocz(s->nb_streams * sizeof(*mkv->tracks)); mkv->tracks = av_mallocz(s->nb_streams * sizeof(*mkv->tracks));
if (!mkv->tracks) if (!mkv->tracks)
@ -1043,17 +1059,21 @@ static int mkv_write_header(AVFormatContext *s)
end_ebml_master(pb, segment_info); end_ebml_master(pb, segment_info);
ret = mkv_write_tracks(s); ret = mkv_write_tracks(s);
if (ret < 0) return ret; if (ret < 0)
return ret;
if (mkv->mode != MODE_WEBM) { if (mkv->mode != MODE_WEBM) {
ret = mkv_write_chapters(s); ret = mkv_write_chapters(s);
if (ret < 0) return ret; if (ret < 0)
return ret;
ret = mkv_write_tags(s); ret = mkv_write_tags(s);
if (ret < 0) return ret; if (ret < 0)
return ret;
ret = mkv_write_attachments(s); ret = mkv_write_attachments(s);
if (ret < 0) return ret; if (ret < 0)
return ret;
} }
if (!s->pb->seekable) if (!s->pb->seekable)
@ -1114,7 +1134,8 @@ static int ass_get_duration(const uint8_t *p)
return end - start; return end - start;
} }
static int mkv_write_ass_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) static int mkv_write_ass_blocks(AVFormatContext *s, AVIOContext *pb,
AVPacket *pkt)
{ {
MatroskaMuxContext *mkv = s->priv_data; MatroskaMuxContext *mkv = s->priv_data;
int i, layer = 0, max_duration = 0, size, line_size, data_size = pkt->size; int i, layer = 0, max_duration = 0, size, line_size, data_size = pkt->size;
@ -1139,13 +1160,16 @@ static int mkv_write_ass_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *p
size = FFMIN(i + size, sizeof(buffer)); size = FFMIN(i + size, sizeof(buffer));
memcpy(buffer + i, start, size - i); memcpy(buffer + i, start, size - i);
av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " av_log(s, AV_LOG_DEBUG,
"Writing block at offset %" PRIu64 ", size %d, "
"pts %" PRId64 ", duration %d\n", "pts %" PRId64 ", duration %d\n",
avio_tell(pb), size, pkt->pts, duration); avio_tell(pb), size, pkt->pts, duration);
blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size)); blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
mkv_blockgroup_size(size));
put_ebml_id(pb, MATROSKA_ID_BLOCK); put_ebml_id(pb, MATROSKA_ID_BLOCK);
put_ebml_num(pb, size + 4, 0); put_ebml_num(pb, size + 4, 0);
avio_w8(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 // this assumes stream_index is less than 126
avio_w8(pb, 0x80 | (pkt->stream_index + 1));
avio_wb16(pb, pkt->pts - mkv->cluster_pts); avio_wb16(pb, pkt->pts - mkv->cluster_pts);
avio_w8(pb, 0); avio_w8(pb, 0);
avio_write(pb, buffer, size); avio_write(pb, buffer, size);
@ -1249,7 +1273,8 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
put_ebml_id(pb, blockid); put_ebml_id(pb, blockid);
put_ebml_num(pb, size + 4, 0); put_ebml_num(pb, size + 4, 0);
avio_w8(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 // this assumes stream_index is less than 126
avio_w8(pb, 0x80 | (pkt->stream_index + 1));
avio_wb16(pb, ts - mkv->cluster_pts); avio_wb16(pb, ts - mkv->cluster_pts);
avio_w8(pb, flags); avio_w8(pb, flags);
avio_write(pb, data + offset, size); avio_write(pb, data + offset, size);
@ -1266,9 +1291,14 @@ static int srt_get_duration(uint8_t **buf)
if (sscanf(*buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d", if (sscanf(*buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d",
&s_hour, &s_min, &s_sec, &s_hsec, &s_hour, &s_min, &s_sec, &s_hsec,
&e_hour, &e_min, &e_sec, &e_hsec) == 8) { &e_hour, &e_min, &e_sec, &e_hsec) == 8) {
s_min += 60*s_hour; e_min += 60*e_hour; s_min += 60 * s_hour;
s_sec += 60*s_min; e_sec += 60*e_min; e_min += 60 * e_hour;
s_hsec += 1000*s_sec; e_hsec += 1000*e_sec; s_sec += 60 * s_min;
e_sec += 60 * e_min;
s_hsec += 1000 * s_sec;
e_hsec += 1000 * e_sec;
duration = e_hsec - s_hsec; duration = e_hsec - s_hsec;
} }
*buf += strcspn(*buf, "\n") + 1; *buf += strcspn(*buf, "\n") + 1;
@ -1276,7 +1306,8 @@ static int srt_get_duration(uint8_t **buf)
return duration; return duration;
} }
static int mkv_write_srt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) static int mkv_write_srt_blocks(AVFormatContext *s, AVIOContext *pb,
AVPacket *pkt)
{ {
ebml_master blockgroup; ebml_master blockgroup;
AVPacket pkt2 = *pkt; AVPacket pkt2 = *pkt;
@ -1343,7 +1374,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
} else if (codec->codec_id == AV_CODEC_ID_SRT) { } else if (codec->codec_id == AV_CODEC_ID_SRT) {
duration = mkv_write_srt_blocks(s, pb, pkt); duration = mkv_write_srt_blocks(s, pb, pkt);
} else { } else {
ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size)); ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
mkv_blockgroup_size(pkt->size));
duration = pkt->convergence_duration; duration = pkt->convergence_duration;
mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 0); mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 0);
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration); put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
@ -1351,8 +1383,10 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
} }
if (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe) { if (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe) {
ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, ts, mkv->cluster_pos); ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, ts,
if (ret < 0) return ret; mkv->cluster_pos);
if (ret < 0)
return ret;
} }
mkv->duration = FFMAX(mkv->duration, ts + duration); mkv->duration = FFMAX(mkv->duration, ts + duration);
@ -1390,8 +1424,9 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
cluster_time > mkv->cluster_time_limit || cluster_time > mkv->cluster_time_limit ||
(codec_type == AVMEDIA_TYPE_VIDEO && keyframe && (codec_type == AVMEDIA_TYPE_VIDEO && keyframe &&
cluster_size > 4 * 1024))) { cluster_size > 4 * 1024))) {
av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64 av_log(s, AV_LOG_DEBUG,
" bytes, pts %" PRIu64 "dts %" PRIu64 "\n", "Starting new cluster at offset %" PRIu64 " bytes, "
"pts %" PRIu64 "dts %" PRIu64 "\n",
avio_tell(pb), pkt->pts, pkt->dts); avio_tell(pb), pkt->pts, pkt->dts);
end_ebml_master(pb, mkv->cluster); end_ebml_master(pb, mkv->cluster);
mkv->cluster_pos = 0; mkv->cluster_pos = 0;
@ -1405,7 +1440,8 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
av_free_packet(&mkv->cur_audio_pkt); av_free_packet(&mkv->cur_audio_pkt);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); av_log(s, AV_LOG_ERROR,
"Could not write cached audio packet ret:%d\n", ret);
return ret; return ret;
} }
} }
@ -1434,8 +1470,9 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt)
pb = mkv->dyn_bc; pb = mkv->dyn_bc;
if (!pkt) { if (!pkt) {
if (mkv->cluster_pos) { if (mkv->cluster_pos) {
av_log(s, AV_LOG_DEBUG, "Flushing cluster at offset %" PRIu64 av_log(s, AV_LOG_DEBUG,
" bytes\n", avio_tell(pb)); "Flushing cluster at offset %" PRIu64 " bytes\n",
avio_tell(pb));
end_ebml_master(pb, mkv->cluster); end_ebml_master(pb, mkv->cluster);
mkv->cluster_pos = 0; mkv->cluster_pos = 0;
if (mkv->dyn_bc) if (mkv->dyn_bc)
@ -1459,7 +1496,8 @@ static int mkv_write_trailer(AVFormatContext *s)
ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt); ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
av_free_packet(&mkv->cur_audio_pkt); av_free_packet(&mkv->cur_audio_pkt);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); av_log(s, AV_LOG_ERROR,
"Could not write cached audio packet ret:%d\n", ret);
return ret; return ret;
} }
} }
@ -1473,7 +1511,8 @@ static int mkv_write_trailer(AVFormatContext *s)
if (mkv->mode != MODE_WEBM) { if (mkv->mode != MODE_WEBM) {
ret = mkv_write_chapters(s); ret = mkv_write_chapters(s);
if (ret < 0) return ret; if (ret < 0)
return ret;
} }
if (pb->seekable) { if (pb->seekable) {
@ -1487,22 +1526,26 @@ static int mkv_write_trailer(AVFormatContext *s)
cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams); cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
cues_end = avio_tell(pb); cues_end = avio_tell(pb);
if (cues_end > cuespos + mkv->reserve_cues_space) { if (cues_end > cuespos + mkv->reserve_cues_space) {
av_log(s, AV_LOG_ERROR, "Insufficient space reserved for cues: %d " av_log(s, AV_LOG_ERROR,
"(needed: %"PRId64").\n", mkv->reserve_cues_space, "Insufficient space reserved for cues: %d "
cues_end - cuespos); "(needed: %" PRId64 ").\n",
mkv->reserve_cues_space, cues_end - cuespos);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (cues_end < cuespos + mkv->reserve_cues_space) if (cues_end < cuespos + mkv->reserve_cues_space)
put_ebml_void(pb, mkv->reserve_cues_space - (cues_end - cuespos)); put_ebml_void(pb, mkv->reserve_cues_space -
(cues_end - cuespos));
avio_seek(pb, currentpos, SEEK_SET); avio_seek(pb, currentpos, SEEK_SET);
} else { } else {
cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams); cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
} }
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES, cuespos); ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES,
if (ret < 0) return ret; cuespos);
if (ret < 0)
return ret;
} }
mkv_write_seekhead(pb, mkv->main_seekhead); mkv_write_seekhead(pb, mkv->main_seekhead);
@ -1531,8 +1574,9 @@ static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance)
if (ff_mkv_codec_tags[i].id == codec_id) if (ff_mkv_codec_tags[i].id == codec_id)
return 1; return 1;
if (std_compliance < FF_COMPLIANCE_NORMAL) { // mkv theoretically supports any if (std_compliance < FF_COMPLIANCE_NORMAL) {
enum AVMediaType type = avcodec_get_type(codec_id); // video/audio through VFW/ACM enum AVMediaType type = avcodec_get_type(codec_id);
// mkv theoretically supports any video/audio through VFW/ACM
if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)
return 1; return 1;
} }