#include "matroska.h"
#include "avc.h"
#include "flacenc.h"
+#include "avlanguage.h"
+#include "libavcore/samplefmt.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/random_seed.h"
#include "libavutil/lfg.h"
#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
+#include <strings.h>
typedef struct ebml_master {
int64_t pos; ///< absolute offset in the file where the master's elements start
int64_t duration_offset;
int64_t duration;
mkv_seekhead *main_seekhead;
- mkv_seekhead *cluster_seekhead;
mkv_cues *cues;
mkv_track *tracks;
- AVLFG lfg;
unsigned int audio_buffer_size;
AVPacket cur_audio_pkt;
} MatroskaMuxContext;
}
/**
- * Writes a void element of a given size. Useful for reserving space in
+ * Write a void element of a given size. Useful for reserving space in
* the file to be written to later.
*
* @param size The number of bytes to reserve, which must be at least 2.
AVMetadataTag *tag;
if (!bit_depth)
- bit_depth = av_get_bits_per_sample_format(codec->sample_fmt);
+ bit_depth = av_get_bits_per_sample_fmt(codec->sample_fmt);
if (codec->codec_id == CODEC_ID_AAC)
get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate);
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;
return 0;
}
+static void mkv_write_simpletag(ByteIOContext *pb, AVMetadataTag *t)
+{
+ uint8_t *key = av_strdup(t->key);
+ uint8_t *p = key;
+ const uint8_t *lang = NULL;
+ ebml_master tag;
+
+ if ((p = strrchr(p, '-')) &&
+ (lang = av_convert_lang_to(p + 1, AV_LANG_ISO639_2_BIBL)))
+ *p = 0;
+
+ p = key;
+ while (*p) {
+ if (*p == ' ')
+ *p = '_';
+ else if (*p >= 'a' && *p <= 'z')
+ *p -= 'a' - 'A';
+ p++;
+ }
+
+ tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
+ put_ebml_string(pb, MATROSKA_ID_TAGNAME, key);
+ if (lang)
+ put_ebml_string(pb, MATROSKA_ID_TAGLANG, lang);
+ put_ebml_string(pb, MATROSKA_ID_TAGSTRING, t->value);
+ end_ebml_master(pb, tag);
+
+ av_freep(&key);
+}
+
+static int mkv_write_tag(AVFormatContext *s, AVMetadata *m, unsigned int elementid,
+ unsigned int uid, ebml_master *tags)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+ ebml_master tag, targets;
+ AVMetadataTag *t = NULL;
+ int ret;
+
+ if (!tags->pos) {
+ ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TAGS, url_ftell(s->pb));
+ if (ret < 0) return ret;
+
+ *tags = start_ebml_master(s->pb, MATROSKA_ID_TAGS, 0);
+ }
+
+ tag = start_ebml_master(s->pb, MATROSKA_ID_TAG, 0);
+ targets = start_ebml_master(s->pb, MATROSKA_ID_TAGTARGETS, 0);
+ if (elementid)
+ put_ebml_uint(s->pb, elementid, uid);
+ end_ebml_master(s->pb, targets);
+
+ while ((t = av_metadata_get(m, "", t, AV_METADATA_IGNORE_SUFFIX)))
+ if (strcasecmp(t->key, "title"))
+ mkv_write_simpletag(s->pb, t);
+
+ end_ebml_master(s->pb, tag);
+ return 0;
+}
+
+static int mkv_write_tags(AVFormatContext *s)
+{
+ ebml_master tags = {0};
+ int i, ret;
+
+ ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
+
+ if (av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) {
+ ret = mkv_write_tag(s, s->metadata, 0, 0, &tags);
+ if (ret < 0) return ret;
+ }
+
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+
+ if (!av_metadata_get(st->metadata, "", 0, AV_METADATA_IGNORE_SUFFIX))
+ continue;
+
+ ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tags);
+ if (ret < 0) return ret;
+ }
+
+ for (i = 0; i < s->nb_chapters; i++) {
+ AVChapter *ch = s->chapters[i];
+
+ if (!av_metadata_get(ch->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
+ continue;
+
+ ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID, ch->id, &tags);
+ if (ret < 0) return ret;
+ }
+
+ if (tags.pos)
+ end_ebml_master(s->pb, tags);
+ return 0;
+}
+
static int mkv_write_header(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
if (!strcmp(s->oformat->name, "webm")) mkv->mode = MODE_WEBM;
else mkv->mode = MODE_MATROSKAv2;
- av_lfg_init(&mkv->lfg, av_get_random_seed());
-
mkv->tracks = av_mallocz(s->nb_streams * sizeof(*mkv->tracks));
if (!mkv->tracks)
return AVERROR(ENOMEM);
// isn't more than 10 elements if we only write one of each other
// 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)
+ if (!mkv->main_seekhead)
return AVERROR(ENOMEM);
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, url_ftell(pb));
put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value);
if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
uint32_t segment_uid[4];
+ AVLFG lfg;
+
+ av_lfg_init(&lfg, av_get_random_seed());
+
for (i = 0; i < 4; i++)
- segment_uid[i] = av_lfg_get(&mkv->lfg);
+ segment_uid[i] = av_lfg_get(&lfg);
put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT);
put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
if (mkv->mode != MODE_WEBM) {
ret = mkv_write_chapters(s);
if (ret < 0) return ret;
+
+ ret = mkv_write_tags(s);
+ if (ret < 0) return ret;
}
if (url_is_streamed(s->pb))
av_free(data);
}
+static int srt_get_duration(uint8_t **buf)
+{
+ int i, duration = 0;
+
+ for (i=0; i<2 && !duration; i++) {
+ int s_hour, s_min, s_sec, s_hsec, e_hour, e_min, e_sec, e_hsec;
+ if (sscanf(*buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d",
+ &s_hour, &s_min, &s_sec, &s_hsec,
+ &e_hour, &e_min, &e_sec, &e_hsec) == 8) {
+ s_min += 60*s_hour; e_min += 60*e_hour;
+ 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;
+ }
+ *buf += strcspn(*buf, "\n") + 1;
+ }
+ return duration;
+}
+
+static int mkv_write_srt_blocks(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
+{
+ ebml_master blockgroup;
+ AVPacket pkt2 = *pkt;
+ int64_t duration = srt_get_duration(&pkt2.data);
+ pkt2.size -= pkt2.data - pkt->data;
+
+ blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
+ mkv_blockgroup_size(pkt2.size));
+ mkv_write_block(s, pb, MATROSKA_ID_BLOCK, &pkt2, 0);
+ put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
+ end_ebml_master(pb, blockgroup);
+
+ return duration;
+}
+
static void mkv_flush_dynbuf(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
}
if (!mkv->cluster_pos) {
- ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb));
- if (ret < 0) return ret;
-
mkv->cluster_pos = url_ftell(s->pb);
mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0);
put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts));
mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
} else if (codec->codec_id == CODEC_ID_SSA) {
duration = mkv_write_ass_blocks(s, pb, pkt);
+ } else if (codec->codec_id == CODEC_ID_SRT) {
+ duration = mkv_write_srt_blocks(s, pb, pkt);
} else {
ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size));
duration = pkt->convergence_duration;
{
MatroskaMuxContext *mkv = s->priv_data;
ByteIOContext *pb = s->pb;
- int64_t currentpos, second_seekhead, cuespos;
+ int64_t currentpos, cuespos;
int ret;
// check if we have an audio packet cached
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;
- if (second_seekhead >= 0) {
- 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
projects / ffmpeg / blobdiff