annotate matroskaenc.c @ 2451:b66287f9c892 libavformat

Write the cues element
author conrad
date Wed, 05 Sep 2007 00:23:27 +0000
parents 8ac88c6c10e4
children 1b6ea48f7f24
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
1 /*
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
2 * Matroska file muxer
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
3 * Copyright (c) 2007 David Conrad
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
4 *
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
5 * This file is part of FFmpeg.
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
6 *
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
11 *
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
15 * Lesser General Public License for more details.
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
16 *
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
20 */
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
21
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
22 #include "avformat.h"
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
23 #include "riff.h"
2435
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
24 #include "xiph.h"
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
25 #include "matroska.h"
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
26
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
27 typedef struct mkv_seekhead_entry {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
28 unsigned int elementid;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
29 uint64_t segmentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
30 } mkv_seekhead_entry;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
31
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
32 typedef struct mkv_seekhead {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
33 offset_t filepos;
2450
8ac88c6c10e4 Doxygenize comments
conrad
parents: 2449
diff changeset
34 offset_t segment_offset; ///< the file offset to the beginning of the segment
8ac88c6c10e4 Doxygenize comments
conrad
parents: 2449
diff changeset
35 int reserved_size; ///< -1 if appending to file
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
36 int max_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
37 mkv_seekhead_entry *entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
38 int num_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
39 } mkv_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
40
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
41 typedef struct {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
42 uint64_t pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
43 int tracknum;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
44 offset_t cluster_pos; ///< file offset of the cluster containing the block
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
45 } mkv_cuepoint;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
46
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
47 typedef struct {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
48 offset_t segment_offset;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
49 mkv_cuepoint *entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
50 int num_entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
51 } mkv_cues;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
52
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
53 typedef struct MatroskaMuxContext {
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
54 offset_t segment;
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
55 offset_t segment_offset;
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
56 offset_t cluster;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
57 offset_t cluster_pos; ///< file offset of the current cluster
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
58 uint64_t cluster_pts;
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
59 offset_t duration_offset;
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
60 uint64_t duration;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
61 mkv_seekhead *main_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
62 mkv_seekhead *cluster_seekhead;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
63 mkv_cues *cues;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
64 } MatroskaMuxContext;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
65
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
66 static void put_ebml_id(ByteIOContext *pb, unsigned int id)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
67 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
68 if (id >= 0x3fffff)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
69 put_byte(pb, id >> 24);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
70 if (id >= 0x7fff)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
71 put_byte(pb, id >> 16);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
72 if (id >= 0xff)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
73 put_byte(pb, id >> 8);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
74 put_byte(pb, id);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
75 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
76
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
77 static int ebml_id_size(unsigned int id)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
78 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
79 if (id >= 0x3fffff)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
80 return 4;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
81 if (id >= 0x7fff)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
82 return 3;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
83 if (id >= 0xff)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
84 return 2;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
85 return 1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
86 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
87
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
88 // XXX: test this thoroughly and get rid of minbytes hack (currently needed to
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
89 // use up all of the space reserved in start_ebml_master)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
90 static void put_ebml_size(ByteIOContext *pb, uint64_t size, int minbytes)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
91 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
92 int bytes = minbytes;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
93
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
94 // sizes larger than this are currently undefined in EBML
2440
69e2592531b6 Write unknown size if the size given is too large for EBML (greater than 2^56-1)
conrad
parents: 2439
diff changeset
95 // so write "unknown" size
69e2592531b6 Write unknown size if the size given is too large for EBML (greater than 2^56-1)
conrad
parents: 2439
diff changeset
96 size = FFMIN(size, (1ULL<<56)-1);
69e2592531b6 Write unknown size if the size given is too large for EBML (greater than 2^56-1)
conrad
parents: 2439
diff changeset
97
69e2592531b6 Write unknown size if the size given is too large for EBML (greater than 2^56-1)
conrad
parents: 2439
diff changeset
98 while (size >> (bytes*7 + 7)) bytes++;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
99
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
100 put_byte(pb, (0x80 >> bytes) | (size >> bytes*8));
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
101 for (bytes -= 1; bytes >= 0; bytes--)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
102 put_byte(pb, size >> bytes*8);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
103 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
104
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
105 static void put_ebml_uint(ByteIOContext *pb, unsigned int elementid, uint64_t val)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
106 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
107 int bytes = 1;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
108 while (val >> bytes*8) bytes++;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
109
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
110 put_ebml_id(pb, elementid);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
111 put_ebml_size(pb, bytes, 0);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
112 for (bytes -= 1; bytes >= 0; bytes--)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
113 put_byte(pb, val >> bytes*8);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
114 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
115
2430
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
116 static void put_ebml_float(ByteIOContext *pb, unsigned int elementid, double val)
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
117 {
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
118 // XXX: single-precision floats?
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
119 put_ebml_id(pb, elementid);
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
120 put_ebml_size(pb, 8, 0);
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
121 put_be64(pb, av_dbl2int(val));
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
122 }
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
123
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
124 static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid,
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
125 const uint8_t *buf, int size)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
126 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
127 put_ebml_id(pb, elementid);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
128 put_ebml_size(pb, size, 0);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
129 put_buffer(pb, buf, size);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
130 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
131
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
132 static void put_ebml_string(ByteIOContext *pb, unsigned int elementid, const char *str)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
133 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
134 put_ebml_binary(pb, elementid, str, strlen(str));
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
135 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
136
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
137 // this reserves exactly the amount of space specified by size, which must be at least 2
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
138 static void put_ebml_void(ByteIOContext *pb, uint64_t size)
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
139 {
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
140 offset_t currentpos = url_ftell(pb);
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
141
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
142 if (size < 2)
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
143 return;
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
144
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
145 put_ebml_id(pb, EBML_ID_VOID);
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
146 // we need to subtract the length needed to store the size from the size we need to reserve
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
147 // so 2 cases, we use 8 bytes to store the size if possible, 1 byte otherwise
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
148 if (size < 10)
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
149 put_ebml_size(pb, size-1, 0);
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
150 else
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
151 put_ebml_size(pb, size-9, 7);
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
152 url_fseek(pb, currentpos + size, SEEK_SET);
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
153 }
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
154
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
155 static offset_t start_ebml_master(ByteIOContext *pb, unsigned int elementid)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
156 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
157 put_ebml_id(pb, elementid);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
158 // XXX: this always reserves the maximum needed space to store any size value
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
159 // we should be smarter (additional parameter for expected size?)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
160 put_ebml_size(pb, (1ULL<<56)-1, 0); // largest unknown size
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
161 return url_ftell(pb);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
162 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
163
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
164 static void end_ebml_master(ByteIOContext *pb, offset_t start)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
165 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
166 offset_t pos = url_ftell(pb);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
167
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
168 url_fseek(pb, start - 8, SEEK_SET);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
169 put_ebml_size(pb, pos - start, 7);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
170 url_fseek(pb, pos, SEEK_SET);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
171 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
172
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
173 // initializes a mkv_seekhead element to be ready to index level 1 matroska elements
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
174 // if numelements is greater than 0, it reserves enough space for that many elements
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
175 // at the current file position and writes the seekhead there, otherwise the seekhead
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
176 // will be appended to the file when end_mkv_seekhead() is called
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
177 static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_offset, int numelements)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
178 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
179 mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
180 if (new_seekhead == NULL)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
181 return NULL;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
182
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
183 new_seekhead->segment_offset = segment_offset;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
184
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
185 if (numelements > 0) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
186 new_seekhead->filepos = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
187 // 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID and size,
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
188 // and 3 bytes to guarantee that an EBML void element will fit afterwards
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
189 // XXX: 28 bytes right now because begin_ebml_master() reserves more than necessary
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
190 new_seekhead->reserved_size = numelements * 28 + 13;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
191 new_seekhead->max_entries = numelements;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
192 put_ebml_void(pb, new_seekhead->reserved_size);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
193 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
194 return new_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
195 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
196
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
197 static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
198 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
199 mkv_seekhead_entry *entries = seekhead->entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
200 int new_entry = seekhead->num_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
201
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
202 // don't store more elements than we reserved space for
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
203 if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
204 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
205
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
206 entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
207 if (entries == NULL)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
208 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
209
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
210 entries[new_entry].elementid = elementid;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
211 entries[new_entry].segmentpos = filepos - seekhead->segment_offset;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
212
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
213 seekhead->entries = entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
214 seekhead->num_entries++;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
215
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
216 return 0;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
217 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
218
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
219 // returns the file offset where the seekhead was written and frees the seekhead
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
220 static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
221 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
222 offset_t metaseek, seekentry, currentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
223 int i;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
224
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
225 currentpos = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
226
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
227 if (seekhead->reserved_size > 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
228 url_fseek(pb, seekhead->filepos, SEEK_SET);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
229
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
230 metaseek = start_ebml_master(pb, MATROSKA_ID_SEEKHEAD);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
231 for (i = 0; i < seekhead->num_entries; i++) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
232 mkv_seekhead_entry *entry = &seekhead->entries[i];
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
233
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
234 seekentry = start_ebml_master(pb, MATROSKA_ID_SEEKENTRY);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
235
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
236 put_ebml_id(pb, MATROSKA_ID_SEEKID);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
237 put_ebml_size(pb, ebml_id_size(entry->elementid), 0);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
238 put_ebml_id(pb, entry->elementid);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
239
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
240 put_ebml_uint(pb, MATROSKA_ID_SEEKPOSITION, entry->segmentpos);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
241 end_ebml_master(pb, seekentry);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
242 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
243 end_ebml_master(pb, metaseek);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
244
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
245 if (seekhead->reserved_size > 0) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
246 uint64_t remaining = seekhead->filepos + seekhead->reserved_size - url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
247 put_ebml_void(pb, remaining);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
248 url_fseek(pb, currentpos, SEEK_SET);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
249
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
250 currentpos = seekhead->filepos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
251 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
252 av_free(seekhead->entries);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
253 av_free(seekhead);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
254
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
255 return currentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
256 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
257
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
258 static mkv_cues * mkv_start_cues(offset_t segment_offset)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
259 {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
260 mkv_cues *cues = av_mallocz(sizeof(mkv_cues));
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
261 if (cues == NULL)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
262 return NULL;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
263
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
264 cues->segment_offset = segment_offset;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
265 return cues;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
266 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
267
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
268 static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
269 {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
270 mkv_cuepoint *entries = cues->entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
271 int new_entry = cues->num_entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
272
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
273 entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
274 if (entries == NULL)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
275 return -1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
276
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
277 entries[new_entry].pts = pkt->pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
278 entries[new_entry].tracknum = pkt->stream_index + 1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
279 entries[new_entry].cluster_pos = cluster_pos - cues->segment_offset;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
280
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
281 cues->entries = entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
282 cues->num_entries++;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
283 return 0;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
284 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
285
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
286 static offset_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
287 {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
288 offset_t currentpos, cues_element;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
289 int i, j;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
290
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
291 currentpos = url_ftell(pb);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
292 cues_element = start_ebml_master(pb, MATROSKA_ID_CUES);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
293
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
294 for (i = 0; i < cues->num_entries; i++) {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
295 offset_t cuepoint, track_positions;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
296 mkv_cuepoint *entry = &cues->entries[i];
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
297 uint64_t pts = entry->pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
298
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
299 cuepoint = start_ebml_master(pb, MATROSKA_ID_POINTENTRY);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
300 put_ebml_uint(pb, MATROSKA_ID_CUETIME, pts);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
301
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
302 // put all the entries from different tracks that have the exact same
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
303 // timestamp into the same CuePoint
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
304 for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
305 track_positions = start_ebml_master(pb, MATROSKA_ID_CUETRACKPOSITION);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
306 put_ebml_uint(pb, MATROSKA_ID_CUETRACK , entry[j].tracknum );
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
307 put_ebml_uint(pb, MATROSKA_ID_CUECLUSTERPOSITION, entry[j].cluster_pos);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
308 end_ebml_master(pb, track_positions);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
309 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
310 i += j - 1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
311 end_ebml_master(pb, cuepoint);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
312 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
313 end_ebml_master(pb, cues_element);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
314
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
315 av_free(cues->entries);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
316 av_free(cues);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
317 return currentpos;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
318 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
319
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
320 static int put_xiph_codecpriv(ByteIOContext *pb, AVCodecContext *codec)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
321 {
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
322 offset_t codecprivate;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
323 uint8_t *header_start[3];
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
324 int header_len[3];
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
325 int first_header_size;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
326 int j, k;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
327
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
328 if (codec->codec_id == CODEC_ID_VORBIS)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
329 first_header_size = 30;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
330 else
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
331 first_header_size = 42;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
332
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
333 if (ff_split_xiph_headers(codec->extradata, codec->extradata_size,
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
334 first_header_size, header_start, header_len) < 0) {
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
335 av_log(codec, AV_LOG_ERROR, "Extradata corrupt.\n");
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
336 return -1;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
337 }
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
338
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
339 codecprivate = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE);
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
340 put_byte(pb, 2); // number packets - 1
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
341 for (j = 0; j < 2; j++) {
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
342 for (k = 0; k < header_len[j] / 255; k++)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
343 put_byte(pb, 255);
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
344 put_byte(pb, header_len[j] % 255);
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
345 }
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
346 for (j = 0; j < 3; j++)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
347 put_buffer(pb, header_start[j], header_len[j]);
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
348 end_ebml_master(pb, codecprivate);
2446
b2f9523ee424 Make sure to return a value in functions that return a value
conrad
parents: 2445
diff changeset
349
b2f9523ee424 Make sure to return a value in functions that return a value
conrad
parents: 2445
diff changeset
350 return 0;
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
351 }
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
352
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
353 static int mkv_write_tracks(AVFormatContext *s)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
354 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
355 MatroskaMuxContext *mkv = s->priv_data;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
356 ByteIOContext *pb = &s->pb;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
357 offset_t tracks;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
358 int i, j;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
359
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
360 if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, url_ftell(pb)) < 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
361 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
362
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
363 tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
364 for (i = 0; i < s->nb_streams; i++) {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
365 AVStream *st = s->streams[i];
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
366 AVCodecContext *codec = st->codec;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
367 offset_t subinfo, track;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
368 int native_id = 0;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
369
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
370 track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY);
2439
04ae6910d903 Track number and UID only have to be nonzero
conrad
parents: 2438
diff changeset
371 put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
04ae6910d903 Track number and UID only have to be nonzero
conrad
parents: 2438
diff changeset
372 put_ebml_uint (pb, MATROSKA_ID_TRACKUID , i + 1);
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
373 put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
374
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
375 if (st->language[0])
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
376 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
377
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
378 // look for a codec id string specific to mkv to use, if none are found, use AVI codes
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
379 for (j = 0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) {
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
380 if (ff_mkv_codec_tags[j].id == codec->codec_id) {
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
381 put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
382 native_id = 1;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
383 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
384 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
385 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
386
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
387 // XXX: CodecPrivate for vorbis, theora, aac, native mpeg4, ...
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
388 if (native_id) {
2435
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
389 if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
390 if (put_xiph_codecpriv(pb, codec) < 0)
2435
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
391 return -1;
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
392 } else {
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
393 put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size);
4dde24899d01 Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents: 2434
diff changeset
394 }
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
395 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
396
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
397 switch (codec->codec_type) {
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
398 case CODEC_TYPE_VIDEO:
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
399 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
400
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
401 if (!native_id) {
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
402 offset_t bmp_header;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
403 // if there is no mkv-specific codec id, use VFW mode
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
404 if (!codec->codec_tag)
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
405 codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
406
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
407 put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
408 // XXX: codec private isn't a master; is there a better way to re-use put_bmp_header?
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
409 bmp_header = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
410 put_bmp_header(pb, codec, codec_bmp_tags, 0);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
411 end_ebml_master(pb, bmp_header);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
412 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
413 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
414 // XXX: interlace flag?
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
415 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
416 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
417 // XXX: display width/height
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
418 end_ebml_master(pb, subinfo);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
419 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
420
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
421 case CODEC_TYPE_AUDIO:
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
422 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
423
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
424 // XXX: A_MS/ACM
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
425 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
426 put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
427 put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, codec->sample_rate);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
428 // XXX: output sample freq (for sbr) and bitdepth (for pcm)
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
429 end_ebml_master(pb, subinfo);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
430 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
431
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
432 default:
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
433 av_log(s, AV_LOG_ERROR, "Only audio and video are supported for Matroska.");
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
434 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
435 }
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
436 end_ebml_master(pb, track);
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
437
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
438 // ms precision is the de-facto standard timescale for mkv files
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
439 av_set_pts_info(st, 64, 1, 1000);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
440 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
441 end_ebml_master(pb, tracks);
2446
b2f9523ee424 Make sure to return a value in functions that return a value
conrad
parents: 2445
diff changeset
442 return 0;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
443 }
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
444
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
445 static int mkv_write_header(AVFormatContext *s)
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
446 {
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
447 MatroskaMuxContext *mkv = s->priv_data;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
448 ByteIOContext *pb = &s->pb;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
449 offset_t ebml_header, segment_info;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
450
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
451 ebml_header = start_ebml_master(pb, EBML_ID_HEADER);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
452 put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
453 put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
454 put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
455 put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
456 put_ebml_string (pb, EBML_ID_DOCTYPE , "matroska");
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
457 put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
458 put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
459 end_ebml_master(pb, ebml_header);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
460
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
461 mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
462 mkv->segment_offset = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
463
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
464 // we write 2 seek heads - one at the end of the file to point to each cluster, and
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
465 // one at the beginning to point to all other level one elements (including the seek
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
466 // head at the end of the file), which isn't more than 10 elements if we only write one
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
467 // of each other currently defined level 1 element
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
468 mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
469 mkv->cluster_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 0);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
470
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
471 if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, url_ftell(pb)) < 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
472 return -1;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
473
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
474 segment_info = start_ebml_master(pb, MATROSKA_ID_INFO);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
475 put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
476 if (strlen(s->title))
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
477 put_ebml_string(pb, MATROSKA_ID_TITLE, s->title);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
478 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
479 put_ebml_string(pb, MATROSKA_ID_MUXINGAPP, LIBAVFORMAT_IDENT);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
480 // XXX: both are required; something better for writing app?
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
481 put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
482 }
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
483 // XXX: segment UID
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
484 // reserve space for the duration
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
485 mkv->duration = 0;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
486 mkv->duration_offset = url_ftell(pb);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
487 put_ebml_void(pb, 11); // assumes double-precision float to be written
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
488 end_ebml_master(pb, segment_info);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
489
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
490 if (mkv_write_tracks(s) < 0)
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
491 return -1;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
492
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
493 if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
494 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
495
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
496 mkv->cluster_pos = url_ftell(pb);
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
497 mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER);
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
498 put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, 0);
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
499 mkv->cluster_pts = 0;
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
500
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
501 mkv->cues = mkv_start_cues(mkv->segment_offset);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
502 if (mkv->cues == NULL)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
503 return -1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
504
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
505 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
506 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
507
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
508 static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
509 {
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
510 MatroskaMuxContext *mkv = s->priv_data;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
511 ByteIOContext *pb = &s->pb;
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
512
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
513 // start a new cluster every 5 MB or 5 sec
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
514 if (url_ftell(pb) > mkv->cluster + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
515 end_ebml_master(pb, mkv->cluster);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
516
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
517 if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
518 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
519
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
520 mkv->cluster_pos = url_ftell(pb);
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
521 mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER);
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
522 put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, pkt->pts);
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
523 mkv->cluster_pts = pkt->pts;
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
524 }
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
525
2449
1226842f8de0 Calculate the size of a SimpleBlock before writing it so that bytes aren't wasted in writing the size
conrad
parents: 2448
diff changeset
526 put_ebml_id(pb, MATROSKA_ID_SIMPLEBLOCK);
1226842f8de0 Calculate the size of a SimpleBlock before writing it so that bytes aren't wasted in writing the size
conrad
parents: 2448
diff changeset
527 put_ebml_size(pb, pkt->size + 4, 0);
2439
04ae6910d903 Track number and UID only have to be nonzero
conrad
parents: 2438
diff changeset
528 put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
529 put_be16(pb, pkt->pts - mkv->cluster_pts);
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
530 put_byte(pb, !!(pkt->flags & PKT_FLAG_KEY));
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
531 put_buffer(pb, pkt->data, pkt->size);
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
532
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
533 if (s->streams[pkt->stream_index]->codec->codec_type == CODEC_TYPE_VIDEO && pkt->flags & PKT_FLAG_KEY) {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
534 if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
535 return -1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
536 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
537
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
538 mkv->duration = pkt->pts + pkt->duration;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
539 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
540 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
541
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
542 static int mkv_write_trailer(AVFormatContext *s)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
543 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
544 MatroskaMuxContext *mkv = s->priv_data;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
545 ByteIOContext *pb = &s->pb;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
546 offset_t currentpos, second_seekhead, cuespos;
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
547
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
548 end_ebml_master(pb, mkv->cluster);
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
549
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
550 cuespos = mkv_write_cues(pb, mkv->cues);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
551 second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
552
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
553 mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
554 mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
555 mkv_write_seekhead(pb, mkv->main_seekhead);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
556
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
557 // update the duration
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
558 currentpos = url_ftell(pb);
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
559 url_fseek(pb, mkv->duration_offset, SEEK_SET);
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
560 put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration);
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
561 url_fseek(pb, currentpos, SEEK_SET);
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
562
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
563 end_ebml_master(pb, mkv->segment);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
564 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
565 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
566
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
567 AVOutputFormat matroska_muxer = {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
568 "matroska",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
569 "Matroska File Format",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
570 "video/x-matroska",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
571 "mkv",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
572 sizeof(MatroskaMuxContext),
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
573 CODEC_ID_MP2,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
574 CODEC_ID_MPEG4,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
575 mkv_write_header,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
576 mkv_write_packet,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
577 mkv_write_trailer,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
578 .codec_tag = (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, 0},
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
579 };