#include "isom.h"
#include "matroska.h"
#include "riff.h"
-#include "subtitles.h"
#include "vorbiscomment.h"
#include "wv.h"
#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"
#include "libavcodec/mpeg4audio.h"
-#include "libavcodec/internal.h"
+
+/* Level 1 elements we create a SeekHead entry for:
+ * Info, Tracks, Chapters, Attachments, Tags and Cues */
+#define MAX_SEEKHEAD_ENTRIES 6
typedef struct ebml_master {
- int64_t pos; ///< absolute offset in the containing AVIOContext where the size field starts
- ///< for level 1 elements or else where the master's elements start
- int sizebytes; ///< how many bytes were reserved/shall be used for the size
+ int64_t pos; ///< absolute offset in the containing AVIOContext where the master's elements start
+ int sizebytes; ///< how many bytes were reserved for the size
} ebml_master;
typedef struct mkv_seekhead_entry {
typedef struct mkv_seekhead {
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;
+ mkv_seekhead_entry entries[MAX_SEEKHEAD_ENTRIES];
int num_entries;
+ int reserved_size;
} mkv_seekhead;
typedef struct mkv_cuepoint {
uint64_t pts;
int stream_idx;
int tracknum;
- int64_t cluster_pos; ///< file offset of the cluster containing the block
+ int64_t cluster_pos; ///< offset of the cluster containing the block relative to the segment
int64_t relative_pos; ///< relative offset from the position of the cluster containing the block
int64_t duration; ///< duration of the block according to time base
} mkv_cuepoint;
typedef struct mkv_cues {
- int64_t segment_offset;
mkv_cuepoint *entries;
int num_entries;
} mkv_cues;
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 duration;
+ int64_t duration_offset;
int64_t codecpriv_offset;
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
#define MAX_TRACKS 126
typedef struct MatroskaMuxContext {
- const AVClass *class;
+ const AVClass *class;
int mode;
- AVIOContext *dyn_bc;
AVIOContext *tags_bc;
- ebml_master tags;
+ int64_t tags_pos;
AVIOContext *info_bc;
- ebml_master info;
+ int64_t info_pos;
AVIOContext *tracks_bc;
- ebml_master tracks_master;
+ int64_t tracks_pos;
ebml_master segment;
int64_t segment_offset;
- ebml_master cluster;
+ AVIOContext *cluster_bc;
int64_t cluster_pos; ///< file offset of the current cluster
int64_t cluster_pts;
int64_t duration_offset;
int64_t duration;
- mkv_seekhead *seekhead;
- mkv_cues *cues;
+ mkv_seekhead seekhead;
+ mkv_cues cues;
mkv_track *tracks;
- mkv_attachments *attachments;
AVPacket cur_audio_pkt;
uint32_t chapter_id_offset;
int wrote_chapters;
- int64_t last_track_timestamp[MAX_TRACKS];
-
- int64_t* stream_durations;
- int64_t* stream_duration_offsets;
-
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,
* offset, 4 bytes for target EBML ID */
#define MAX_SEEKENTRY_SIZE 21
-/** per-cuepoint-track - 5 1-byte EBML IDs, 5 1-byte EBML sizes, 3 8-byte uint max
- * and one 1-byte uint for the track number (this assumes MAX_TRACKS to be <= 255) */
-#define MAX_CUETRACKPOS_SIZE 35
-
-/** per-cuepoint - 1 1-byte EBML ID, 1 1-byte EBML size, 8-byte uint max */
-#define MAX_CUEPOINT_CONTENT_SIZE(num_tracks) 10 + MAX_CUETRACKPOS_SIZE * num_tracks
+/** 4 * (1-byte EBML ID, 1-byte EBML size, 8-byte uint max) */
+#define MAX_CUETRACKPOS_SIZE 40
/** Seek preroll value for opus */
#define OPUS_SEEK_PREROLL 80000000
static int ebml_id_size(uint32_t id)
{
- return (av_log2(id + 1) - 1) / 7 + 1;
+ return (av_log2(id) + 7U) / 8;
}
static void put_ebml_id(AVIOContext *pb, uint32_t id)
* Write a number in EBML variable length format.
*
* @param bytes The number of bytes that need to be used to write the number.
- * If zero, any number of bytes can be used.
+ * If zero, the minimal number of bytes will be used.
*/
static void put_ebml_num(AVIOContext *pb, uint64_t num, int bytes)
{
av_assert0(num < (1ULL << 56) - 1);
if (bytes == 0)
- // don't care how many bytes are used, so use the min
bytes = needed_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.
+ // The bytes needed to write the given size must not exceed
+ // the bytes that we ought to use.
av_assert0(bytes >= needed_bytes);
num |= 1ULL << bytes * 7;
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;
*
* @param size The number of bytes to reserve, which must be at least 2.
*/
-static void put_ebml_void(AVIOContext *pb, uint64_t size)
+static void put_ebml_void(AVIOContext *pb, int size)
{
- int64_t currentpos = avio_tell(pb);
-
av_assert0(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_num(pb, size - 2, 0);
- else
- put_ebml_num(pb, size - 9, 8);
- ffio_fill(pb, 0, currentpos + size - avio_tell(pb));
+ if (size < 10) {
+ size -= 2;
+ put_ebml_num(pb, size, 0);
+ } else {
+ size -= 9;
+ put_ebml_num(pb, size, 8);
+ }
+ ffio_fill(pb, 0, size);
}
static ebml_master start_ebml_master(AVIOContext *pb, uint32_t elementid,
put_ebml_id(pb, elementid);
put_ebml_size_unknown(pb, bytes);
- return (ebml_master) {avio_tell(pb), bytes };
+ return (ebml_master) { avio_tell(pb), bytes };
}
static void end_ebml_master(AVIOContext *pb, ebml_master master)
avio_seek(pb, pos, SEEK_SET);
}
-static int start_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv,
- ebml_master *master, uint32_t elementid, uint64_t expectedsize)
+static int start_ebml_master_crc32(AVIOContext **dyn_cp, MatroskaMuxContext *mkv)
{
int ret;
- if ((ret = avio_open_dyn_buf(dyn_cp)) < 0)
+ if (!*dyn_cp && (ret = avio_open_dyn_buf(dyn_cp)) < 0)
return ret;
- if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
- int bytes = expectedsize ? ebml_num_size(expectedsize) : 8;
-
- put_ebml_id(pb, elementid);
- *master = (ebml_master) { avio_tell(pb), bytes };
- if (mkv->write_crc)
- put_ebml_void(*dyn_cp, 6); /* Reserve space for CRC32 so position/size calculations using avio_tell() take it into account */
- } else
- *master = start_ebml_master(*dyn_cp, elementid, expectedsize);
+ if (mkv->write_crc)
+ put_ebml_void(*dyn_cp, 6); /* Reserve space for CRC32 so position/size calculations using avio_tell() take it into account */
return 0;
}
-static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv,
- ebml_master master)
+static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp,
+ MatroskaMuxContext *mkv, uint32_t id,
+ int length_size, int keep_buffer)
{
uint8_t *buf, crc[4];
int size, skip = 0;
- if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
- size = avio_close_dyn_buf(*dyn_cp, &buf);
- put_ebml_num(pb, size, master.sizebytes);
- if (mkv->write_crc) {
- skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */
- AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX);
- put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc));
- }
- avio_write(pb, buf + skip, size - skip);
+ put_ebml_id(pb, id);
+ size = avio_get_dyn_buf(*dyn_cp, &buf);
+ put_ebml_num(pb, size, length_size);
+ if (mkv->write_crc) {
+ skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */
+ AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX);
+ put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc));
+ }
+ avio_write(pb, buf + skip, size - skip);
+
+ if (keep_buffer) {
+ ffio_reset_dyn_buf(*dyn_cp);
} else {
- end_ebml_master(*dyn_cp, master);
- size = avio_close_dyn_buf(*dyn_cp, &buf);
- avio_write(pb, buf, size);
+ ffio_free_dyn_buf(dyn_cp);
}
- av_free(buf);
- *dyn_cp = NULL;
}
/**
-* Complete ebml master whithout destroying the buffer, allowing for later updates
+* Complete ebml master without destroying the buffer, allowing for later updates
*/
-static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv,
- ebml_master master)
+static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext *dyn_cp,
+ uint32_t id, int64_t *pos)
{
+ uint8_t *buf;
+ int size = avio_get_dyn_buf(dyn_cp, &buf);
- uint8_t *buf;
- int size = avio_get_dyn_buf(*dyn_cp, &buf);
+ *pos = avio_tell(pb);
- put_ebml_num(pb, size, master.sizebytes);
- avio_write(pb, buf, size);
+ put_ebml_id(pb, id);
+ put_ebml_num(pb, size, 0);
+ avio_write(pb, buf, size);
}
static void put_xiph_size(AVIOContext *pb, int size)
/**
* Free the members allocated in the mux context.
*/
-static void mkv_free(MatroskaMuxContext *mkv) {
- uint8_t* buf;
- if (mkv->dyn_bc) {
- avio_close_dyn_buf(mkv->dyn_bc, &buf);
- av_free(buf);
- }
- if (mkv->info_bc) {
- avio_close_dyn_buf(mkv->info_bc, &buf);
- av_free(buf);
- }
- if (mkv->tracks_bc) {
- avio_close_dyn_buf(mkv->tracks_bc, &buf);
- av_free(buf);
- }
- if (mkv->tags_bc) {
- avio_close_dyn_buf(mkv->tags_bc, &buf);
- av_free(buf);
- }
- if (mkv->seekhead) {
- av_freep(&mkv->seekhead->entries);
- av_freep(&mkv->seekhead);
- }
- if (mkv->cues) {
- av_freep(&mkv->cues->entries);
- av_freep(&mkv->cues);
- }
- if (mkv->attachments) {
- av_freep(&mkv->attachments->entries);
- av_freep(&mkv->attachments);
- }
+static void mkv_deinit(AVFormatContext *s)
+{
+ MatroskaMuxContext *mkv = s->priv_data;
+
+ av_packet_unref(&mkv->cur_audio_pkt);
+
+ ffio_free_dyn_buf(&mkv->cluster_bc);
+ ffio_free_dyn_buf(&mkv->info_bc);
+ ffio_free_dyn_buf(&mkv->tracks_bc);
+ ffio_free_dyn_buf(&mkv->tags_bc);
+
+ av_freep(&mkv->cues.entries);
av_freep(&mkv->tracks);
- av_freep(&mkv->stream_durations);
- av_freep(&mkv->stream_duration_offsets);
}
/**
- * Initialize a mkv_seekhead element to be ready to index level 1 Matroska
- * elements. If a maximum number of elements is specified, enough space
- * will be reserved at the current file location to write a seek head of
- * 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
- * by this seek head, 0 if unlimited.
+ * Initialize the SeekHead element to be ready to index level 1 Matroska
+ * elements. Enough space to write MAX_SEEKHEAD_ENTRIES SeekHead entries
+ * will be reserved at the current file location.
*/
-static mkv_seekhead *mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset,
- int numelements)
+static void mkv_start_seekhead(MatroskaMuxContext *mkv, AVIOContext *pb)
{
- mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
- if (!new_seekhead)
- return NULL;
-
- new_seekhead->segment_offset = segment_offset;
-
- if (numelements > 0) {
- new_seekhead->filepos = avio_tell(pb);
- // 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID
- // and size, 6 bytes for a CRC32 element, and 3 bytes to guarantee
- // that an EBML void element will fit afterwards
- new_seekhead->reserved_size = numelements * MAX_SEEKENTRY_SIZE + 19;
- new_seekhead->max_entries = numelements;
- put_ebml_void(pb, new_seekhead->reserved_size);
- }
- return new_seekhead;
+ mkv->seekhead.filepos = avio_tell(pb);
+ // 21 bytes max for a Seek entry, 6 bytes max for the SeekHead ID
+ // and size, 6 bytes for a CRC32 element, and 2 bytes to guarantee
+ // that an EBML void element will fit afterwards
+ mkv->seekhead.reserved_size = MAX_SEEKHEAD_ENTRIES * MAX_SEEKENTRY_SIZE + 14;
+ put_ebml_void(pb, mkv->seekhead.reserved_size);
}
-static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, uint32_t elementid, uint64_t filepos)
+static void mkv_add_seekhead_entry(MatroskaMuxContext *mkv, uint32_t elementid,
+ uint64_t filepos)
{
- mkv_seekhead_entry *entries = seekhead->entries;
+ mkv_seekhead *seekhead = &mkv->seekhead;
- // don't store more elements than we reserved space for
- if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
- return -1;
-
- entries = av_realloc_array(entries, seekhead->num_entries + 1, sizeof(mkv_seekhead_entry));
- if (!entries)
- return AVERROR(ENOMEM);
- seekhead->entries = entries;
+ av_assert1(seekhead->num_entries < MAX_SEEKHEAD_ENTRIES);
seekhead->entries[seekhead->num_entries].elementid = elementid;
- seekhead->entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
-
- return 0;
+ seekhead->entries[seekhead->num_entries++].segmentpos = filepos - mkv->segment_offset;
}
/**
- * Write the seek head to the file and free it. If a maximum number of
- * elements was specified to mkv_start_seekhead(), the seek head will
- * be written at the location reserved for it. Otherwise, it is written
- * at the current location in the file.
+ * Write the SeekHead to the file at the location reserved for it
+ * and seek to destpos afterwards. When error_on_seek_failure
+ * is not set, failure to seek to the position designated for the
+ * SeekHead is not considered an error and it is presumed that
+ * destpos is the current position; failure to seek to destpos
+ * afterwards is always an error.
*
- * @return The file offset where the seekhead was written,
- * -1 if an error occurred.
+ * @return 0 on success, < 0 on error.
*/
-static int64_t mkv_write_seekhead(AVIOContext *pb, MatroskaMuxContext *mkv)
+static int mkv_write_seekhead(AVIOContext *pb, MatroskaMuxContext *mkv,
+ int error_on_seek_failure, int64_t destpos)
{
- AVIOContext *dyn_cp;
- mkv_seekhead *seekhead = mkv->seekhead;
- ebml_master metaseek, seekentry;
- int64_t currentpos;
- int i;
+ AVIOContext *dyn_cp = NULL;
+ mkv_seekhead *seekhead = &mkv->seekhead;
+ int64_t remaining, ret64;
+ int i, ret;
- currentpos = avio_tell(pb);
+ if ((ret64 = avio_seek(pb, seekhead->filepos, SEEK_SET)) < 0)
+ return error_on_seek_failure ? ret64 : 0;
- if (seekhead->reserved_size > 0) {
- if (avio_seek(pb, seekhead->filepos, SEEK_SET) < 0) {
- currentpos = -1;
- goto fail;
- }
- }
-
- if (start_ebml_master_crc32(pb, &dyn_cp, mkv, &metaseek, MATROSKA_ID_SEEKHEAD,
- seekhead->reserved_size) < 0) {
- currentpos = -1;
- goto fail;
- }
+ ret = start_ebml_master_crc32(&dyn_cp, mkv);
+ if (ret < 0)
+ return ret;
for (i = 0; i < seekhead->num_entries; i++) {
mkv_seekhead_entry *entry = &seekhead->entries[i];
-
- seekentry = start_ebml_master(dyn_cp, MATROSKA_ID_SEEKENTRY, MAX_SEEKENTRY_SIZE);
+ ebml_master seekentry = start_ebml_master(dyn_cp, MATROSKA_ID_SEEKENTRY,
+ MAX_SEEKENTRY_SIZE);
put_ebml_id(dyn_cp, MATROSKA_ID_SEEKID);
put_ebml_num(dyn_cp, ebml_id_size(entry->elementid), 0);
put_ebml_uint(dyn_cp, MATROSKA_ID_SEEKPOSITION, entry->segmentpos);
end_ebml_master(dyn_cp, seekentry);
}
- end_ebml_master_crc32(pb, &dyn_cp, mkv, metaseek);
-
- if (seekhead->reserved_size > 0) {
- uint64_t remaining = seekhead->filepos + seekhead->reserved_size - avio_tell(pb);
- put_ebml_void(pb, remaining);
- avio_seek(pb, currentpos, SEEK_SET);
-
- currentpos = seekhead->filepos;
- }
-fail:
- av_freep(&mkv->seekhead->entries);
- av_freep(&mkv->seekhead);
+ end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_SEEKHEAD, 0, 0);
- return currentpos;
-}
+ remaining = seekhead->filepos + seekhead->reserved_size - avio_tell(pb);
+ put_ebml_void(pb, remaining);
-static mkv_cues *mkv_start_cues(int64_t segment_offset)
-{
- mkv_cues *cues = av_mallocz(sizeof(mkv_cues));
- if (!cues)
- return NULL;
+ if ((ret64 = avio_seek(pb, destpos, SEEK_SET)) < 0)
+ return ret64;
- cues->segment_offset = segment_offset;
- return cues;
+ return 0;
}
-static int mkv_add_cuepoint(mkv_cues *cues, int stream, int tracknum, int64_t ts,
+static int mkv_add_cuepoint(MatroskaMuxContext *mkv, int stream, int tracknum, int64_t ts,
int64_t cluster_pos, int64_t relative_pos, int64_t duration)
{
+ mkv_cues *cues = &mkv->cues;
mkv_cuepoint *entries = cues->entries;
if (ts < 0)
cues->entries[cues->num_entries].pts = ts;
cues->entries[cues->num_entries].stream_idx = stream;
cues->entries[cues->num_entries].tracknum = tracknum;
- cues->entries[cues->num_entries].cluster_pos = cluster_pos - cues->segment_offset;
+ cues->entries[cues->num_entries].cluster_pos = cluster_pos - mkv->segment_offset;
cues->entries[cues->num_entries].relative_pos = relative_pos;
cues->entries[cues->num_entries++].duration = duration;
return 0;
}
-static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tracks, int num_tracks)
+static int mkv_assemble_cues(AVStream **streams, AVIOContext *dyn_cp,
+ mkv_cues *cues, mkv_track *tracks, int num_tracks)
{
- MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *dyn_cp, *pb = s->pb;
- ebml_master cues_element;
- int64_t currentpos;
- int i, j, ret;
+ AVIOContext *cuepoint;
+ int ret;
- currentpos = avio_tell(pb);
- ret = start_ebml_master_crc32(pb, &dyn_cp, mkv, &cues_element, MATROSKA_ID_CUES, 0);
+ ret = avio_open_dyn_buf(&cuepoint);
if (ret < 0)
return ret;
- for (i = 0; i < cues->num_entries; i++) {
- ebml_master cuepoint, track_positions;
- mkv_cuepoint *entry = &cues->entries[i];
+ for (mkv_cuepoint *entry = cues->entries, *end = entry + cues->num_entries;
+ entry < end;) {
uint64_t pts = entry->pts;
- int ctp_nb = 0;
-
- // Calculate the number of entries, so we know the element size
- for (j = 0; j < num_tracks; j++)
- tracks[j].has_cue = 0;
- for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
- int tracknum = entry[j].stream_idx;
- av_assert0(tracknum>=0 && tracknum<num_tracks);
- if (tracks[tracknum].has_cue && s->streams[tracknum]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
- continue;
- tracks[tracknum].has_cue = 1;
- ctp_nb ++;
- }
+ uint8_t *buf;
+ int size;
- cuepoint = start_ebml_master(dyn_cp, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_CONTENT_SIZE(ctp_nb));
- put_ebml_uint(dyn_cp, MATROSKA_ID_CUETIME, pts);
+ put_ebml_uint(cuepoint, MATROSKA_ID_CUETIME, pts);
// put all the entries from different tracks that have the exact same
// timestamp into the same CuePoint
- for (j = 0; j < num_tracks; j++)
+ for (int j = 0; j < num_tracks; j++)
tracks[j].has_cue = 0;
- for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
- int tracknum = entry[j].stream_idx;
- av_assert0(tracknum>=0 && tracknum<num_tracks);
- if (tracks[tracknum].has_cue && s->streams[tracknum]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
+ do {
+ ebml_master track_positions;
+ int idx = entry->stream_idx;
+
+ av_assert0(idx >= 0 && idx < num_tracks);
+ if (tracks[idx].has_cue && streams[idx]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
continue;
- tracks[tracknum].has_cue = 1;
- track_positions = start_ebml_master(dyn_cp, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CUETRACK , entry[j].tracknum );
- put_ebml_uint(dyn_cp, MATROSKA_ID_CUECLUSTERPOSITION , entry[j].cluster_pos);
- put_ebml_uint(dyn_cp, MATROSKA_ID_CUERELATIVEPOSITION, entry[j].relative_pos);
- if (entry[j].duration != -1)
- put_ebml_uint(dyn_cp, MATROSKA_ID_CUEDURATION , entry[j].duration);
- end_ebml_master(dyn_cp, track_positions);
- }
- i += j - 1;
- end_ebml_master(dyn_cp, cuepoint);
- }
- end_ebml_master_crc32(pb, &dyn_cp, mkv, cues_element);
+ tracks[idx].has_cue = 1;
+ track_positions = start_ebml_master(cuepoint, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE);
+ put_ebml_uint(cuepoint, MATROSKA_ID_CUETRACK , entry->tracknum );
+ put_ebml_uint(cuepoint, MATROSKA_ID_CUECLUSTERPOSITION , entry->cluster_pos);
+ put_ebml_uint(cuepoint, MATROSKA_ID_CUERELATIVEPOSITION, entry->relative_pos);
+ if (entry->duration != -1)
+ put_ebml_uint(cuepoint, MATROSKA_ID_CUEDURATION , entry->duration);
+ end_ebml_master(cuepoint, track_positions);
+ } while (++entry < end && entry->pts == pts);
+ size = avio_get_dyn_buf(cuepoint, &buf);
+ put_ebml_binary(dyn_cp, MATROSKA_ID_POINTENTRY, buf, size);
+ ffio_reset_dyn_buf(cuepoint);
+ }
+ ffio_free_dyn_buf(&cuepoint);
- return currentpos;
+ return 0;
}
static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par)
if (par->extradata && par->extradata_size == 2)
avio_write(pb, par->extradata, 2);
else
- avio_wl16(pb, 0x403); // fallback to the version mentioned in matroska specs
+ avio_wl16(pb, 0x410); // fallback to the most recent version
return 0;
}
MPEG4AudioConfig mp4ac;
int ret;
- ret = avpriv_mpeg4audio_get_config(&mp4ac, extradata,
- extradata_size * 8, 1);
+ ret = avpriv_mpeg4audio_get_config2(&mp4ac, extradata, extradata_size, 1, s);
/* Don't abort if the failure is because of missing extradata. Assume in that
* case a bitstream filter will provide the muxer with the extradata in the
* first packet.
return ff_isom_write_avcc(dyn_cp, par->extradata,
par->extradata_size);
case AV_CODEC_ID_HEVC:
- ff_isom_write_hvcc(dyn_cp, par->extradata,
- par->extradata_size, 0);
- return 0;
+ return ff_isom_write_hvcc(dyn_cp, par->extradata,
+ par->extradata_size, 0);
case AV_CODEC_ID_AV1:
if (par->extradata_size)
return ff_isom_write_av1c(dyn_cp, par->extradata,
ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX);
}
- codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv);
+ codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv);
if (codecpriv_size)
put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv,
codecpriv_size);
- av_free(codecpriv);
+ ffio_free_dyn_buf(&dyn_cp);
return ret;
}
end_ebml_master(dyn_cp, meta_element);
}
- colorinfo_size = avio_close_dyn_buf(dyn_cp, &colorinfo_ptr);
+ colorinfo_size = avio_get_dyn_buf(dyn_cp, &colorinfo_ptr);
if (colorinfo_size) {
ebml_master colorinfo = start_ebml_master(pb, MATROSKA_ID_VIDEOCOLOR, colorinfo_size);
avio_write(pb, colorinfo_ptr, colorinfo_size);
end_ebml_master(pb, colorinfo);
}
- av_free(colorinfo_ptr);
+ ffio_free_dyn_buf(&dyn_cp);
return 0;
}
static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
AVStream *st)
{
- AVIOContext b;
- AVIOContext *dyn_cp;
+ ebml_master projection;
int side_data_size = 0;
- int ret, projection_size;
- uint8_t *projection_ptr;
uint8_t private[20];
const AVSphericalMapping *spherical =
if (!side_data_size)
return 0;
- ret = avio_open_dyn_buf(&dyn_cp);
- if (ret < 0)
- return ret;
+ if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR &&
+ spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE &&
+ spherical->projection != AV_SPHERICAL_CUBEMAP) {
+ av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
+ return 0;
+ }
+
+ // Maximally 4 8-byte elements with id-length 2 + 1 byte length field
+ // and the private data of the AV_SPHERICAL_EQUIRECTANGULAR_TILE case
+ projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION,
+ 4 * (2 + 1 + 8) + (2 + 1 + 20));
switch (spherical->projection) {
case AV_SPHERICAL_EQUIRECTANGULAR:
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
break;
case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
- ffio_init_context(&b, private, 20, 1, NULL, NULL, NULL, NULL);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
- avio_wb32(&b, 0); // version + flags
- avio_wb32(&b, spherical->bound_top);
- avio_wb32(&b, spherical->bound_bottom);
- avio_wb32(&b, spherical->bound_left);
- avio_wb32(&b, spherical->bound_right);
- put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, avio_tell(&b));
+ AV_WB32(private, 0); // version + flags
+ AV_WB32(private + 4, spherical->bound_top);
+ AV_WB32(private + 8, spherical->bound_bottom);
+ AV_WB32(private + 12, spherical->bound_left);
+ AV_WB32(private + 16, spherical->bound_right);
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 20);
break;
case AV_SPHERICAL_CUBEMAP:
- ffio_init_context(&b, private, 12, 1, NULL, NULL, NULL, NULL);
- put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+ put_ebml_uint(pb, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
- avio_wb32(&b, 0); // version + flags
- avio_wb32(&b, 0); // layout
- avio_wb32(&b, spherical->padding);
- put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
- private, avio_tell(&b));
+ AV_WB32(private, 0); // version + flags
+ AV_WB32(private + 4, 0); // layout
+ AV_WB32(private + 8, spherical->padding);
+ put_ebml_binary(pb, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
+ private, 12);
break;
default:
- av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
- goto end;
+ av_assert0(0);
}
if (spherical->yaw)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
(double) spherical->yaw / (1 << 16));
if (spherical->pitch)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
(double) spherical->pitch / (1 << 16));
if (spherical->roll)
- put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
+ put_ebml_float(pb, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
(double) spherical->roll / (1 << 16));
-end:
- projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr);
- if (projection_size) {
- ebml_master projection = start_ebml_master(pb,
- MATROSKA_ID_VIDEOPROJECTION,
- projection_size);
- avio_write(pb, projection_ptr, projection_size);
- end_ebml_master(pb, projection);
- }
- av_freep(&projection_ptr);
+ end_ebml_master(pb, projection);
return 0;
}
ebml_master subinfo, track;
int native_id = 0;
int qt_id = 0;
- int bit_depth = av_get_bits_per_sample(par->codec_id);
+ int bit_depth;
int sample_rate = par->sample_rate;
int output_sample_rate = 0;
int display_width_div = 1;
return 0;
}
- if (par->codec_type == AVMEDIA_TYPE_AUDIO) {
- if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) {
- if (par->bits_per_raw_sample)
- bit_depth = par->bits_per_raw_sample;
- else
- bit_depth = av_get_bytes_per_sample(par->format) << 3;
- }
- if (!bit_depth)
- bit_depth = par->bits_per_coded_sample;
- }
-
if (par->codec_id == AV_CODEC_ID_AAC) {
ret = get_aac_sample_rates(s, par->extradata, par->extradata_size, &sample_rate,
&output_sample_rate);
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)))
put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
tag = av_dict_get(st->metadata, "language", NULL, 0);
- if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) {
- put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag && tag->value ? tag->value:"und");
- } else if (tag && tag->value) {
- put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag->value);
- }
+ put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE,
+ tag && tag->value ? tag->value : "und");
// The default value for TRACKFLAGDEFAULT is 1, so add element
// if we need to clear it.
}
}
- if (par->codec_type == AVMEDIA_TYPE_AUDIO && par->initial_padding && par->codec_id == AV_CODEC_ID_OPUS) {
- int64_t codecdelay = av_rescale_q(par->initial_padding,
- (AVRational){ 1, 48000 },
- (AVRational){ 1, 1000000000 });
- if (codecdelay < 0) {
- av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n");
- return AVERROR(EINVAL);
- }
-// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding,
-// (AVRational){ 1, par->sample_rate },
-// st->time_base);
-
- put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay);
- }
- if (par->codec_id == AV_CODEC_ID_OPUS) {
- put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL);
- }
-
switch (par->codec_type) {
case AVMEDIA_TYPE_VIDEO:
mkv->have_video = 1;
if( st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0
&& av_cmp_q(av_inv_q(st->avg_frame_rate), st->time_base) > 0)
put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->avg_frame_rate.den / st->avg_frame_rate.num);
+ else if( st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0
+ && av_cmp_q(av_inv_q(st->r_frame_rate), st->time_base) > 0)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->r_frame_rate.den / st->r_frame_rate.num);
if (!native_id &&
ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id) &&
break;
case AVMEDIA_TYPE_AUDIO:
+ if (par->initial_padding && par->codec_id == AV_CODEC_ID_OPUS) {
+ int64_t codecdelay = av_rescale_q(par->initial_padding,
+ (AVRational){ 1, 48000 },
+ (AVRational){ 1, 1000000000 });
+ if (codecdelay < 0) {
+ av_log(s, AV_LOG_ERROR, "Initial padding is invalid\n");
+ return AVERROR(EINVAL);
+ }
+// mkv->tracks[i].ts_offset = av_rescale_q(par->initial_padding,
+// (AVRational){ 1, par->sample_rate },
+// st->time_base);
+
+ put_ebml_uint(pb, MATROSKA_ID_CODECDELAY, codecdelay);
+ }
+ if (par->codec_id == AV_CODEC_ID_OPUS)
+ put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL);
+
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
if (!native_id)
put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);
if (output_sample_rate)
put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
+
+ bit_depth = av_get_bits_per_sample(par->codec_id);
+ if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) {
+ if (par->bits_per_raw_sample)
+ bit_depth = par->bits_per_raw_sample;
+ else
+ bit_depth = av_get_bytes_per_sample(par->format) << 3;
+ }
+ if (!bit_depth)
+ bit_depth = par->bits_per_coded_sample;
if (bit_depth)
put_ebml_uint(pb, MATROSKA_ID_AUDIOBITDEPTH, bit_depth);
end_ebml_master(pb, subinfo);
AVIOContext *pb = s->pb;
int i, ret, default_stream_exists = 0;
- ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TRACKS, avio_tell(pb));
- if (ret < 0)
- return ret;
+ mkv_add_seekhead_entry(mkv, MATROSKA_ID_TRACKS, avio_tell(pb));
- ret = start_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, &mkv->tracks_master, MATROSKA_ID_TRACKS, 0);
+ ret = start_ebml_master_crc32(&mkv->tracks_bc, mkv);
if (ret < 0)
return ret;
}
if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(pb, &mkv->tracks_bc, mkv, mkv->tracks_master);
+ end_ebml_master_crc32_preliminary(pb, mkv->tracks_bc,
+ MATROSKA_ID_TRACKS, &mkv->tracks_pos);
else
- end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, mkv->tracks_master);
+ end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0);
return 0;
}
static int mkv_write_chapters(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *dyn_cp, *pb = s->pb;
- ebml_master chapters, editionentry;
+ AVIOContext *dyn_cp = NULL, *pb = s->pb;
+ ebml_master editionentry;
AVRational scale = {1, 1E9};
int i, ret;
if (!s->nb_chapters || mkv->wrote_chapters)
return 0;
- ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_CHAPTERS, avio_tell(pb));
- if (ret < 0) return ret;
+ mkv_add_seekhead_entry(mkv, MATROSKA_ID_CHAPTERS, avio_tell(pb));
- ret = start_ebml_master_crc32(pb, &dyn_cp, mkv, &chapters, MATROSKA_ID_CHAPTERS, 0);
+ ret = start_ebml_master_crc32(&dyn_cp, mkv);
if (ret < 0) return ret;
editionentry = start_ebml_master(dyn_cp, MATROSKA_ID_EDITIONENTRY, 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) {
end_ebml_master(dyn_cp, chapteratom);
}
end_ebml_master(dyn_cp, editionentry);
- end_ebml_master_crc32(pb, &dyn_cp, mkv, chapters);
+ end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_CHAPTERS, 0, 0);
mkv->wrote_chapters = 1;
return 0;
return 0;
}
-static int mkv_write_tag_targets(AVFormatContext *s,
- uint32_t elementid, unsigned int uid,
- ebml_master *tags, ebml_master* tag)
+static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid,
+ uint64_t uid, ebml_master *tag)
{
AVIOContext *pb;
MatroskaMuxContext *mkv = s->priv_data;
ebml_master targets;
int ret;
- if (!tags->pos) {
- ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb));
- if (ret < 0) return ret;
+ if (!mkv->tags_bc) {
+ mkv_add_seekhead_entry(mkv, MATROSKA_ID_TAGS, avio_tell(s->pb));
- start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, tags, MATROSKA_ID_TAGS, 0);
+ ret = start_ebml_master_crc32(&mkv->tags_bc, mkv);
+ if (ret < 0)
+ return ret;
}
pb = mkv->tags_bc;
- *tag = start_ebml_master(pb, MATROSKA_ID_TAG, 0);
+ *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, ebml_master *tags)
+ 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, tags, &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, &mkv->tags);
+ 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, &mkv->tags);
+ 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;
- mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &mkv->tags, &tag_target);
- pb = mkv->tags_bc;
+ if (tagp) {
+ AVIOContext *pb = mkv->tags_bc;
+ ebml_master simpletag;
- 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->stream_duration_offsets[i] = avio_tell(pb);
+ 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, &mkv->tags);
+ 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, &mkv->tags);
+ ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_ATTACHUID,
+ track->uid, NULL);
if (ret < 0)
return ret;
}
}
- if (mkv->tags.pos) {
+ if (mkv->tags_bc) {
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(s->pb, &mkv->tags_bc, mkv, mkv->tags);
+ end_ebml_master_crc32_preliminary(s->pb, mkv->tags_bc,
+ MATROSKA_ID_TAGS, &mkv->tags_pos);
else
- end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, mkv->tags);
+ end_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0, 0);
}
return 0;
}
static int mkv_write_attachments(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *dyn_cp, *pb = s->pb;
- ebml_master attachments;
- AVLFG c;
+ AVIOContext *dyn_cp = NULL, *pb = s->pb;
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 = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
- if (ret < 0) return ret;
-
- ret = start_ebml_master_crc32(pb, &dyn_cp, mkv, &attachments, MATROSKA_ID_ATTACHMENTS, 0);
+ ret = start_ebml_master_crc32(&dyn_cp, mkv);
if (ret < 0) return ret;
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, attachments);
+ end_ebml_master_crc32(pb, &dyn_cp, mkv, MATROSKA_ID_ATTACHMENTS, 0, 0);
return 0;
}
version = 4;
}
- mkv->tracks = av_mallocz_array(s->nb_streams, sizeof(*mkv->tracks));
- if (!mkv->tracks) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
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_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
- put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
- put_ebml_string (pb, EBML_ID_DOCTYPE , s->oformat->name);
- put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , version);
- put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2);
+ put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
+ put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
+ put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
+ put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
+ put_ebml_string(pb, EBML_ID_DOCTYPE , s->oformat->name);
+ put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , version);
+ put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION, 2);
end_ebml_master(pb, ebml_header);
mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT, 0);
mkv->segment_offset = avio_tell(pb);
// we write a seek head at the beginning to point to all other level
- // one elements, which aren't more than 10 elements as we write only one
- // of every other currently defined level 1 element
- mkv->seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10);
- if (!mkv->seekhead) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ // one elements (except Clusters).
+ mkv_start_seekhead(mkv, pb);
- ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_INFO, avio_tell(pb));
- if (ret < 0) goto fail;
+ mkv_add_seekhead_entry(mkv, MATROSKA_ID_INFO, avio_tell(pb));
- ret = start_ebml_master_crc32(pb, &mkv->info_bc, mkv, &mkv->info, MATROSKA_ID_INFO, 0);
+ ret = start_ebml_master_crc32(&mkv->info_bc, mkv);
if (ret < 0)
return ret;
pb = mkv->info_bc;
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";
}
}
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- end_ebml_master_crc32_preliminary(s->pb, &mkv->info_bc, mkv, mkv->info);
+ end_ebml_master_crc32_preliminary(s->pb, mkv->info_bc,
+ MATROSKA_ID_INFO, &mkv->info_pos);
else
- end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, mkv->info);
+ end_ebml_master_crc32(s->pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0);
pb = s->pb;
- // initialize stream_duration fields
- mkv->stream_durations = av_mallocz(s->nb_streams * sizeof(int64_t));
- mkv->stream_duration_offsets = av_mallocz(s->nb_streams * sizeof(int64_t));
- if (!mkv->stream_durations || !mkv->stream_duration_offsets) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
ret = mkv_write_tracks(s);
if (ret < 0)
- goto fail;
+ 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)
- goto fail;
+ return ret;
if (mkv->mode != MODE_WEBM) {
ret = mkv_write_attachments(s);
if (ret < 0)
- goto fail;
+ return ret;
}
ret = mkv_write_tags(s);
if (ret < 0)
- goto fail;
-
- if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live)
- mkv_write_seekhead(pb, mkv);
+ return ret;
- mkv->cues = mkv_start_cues(mkv->segment_offset);
- if (!mkv->cues) {
- ret = AVERROR(ENOMEM);
- goto fail;
+ if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
+ ret = mkv_write_seekhead(pb, mkv, 0, avio_tell(pb));
+ if (ret < 0)
+ return ret;
}
if (s->metadata_header_padding > 0) {
mkv->cur_audio_pkt.size = 0;
mkv->cluster_pos = -1;
- avio_flush(pb);
-
// start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
// after 4k and on a keyframe
if (pb->seekable & AVIO_SEEKABLE_NORMAL) {
}
return 0;
-fail:
- mkv_free(mkv);
- return ret;
}
static int mkv_blockgroup_size(int pkt_size)
return ret;
}
-static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
- uint32_t blockid, AVPacket *pkt, int keyframe)
+static int mkv_write_block(AVFormatContext *s, AVIOContext *pb,
+ uint32_t blockid, AVPacket *pkt, int keyframe)
{
MatroskaMuxContext *mkv = s->priv_data;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
+ mkv_track *track = &mkv->tracks[pkt->stream_index];
uint8_t *data = NULL, *side_data = NULL;
- int offset = 0, size = pkt->size, side_data_size = 0;
- int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
- uint64_t additional_id = 0;
+ int err = 0, offset = 0, size = pkt->size, side_data_size = 0;
+ int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
+ uint64_t additional_id;
int64_t discard_padding = 0;
uint8_t track_number = (mkv->is_dash ? mkv->dash_track_number : (pkt->stream_index + 1));
ebml_master block_group, block_additions, block_more;
- ts += mkv->tracks[pkt->stream_index].ts_offset;
+ ts += track->ts_offset;
+
+ /* The following string is identical to the one in mkv_write_vtt_blocks
+ * so that only one copy needs to exist in binaries. */
+ av_log(s, AV_LOG_DEBUG,
+ "Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
+ "duration %" PRId64 " at relative offset %" PRId64 " in cluster "
+ "at offset %" PRId64 ". TrackNumber %d, keyframe %d\n",
+ pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
+ mkv->cluster_pos, track_number, keyframe != 0);
- av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
- "pts %" PRId64 ", dts %" PRId64 ", duration %" PRId64 ", keyframe %d\n",
- avio_tell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration,
- keyframe != 0);
if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
- ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
- else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
- (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1))
+ (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
+ err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
+ } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 &&
+ (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) {
/* extradata is Annex B, assume the bitstream is too and convert it */
- ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
- else if (par->codec_id == AV_CODEC_ID_AV1)
- ff_av1_filter_obus_buf(pkt->data, &data, &size);
- else if (par->codec_id == AV_CODEC_ID_WAVPACK) {
- int ret = mkv_strip_wavpack(pkt->data, &data, &size);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Error stripping a WavPack packet.\n");
- return;
- }
+ err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL);
+ } else if (par->codec_id == AV_CODEC_ID_AV1) {
+ err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset);
+ } else if (par->codec_id == AV_CODEC_ID_WAVPACK) {
+ err = mkv_strip_wavpack(pkt->data, &data, &size);
} else
data = pkt->data;
+ if (err < 0) {
+ av_log(s, AV_LOG_ERROR, "Error when reformatting data of "
+ "a packet from stream %d.\n", pkt->stream_index);
+ return err;
+ }
+
if (par->codec_id == AV_CODEC_ID_PRORES && size >= 8) {
/* Matroska specification requires to remove the first QuickTime atom
*/
side_data = av_packet_get_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES,
&side_data_size);
-
if (side_data && side_data_size >= 10) {
discard_padding = av_rescale_q(AV_RL32(side_data + 4),
(AVRational){1, par->sample_rate},
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
&side_data_size);
if (side_data) {
- additional_id = AV_RB64(side_data);
- side_data += 8;
- side_data_size -= 8;
+ // Only the Codec-specific BlockMore (id == 1) is currently supported.
+ if (side_data_size < 8 || (additional_id = AV_RB64(side_data)) != 1) {
+ side_data_size = 0;
+ } else {
+ side_data += 8;
+ side_data_size -= 8;
+ }
}
- if ((side_data_size && additional_id == 1) || discard_padding) {
+ if (side_data_size || discard_padding) {
block_group = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, 0);
blockid = MATROSKA_ID_BLOCK;
}
av_free(data);
if (blockid == MATROSKA_ID_BLOCK && !keyframe) {
- put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE,
- mkv->last_track_timestamp[track_number - 1]);
+ put_ebml_sint(pb, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts);
}
- mkv->last_track_timestamp[track_number - 1] = ts - mkv->cluster_pts;
+ track->last_timestamp = ts;
if (discard_padding) {
put_ebml_sint(pb, MATROSKA_ID_DISCARDPADDING, discard_padding);
}
- if (side_data_size && additional_id == 1) {
+ if (side_data_size) {
block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0);
block_more = start_ebml_master(pb, MATROSKA_ID_BLOCKMORE, 0);
- put_ebml_uint(pb, MATROSKA_ID_BLOCKADDID, 1);
- put_ebml_id(pb, MATROSKA_ID_BLOCKADDITIONAL);
- put_ebml_num(pb, side_data_size, 0);
- avio_write(pb, side_data, side_data_size);
+ /* Until dbc50f8a our demuxer used a wrong default value
+ * of BlockAddID, so we write it unconditionally. */
+ put_ebml_uint (pb, MATROSKA_ID_BLOCKADDID, additional_id);
+ put_ebml_binary(pb, MATROSKA_ID_BLOCKADDITIONAL,
+ side_data, side_data_size);
end_ebml_master(pb, block_more);
end_ebml_master(pb, block_additions);
}
- if ((side_data_size && additional_id == 1) || discard_padding) {
+ if (side_data_size || discard_padding) {
end_ebml_master(pb, block_group);
}
+
+ return 0;
}
static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
size = id_size + 1 + settings_size + 1 + pkt->size;
- av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
- "pts %" PRId64 ", dts %" PRId64 ", duration %" PRId64 ", flags %d\n",
- avio_tell(pb), size, pkt->pts, pkt->dts, pkt->duration, flags);
+ /* The following string is identical to the one in mkv_write_block so that
+ * only one copy needs to exist in binaries. */
+ av_log(s, AV_LOG_DEBUG,
+ "Writing block of size %d with pts %" PRId64 ", dts %" PRId64 ", "
+ "duration %" PRId64 " at relative offset %" PRId64 " in cluster "
+ "at offset %" PRId64 ". TrackNumber %d, keyframe %d\n",
+ size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb),
+ mkv->cluster_pos, pkt->stream_index + 1, 1);
blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));
return pkt->duration;
}
-static void mkv_start_new_cluster(AVFormatContext *s, AVPacket *pkt)
+static void mkv_end_cluster(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster);
+ end_ebml_master_crc32(s->pb, &mkv->cluster_bc, mkv, MATROSKA_ID_CLUSTER, 0, 1);
mkv->cluster_pos = -1;
- av_log(s, AV_LOG_DEBUG,
- "Starting new cluster at offset %" PRIu64 " bytes, "
- "pts %" PRIu64 ", dts %" PRIu64 "\n",
- avio_tell(s->pb), pkt->pts, pkt->dts);
- avio_flush(s->pb);
+ avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT);
}
static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt)
case AV_CODEC_ID_AAC:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
int filler, output_sample_rate = 0;
- int64_t curpos;
ret = get_aac_sample_rates(s, side_data, side_data_size, &track->sample_rate,
&output_sample_rate);
if (ret < 0)
return ret;
if (!output_sample_rate)
output_sample_rate = track->sample_rate; // Space is already reserved, so it's this or a void element.
- av_freep(&par->extradata);
ret = ff_alloc_extradata(par, side_data_size);
if (ret < 0)
return ret;
memcpy(par->extradata, side_data, side_data_size);
- curpos = avio_tell(mkv->tracks_bc);
avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
mkv_write_codecprivate(s, mkv->tracks_bc, par, 1, 0);
filler = MAX_PCE_SIZE + 2 + 4 - (avio_tell(mkv->tracks_bc) - track->codecpriv_offset);
avio_seek(mkv->tracks_bc, track->sample_rate_offset, SEEK_SET);
put_ebml_float(mkv->tracks_bc, MATROSKA_ID_AUDIOSAMPLINGFREQ, track->sample_rate);
put_ebml_float(mkv->tracks_bc, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
- avio_seek(mkv->tracks_bc, curpos, SEEK_SET);
} else if (!par->extradata_size && !track->sample_rate) {
// No extradata (codecpar or packet side data).
av_log(s, AV_LOG_ERROR, "Error parsing AAC extradata, unable to determine samplerate.\n");
case AV_CODEC_ID_FLAC:
if (side_data_size && (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
AVCodecParameters *codecpriv_par;
- int64_t curpos;
if (side_data_size != par->extradata_size) {
av_log(s, AV_LOG_ERROR, "Invalid FLAC STREAMINFO metadata for output stream %d\n",
pkt->stream_index);
return ret;
}
memcpy(codecpriv_par->extradata, side_data, side_data_size);
- curpos = avio_tell(mkv->tracks_bc);
avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
mkv_write_codecprivate(s, mkv->tracks_bc, codecpriv_par, 1, 0);
- avio_seek(mkv->tracks_bc, curpos, SEEK_SET);
avcodec_parameters_free(&codecpriv_par);
}
break;
AVIOContext *dyn_cp;
uint8_t *codecpriv;
int codecpriv_size;
- int64_t curpos;
ret = avio_open_dyn_buf(&dyn_cp);
if (ret < 0)
return ret;
av_free(codecpriv);
return AVERROR_INVALIDDATA;
}
- curpos = avio_tell(mkv->tracks_bc);
avio_seek(mkv->tracks_bc, track->codecpriv_offset, SEEK_SET);
// Do not write the OBUs as we don't have space saved for them
put_ebml_binary(mkv->tracks_bc, MATROSKA_ID_CODECPRIVATE, codecpriv, 4);
av_free(codecpriv);
- avio_seek(mkv->tracks_bc, curpos, SEEK_SET);
ret = ff_alloc_extradata(par, side_data_size);
if (ret < 0)
return ret;
static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_cue)
{
MatroskaMuxContext *mkv = s->priv_data;
- AVIOContext *pb = s->pb;
+ AVIOContext *pb;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
+ mkv_track *track = &mkv->tracks[pkt->stream_index];
int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
int duration = pkt->duration;
int ret;
- int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
+ int64_t ts = track->write_dts ? pkt->dts : pkt->pts;
int64_t relative_packet_pos;
- int dash_tracknum = mkv->is_dash ? mkv->dash_track_number : pkt->stream_index + 1;
+ int tracknum = mkv->is_dash ? mkv->dash_track_number : pkt->stream_index + 1;
if (ts == AV_NOPTS_VALUE) {
av_log(s, AV_LOG_ERROR, "Can't write packet with unknown timestamp\n");
return AVERROR(EINVAL);
}
- ts += mkv->tracks[pkt->stream_index].ts_offset;
+ ts += track->ts_offset;
if (mkv->cluster_pos != -1) {
int64_t cluster_time = ts - mkv->cluster_pts;
if ((int16_t)cluster_time != cluster_time) {
+ mkv_end_cluster(s);
av_log(s, AV_LOG_WARNING, "Starting new cluster due to timestamp\n");
- mkv_start_new_cluster(s, pkt);
}
}
if (mkv->cluster_pos == -1) {
- mkv->cluster_pos = avio_tell(s->pb);
- ret = start_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, &mkv->cluster, MATROSKA_ID_CLUSTER, 0);
+ ret = start_ebml_master_crc32(&mkv->cluster_bc, mkv);
if (ret < 0)
return ret;
- put_ebml_uint(mkv->dyn_bc, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts));
+ mkv->cluster_pos = avio_tell(s->pb);
+ put_ebml_uint(mkv->cluster_bc, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts));
mkv->cluster_pts = FFMAX(0, ts);
+ av_log(s, AV_LOG_DEBUG,
+ "Starting new cluster with timestamp "
+ "%" PRId64 " at offset %" PRId64 " bytes\n",
+ mkv->cluster_pts, mkv->cluster_pos);
}
- pb = mkv->dyn_bc;
+ pb = mkv->cluster_bc;
relative_packet_pos = avio_tell(pb);
if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) {
- mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
+ ret = mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe);
+ if (ret < 0)
+ return ret;
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && (par->codec_type == AVMEDIA_TYPE_VIDEO && keyframe || add_cue)) {
- ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, dash_tracknum, ts, mkv->cluster_pos, relative_packet_pos, -1);
+ ret = mkv_add_cuepoint(mkv, pkt->stream_index, tracknum, ts,
+ mkv->cluster_pos, relative_packet_pos, -1);
if (ret < 0) return ret;
}
} else {
}
if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) {
- ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, dash_tracknum, ts,
+ ret = mkv_add_cuepoint(mkv, pkt->stream_index, tracknum, ts,
mkv->cluster_pos, relative_packet_pos, duration);
if (ret < 0)
return ret;
}
}
- mkv->duration = FFMAX(mkv->duration, ts + duration);
-
- if (mkv->stream_durations)
- mkv->stream_durations[pkt->stream_index] =
- FFMAX(mkv->stream_durations[pkt->stream_index], ts + duration);
+ mkv->duration = FFMAX(mkv->duration, ts + duration);
+ track->duration = FFMAX(track->duration, ts + duration);
return 0;
}
cluster_time = pkt->pts - mkv->cluster_pts;
cluster_time += mkv->tracks[pkt->stream_index].ts_offset;
- // start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
- // after 4k and on a keyframe
- cluster_size = avio_tell(mkv->dyn_bc);
+ cluster_size = avio_tell(mkv->cluster_bc);
if (mkv->is_dash && codec_type == AVMEDIA_TYPE_VIDEO) {
// WebM DASH specification states that the first block of every cluster
}
if (mkv->cluster_pos != -1 && start_new_cluster) {
- mkv_start_new_cluster(s, pkt);
+ mkv_end_cluster(s);
}
if (!mkv->cluster_pos)
if (!pkt) {
if (mkv->cluster_pos != -1) {
- end_ebml_master_crc32(s->pb, &mkv->dyn_bc, mkv, mkv->cluster);
- mkv->cluster_pos = -1;
- av_log(s, AV_LOG_DEBUG,
- "Flushing cluster at offset %" PRIu64 " bytes\n",
- avio_tell(s->pb));
- avio_flush(s->pb);
+ mkv_end_cluster(s);
+ av_log(s, AV_LOG_DEBUG,
+ "Flushing cluster at offset %" PRIu64 " bytes\n",
+ avio_tell(s->pb));
}
return 1;
}
{
MatroskaMuxContext *mkv = s->priv_data;
AVIOContext *pb = s->pb;
- int64_t currentpos, cuespos;
int ret;
// check if we have an audio packet cached
if (mkv->cur_audio_pkt.size > 0) {
ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, 0);
- av_packet_unref(&mkv->cur_audio_pkt);
if (ret < 0) {
av_log(s, AV_LOG_ERROR,
"Could not write cached audio packet ret:%d\n", ret);
}
}
- if (mkv->dyn_bc) {
- end_ebml_master_crc32(pb, &mkv->dyn_bc, mkv, mkv->cluster);
+ if (mkv->cluster_bc) {
+ end_ebml_master_crc32(pb, &mkv->cluster_bc, mkv,
+ MATROSKA_ID_CLUSTER, 0, 0);
}
ret = mkv_write_chapters(s);
if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) {
- if (mkv->cues->num_entries) {
- if (mkv->reserve_cues_space) {
- int64_t cues_end;
-
- currentpos = avio_tell(pb);
- avio_seek(pb, mkv->cues_pos, SEEK_SET);
-
- cuespos = mkv_write_cues(s, mkv->cues, mkv->tracks, s->nb_streams);
- cues_end = avio_tell(pb);
- if (cues_end > cuespos + mkv->reserve_cues_space) {
- av_log(s, AV_LOG_ERROR,
- "Insufficient space reserved for cues: %d "
- "(needed: %" PRId64 ").\n",
- mkv->reserve_cues_space, cues_end - cuespos);
- return AVERROR(EINVAL);
- }
+ int64_t endpos, ret64;
- if (cues_end < cuespos + mkv->reserve_cues_space)
- put_ebml_void(pb, mkv->reserve_cues_space -
- (cues_end - cuespos));
+ endpos = avio_tell(pb);
- avio_seek(pb, currentpos, SEEK_SET);
- } else {
- cuespos = mkv_write_cues(s, mkv->cues, mkv->tracks, s->nb_streams);
- }
+ if (mkv->cues.num_entries) {
+ AVIOContext *cues = NULL;
+ uint64_t size;
+ int64_t cuespos = endpos;
+ int length_size = 0;
- ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_CUES,
- cuespos);
+ ret = start_ebml_master_crc32(&cues, mkv);
if (ret < 0)
return ret;
+
+ ret = mkv_assemble_cues(s->streams, cues, &mkv->cues,
+ mkv->tracks, s->nb_streams);
+ if (ret < 0) {
+ ffio_free_dyn_buf(&cues);
+ return ret;
+ }
+
+ if (mkv->reserve_cues_space) {
+ size = avio_tell(cues);
+ length_size = ebml_num_size(size);
+ size += 4 + length_size;
+ if (mkv->reserve_cues_space < size) {
+ av_log(s, AV_LOG_WARNING,
+ "Insufficient space reserved for Cues: "
+ "%d < %"PRIu64". No Cues will be output.\n",
+ mkv->reserve_cues_space, size);
+ mkv->reserve_cues_space = -1;
+ ffio_free_dyn_buf(&cues);
+ goto after_cues;
+ } else {
+ cuespos = mkv->cues_pos;
+ if ((ret64 = avio_seek(pb, mkv->cues_pos, SEEK_SET)) < 0) {
+ ffio_free_dyn_buf(&cues);
+ return ret64;
+ }
+ if (mkv->reserve_cues_space == size + 1) {
+ /* There is no way to reserve a single byte because
+ * the minimal size of an EBML Void element is 2
+ * (1 byte ID, 1 byte length field). This problem
+ * is solved by writing the Cues' length field on
+ * one byte more than necessary. */
+ length_size++;
+ size++;
+ }
+ }
+ }
+ mkv_add_seekhead_entry(mkv, MATROSKA_ID_CUES, cuespos);
+ end_ebml_master_crc32(pb, &cues, mkv, MATROSKA_ID_CUES,
+ length_size, 0);
+ if (mkv->reserve_cues_space) {
+ if (size < mkv->reserve_cues_space)
+ put_ebml_void(pb, mkv->reserve_cues_space - size);
+ } else
+ endpos = avio_tell(pb);
}
- mkv_write_seekhead(pb, mkv);
+ after_cues:
+ ret = mkv_write_seekhead(pb, mkv, 1, mkv->info_pos);
+ if (ret < 0)
+ return ret;
// update the duration
av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
- currentpos = avio_tell(pb);
avio_seek(mkv->info_bc, mkv->duration_offset, SEEK_SET);
put_ebml_float(mkv->info_bc, MATROSKA_ID_DURATION, mkv->duration);
- avio_seek(pb, mkv->info.pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->info_bc, mkv, mkv->info);
+ end_ebml_master_crc32(pb, &mkv->info_bc, mkv, MATROSKA_ID_INFO, 0, 0);
// write tracks master
- avio_seek(pb, mkv->tracks_master.pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, mkv->tracks_master);
+ avio_seek(pb, mkv->tracks_pos, SEEK_SET);
+ end_ebml_master_crc32(pb, &mkv->tracks_bc, mkv, MATROSKA_ID_TRACKS, 0, 0);
// update stream durations
- if (!mkv->is_live && mkv->stream_durations) {
+ if (mkv->tags_bc) {
int i;
- int64_t curr = avio_tell(mkv->tags_bc);
for (i = 0; i < s->nb_streams; ++i) {
AVStream *st = s->streams[i];
+ mkv_track *track = &mkv->tracks[i];
- if (mkv->stream_duration_offsets[i] > 0) {
- double duration_sec = mkv->stream_durations[i] * av_q2d(st->time_base);
+ if (track->duration_offset > 0) {
+ double duration_sec = track->duration * av_q2d(st->time_base);
char duration_string[20] = "";
av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i,
- mkv->stream_durations[i]);
+ track->duration);
- avio_seek(mkv->tags_bc, mkv->stream_duration_offsets[i], SEEK_SET);
+ avio_seek(mkv->tags_bc, track->duration_offset, SEEK_SET);
snprintf(duration_string, 20, "%02d:%02d:%012.9f",
(int) duration_sec / 3600, ((int) duration_sec / 60) % 60,
put_ebml_binary(mkv->tags_bc, MATROSKA_ID_TAGSTRING, duration_string, 20);
}
}
- avio_seek(mkv->tags_bc, curr, SEEK_SET);
- }
- if (mkv->tags.pos && !mkv->is_live) {
- avio_seek(pb, mkv->tags.pos, SEEK_SET);
- end_ebml_master_crc32(pb, &mkv->tags_bc, mkv, mkv->tags);
+
+ avio_seek(pb, mkv->tags_pos, SEEK_SET);
+ end_ebml_master_crc32(pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS, 0, 0);
}
- avio_seek(pb, currentpos, SEEK_SET);
+ avio_seek(pb, endpos, SEEK_SET);
}
if (!mkv->is_live) {
end_ebml_master(pb, mkv->segment);
}
- mkv_free(mkv);
- return 0;
+ return mkv->reserve_cues_space < 0 ? AVERROR(EINVAL) : 0;
}
static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance)
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);
}
.video_codec = CONFIG_LIBX264_ENCODER ?
AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,
.init = mkv_init,
+ .deinit = mkv_deinit,
.write_header = mkv_write_header,
.write_packet = mkv_write_flush_packet,
.write_trailer = mkv_write_trailer,
.video_codec = CONFIG_LIBVPX_VP9_ENCODER? AV_CODEC_ID_VP9 : AV_CODEC_ID_VP8,
.subtitle_codec = AV_CODEC_ID_WEBVTT,
.init = mkv_init,
+ .deinit = mkv_deinit,
.write_header = mkv_write_header,
.write_packet = mkv_write_flush_packet,
.write_trailer = mkv_write_trailer,
AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3,
.video_codec = AV_CODEC_ID_NONE,
.init = mkv_init,
+ .deinit = mkv_deinit,
.write_header = mkv_write_header,
.write_packet = mkv_write_flush_packet,
.write_trailer = mkv_write_trailer,
projects / ffmpeg / blobdiff