#include "libavutil/random_seed.h"
#include "libavutil/rational.h"
#include "libavutil/samplefmt.h"
-#include "libavutil/sha.h"
#include "libavutil/stereo3d.h"
#include "libavcodec/xiph.h"
typedef struct mkv_track {
int write_dts;
int has_cue;
+ uint64_t uid;
int sample_rate;
int64_t sample_rate_offset;
int64_t last_timestamp;
int64_t ts_offset;
} mkv_track;
-typedef struct mkv_attachment {
- int stream_idx;
- uint32_t fileuid;
-} mkv_attachment;
-
-typedef struct mkv_attachments {
- mkv_attachment *entries;
- int num_entries;
-} mkv_attachments;
-
#define MODE_MATROSKAv2 0x01
#define MODE_WEBM 0x02
mkv_seekhead seekhead;
mkv_cues cues;
mkv_track *tracks;
- mkv_attachments *attachments;
AVPacket cur_audio_pkt;
int wrote_chapters;
int allow_raw_vfw;
+
+ uint32_t segment_uid[4];
} MatroskaMuxContext;
/** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint,
avio_w8(pb, (uint8_t)(num >> i * 8));
}
+/**
+ * Write a (random) UID with fixed size to make the output more deterministic
+ */
+static void put_ebml_uid(AVIOContext *pb, uint32_t elementid, uint64_t uid)
+{
+ put_ebml_id(pb, elementid);
+ put_ebml_num(pb, 8, 0);
+ avio_wb64(pb, uid);
+}
+
static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val)
{
int i, bytes = 1;
ffio_free_dyn_buf(&mkv->tags_bc);
av_freep(&mkv->cues.entries);
- if (mkv->attachments) {
- av_freep(&mkv->attachments->entries);
- av_freep(&mkv->attachments);
- }
av_freep(&mkv->tracks);
}
track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER,
mkv->is_dash ? mkv->dash_track_number : i + 1);
- put_ebml_uint (pb, MATROSKA_ID_TRACKUID,
- mkv->is_dash ? mkv->dash_track_number : i + 1);
+ put_ebml_uid (pb, MATROSKA_ID_TRACKUID, mkv->tracks[i].uid);
put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
}
chapteratom = start_ebml_master(dyn_cp, MATROSKA_ID_CHAPTERATOM, 0);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERUID, c->id + mkv->chapter_id_offset);
+ put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERUID,
+ (uint32_t)c->id + (uint64_t)mkv->chapter_id_offset);
put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMESTART, chapterstart);
put_ebml_uint(dyn_cp, MATROSKA_ID_CHAPTERTIMEEND, chapterend);
if (mkv->mode != MODE_WEBM) {
}
static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid,
- unsigned int uid, ebml_master *tag)
+ uint64_t uid, ebml_master *tag)
{
AVIOContext *pb;
MatroskaMuxContext *mkv = s->priv_data;
*tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0);
targets = start_ebml_master(pb, MATROSKA_ID_TAGTARGETS, 0);
if (elementid)
- put_ebml_uint(pb, elementid, uid);
+ put_ebml_uid(pb, elementid, uid);
end_ebml_master(pb, targets);
return 0;
}
}
static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, uint32_t elementid,
- unsigned int uid)
+ uint64_t uid, ebml_master *tag)
{
MatroskaMuxContext *mkv = s->priv_data;
- ebml_master tag;
+ ebml_master tag2;
int ret;
AVDictionaryEntry *t = NULL;
- ret = mkv_write_tag_targets(s, elementid, uid, &tag);
+ ret = mkv_write_tag_targets(s, elementid, uid, tag ? tag : &tag2);
if (ret < 0)
return ret;
}
}
- end_ebml_master(mkv->tags_bc, tag);
+ if (!tag)
+ end_ebml_master(mkv->tags_bc, tag2);
+
return 0;
}
static int mkv_write_tags(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
+ ebml_master tag, *tagp;
int i, ret;
ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
if (mkv_check_tag(s->metadata, 0)) {
- ret = mkv_write_tag(s, s->metadata, 0, 0);
+ ret = mkv_write_tag(s, s->metadata, 0, 0, NULL);
if (ret < 0) return ret;
}
+ tagp = (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live ? &tag : NULL;
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
+ mkv_track *track = &mkv->tracks[i];
if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
continue;
- if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID))
+ if (!tagp && !mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID))
continue;
- ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1);
+ ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID,
+ track->uid, tagp);
if (ret < 0) return ret;
- }
-
- if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
- for (i = 0; i < s->nb_streams; i++) {
- AVIOContext *pb;
- AVStream *st = s->streams[i];
- ebml_master tag_target;
- ebml_master tag;
- if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT)
- continue;
+ if (tagp) {
+ AVIOContext *pb = mkv->tags_bc;
+ ebml_master simpletag;
- ret = mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID,
- i + 1, &tag_target);
- if (ret < 0)
- return ret;
- pb = mkv->tags_bc;
-
- tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
+ simpletag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
put_ebml_string(pb, MATROSKA_ID_TAGNAME, "DURATION");
mkv->tracks[i].duration_offset = avio_tell(pb);
// Reserve space to write duration as a 20-byte string.
// 2 (ebml id) + 1 (data size) + 20 (data)
put_ebml_void(pb, 23);
+ end_ebml_master(pb, simpletag);
end_ebml_master(pb, tag);
- end_ebml_master(pb, tag_target);
}
}
if (!mkv_check_tag(ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID))
continue;
- ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID, ch->id + mkv->chapter_id_offset);
+ ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID,
+ (uint32_t)ch->id + (uint64_t)mkv->chapter_id_offset,
+ NULL);
if (ret < 0)
return ret;
}
}
if (mkv->have_attachments && mkv->mode != MODE_WEBM) {
- for (i = 0; i < mkv->attachments->num_entries; i++) {
- mkv_attachment *attachment = &mkv->attachments->entries[i];
- AVStream *st = s->streams[attachment->stream_idx];
+ for (i = 0; i < s->nb_streams; i++) {
+ mkv_track *track = &mkv->tracks[i];
+ AVStream *st = s->streams[i];
+
+ if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
+ continue;
if (!mkv_check_tag(st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID))
continue;
- ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID, attachment->fileuid);
+ ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID,
+ track->uid, NULL);
if (ret < 0)
return ret;
}
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *dyn_cp = NULL, *pb = s->pb;
- AVLFG c;
int i, ret;
if (!mkv->have_attachments)
return 0;
- mkv->attachments = av_mallocz(sizeof(*mkv->attachments));
- if (!mkv->attachments)
- return AVERROR(ENOMEM);
-
- av_lfg_init(&c, av_get_random_seed());
-
mkv_add_seekhead_entry(mkv, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
ret = start_ebml_master_crc32(&dyn_cp, mkv);
for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i];
+ mkv_track *track = &mkv->tracks[i];
ebml_master attached_file;
- mkv_attachment *attachment = mkv->attachments->entries;
AVDictionaryEntry *t;
const char *mimetype = NULL;
- uint32_t fileuid;
if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT)
continue;
- attachment = av_realloc_array(attachment, mkv->attachments->num_entries + 1, sizeof(mkv_attachment));
- if (!attachment)
- return AVERROR(ENOMEM);
- mkv->attachments->entries = attachment;
-
attached_file = start_ebml_master(dyn_cp, MATROSKA_ID_ATTACHEDFILE, 0);
if (t = av_dict_get(st->metadata, "title", NULL, 0))
return AVERROR(EINVAL);
}
- if (s->flags & AVFMT_FLAG_BITEXACT) {
- struct AVSHA *sha = av_sha_alloc();
- uint8_t digest[20];
- if (!sha)
- return AVERROR(ENOMEM);
- av_sha_init(sha, 160);
- av_sha_update(sha, st->codecpar->extradata, st->codecpar->extradata_size);
- av_sha_final(sha, digest);
- av_free(sha);
- fileuid = AV_RL32(digest);
- } else {
- fileuid = av_lfg_get(&c);
- }
- av_log(s, AV_LOG_VERBOSE, "Using %.8"PRIx32" for attachment %d\n",
- fileuid, mkv->attachments->num_entries);
-
put_ebml_string(dyn_cp, MATROSKA_ID_FILEMIMETYPE, mimetype);
put_ebml_binary(dyn_cp, MATROSKA_ID_FILEDATA, st->codecpar->extradata, st->codecpar->extradata_size);
- put_ebml_uint(dyn_cp, MATROSKA_ID_FILEUID, fileuid);
+ put_ebml_uid(dyn_cp, MATROSKA_ID_FILEUID, track->uid);
end_ebml_master(dyn_cp, attached_file);
-
- mkv->attachments->entries[mkv->attachments->num_entries].stream_idx = i;
- mkv->attachments->entries[mkv->attachments->num_entries++].fileuid = fileuid;
}
end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_ATTACHMENTS, 0, 0);
version = 4;
}
- mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks));
- if (!mkv->tracks) {
- return AVERROR(ENOMEM);
- }
ebml_header = start_ebml_master(pb, EBML_ID_HEADER, MAX_EBML_HEADER_SIZE);
put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
if (mkv->mode != MODE_WEBM) {
- 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(&lfg);
-
- put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
+ put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, mkv->segment_uid, 16);
}
} else {
const char *ident = "Lavf";
return ret;
for (i = 0; i < s->nb_chapters; i++)
- mkv->chapter_id_offset = FFMAX(mkv->chapter_id_offset, 1LL - s->chapters[i]->id);
+ if (!s->chapters[i]->id) {
+ mkv->chapter_id_offset = 1;
+ break;
+ }
ret = mkv_write_chapters(s);
if (ret < 0)
return 0;
}
+static uint64_t mkv_get_uid(const mkv_track *tracks, int i, AVLFG *c)
+{
+ while (1) {
+ uint64_t uid;
+ int k;
+ uid = (uint64_t)av_lfg_get(c) << 32;
+ uid |= av_lfg_get(c);
+ if (!uid)
+ continue;
+ for (k = 0; k < i; k++) {
+ if (tracks[k].uid == uid)
+ break;
+ }
+ if (k == i)
+ return uid;
+ }
+}
+
static int mkv_init(struct AVFormatContext *s)
{
+ MatroskaMuxContext *mkv = s->priv_data;
+ AVLFG c;
int i;
if (s->nb_streams > MAX_TRACKS) {
s->internal->avoid_negative_ts_use_pts = 1;
}
+ mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks));
+ if (!mkv->tracks) {
+ return AVERROR(ENOMEM);
+ }
+
+ if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
+ av_lfg_init(&c, av_get_random_seed());
+
+ // Calculate the SegmentUID now in order not to waste our random seed.
+ for (i = 0; i < 4; i++)
+ mkv->segment_uid[i] = av_lfg_get(&c);
+ }
+
for (i = 0; i < s->nb_streams; i++) {
+ mkv_track *track = &mkv->tracks[i];
+
+ if (s->flags & AVFMT_FLAG_BITEXACT) {
+ track->uid = i + 1;
+ } else {
+ track->uid = mkv_get_uid(mkv->tracks, i, &c);
+ }
+
// ms precision is the de-facto standard timescale for mkv files
avpriv_set_pts_info(s->streams[i], 64, 1, 1000);
}
projects / ffmpeg / blobdiff