Mercurial > libavformat.hg
annotate matroskaenc.c @ 2477:d802e4390b2c libavformat
Doxygenize some comments
author | conrad |
---|---|
date | Wed, 05 Sep 2007 00:24:25 +0000 |
parents | 4121545128f3 |
children | b2dc0bc246f9 |
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" |
2468 | 23 #include "random.h" |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
24 #include "riff.h" |
2435
4dde24899d01
Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents:
2434
diff
changeset
|
25 #include "xiph.h" |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
26 #include "matroska.h" |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
27 |
2447 | 28 typedef struct mkv_seekhead_entry { |
29 unsigned int elementid; | |
30 uint64_t segmentpos; | |
31 } mkv_seekhead_entry; | |
32 | |
33 typedef struct mkv_seekhead { | |
34 offset_t filepos; | |
2450 | 35 offset_t segment_offset; ///< the file offset to the beginning of the segment |
36 int reserved_size; ///< -1 if appending to file | |
2447 | 37 int max_entries; |
38 mkv_seekhead_entry *entries; | |
39 int num_entries; | |
40 } mkv_seekhead; | |
41 | |
2451 | 42 typedef struct { |
43 uint64_t pts; | |
44 int tracknum; | |
45 offset_t cluster_pos; ///< file offset of the cluster containing the block | |
46 } mkv_cuepoint; | |
47 | |
48 typedef struct { | |
49 offset_t segment_offset; | |
50 mkv_cuepoint *entries; | |
51 int num_entries; | |
52 } mkv_cues; | |
53 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
54 typedef struct MatroskaMuxContext { |
2448 | 55 offset_t segment; |
56 offset_t segment_offset; | |
57 offset_t cluster; | |
2451 | 58 offset_t cluster_pos; ///< file offset of the current cluster |
2448 | 59 uint64_t cluster_pts; |
60 offset_t duration_offset; | |
61 uint64_t duration; | |
2447 | 62 mkv_seekhead *main_seekhead; |
63 mkv_seekhead *cluster_seekhead; | |
2451 | 64 mkv_cues *cues; |
2468 | 65 |
66 AVRandomState rand_state; | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
67 } MatroskaMuxContext; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
68 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
69 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
|
70 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
71 if (id >= 0x3fffff) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
72 put_byte(pb, id >> 24); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
73 if (id >= 0x7fff) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
74 put_byte(pb, id >> 16); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
75 if (id >= 0xff) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
76 put_byte(pb, id >> 8); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
77 put_byte(pb, id); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
78 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
79 |
2447 | 80 static int ebml_id_size(unsigned int id) |
81 { | |
2457 | 82 return (av_log2(id+1)-1)/7+1; |
2447 | 83 } |
84 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
85 // 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
|
86 // 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
|
87 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
|
88 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
89 int bytes = minbytes; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
90 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
91 // 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
|
92 // 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
|
93 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
|
94 |
69e2592531b6
Write unknown size if the size given is too large for EBML (greater than 2^56-1)
conrad
parents:
2439
diff
changeset
|
95 while (size >> (bytes*7 + 7)) bytes++; |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
96 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
97 put_byte(pb, (0x80 >> bytes) | (size >> bytes*8)); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
98 for (bytes -= 1; bytes >= 0; bytes--) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
99 put_byte(pb, size >> bytes*8); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
100 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
101 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
102 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
|
103 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
104 int bytes = 1; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
105 while (val >> bytes*8) bytes++; |
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 put_ebml_id(pb, elementid); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
108 put_ebml_size(pb, bytes, 0); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
109 for (bytes -= 1; bytes >= 0; bytes--) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
110 put_byte(pb, val >> bytes*8); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
111 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
112 |
2430 | 113 static void put_ebml_float(ByteIOContext *pb, unsigned int elementid, double val) |
114 { | |
115 put_ebml_id(pb, elementid); | |
116 put_ebml_size(pb, 8, 0); | |
117 put_be64(pb, av_dbl2int(val)); | |
118 } | |
119 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
120 static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid, |
2429 | 121 const uint8_t *buf, int size) |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
122 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
123 put_ebml_id(pb, elementid); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
124 put_ebml_size(pb, size, 0); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
125 put_buffer(pb, buf, size); |
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 |
2429 | 128 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
|
129 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
130 put_ebml_binary(pb, elementid, str, strlen(str)); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
131 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
132 |
2477 | 133 /** |
134 * Writes a void element of a given size. Useful for reserving space in the file to be | |
135 * written to later. | |
136 * | |
137 * @param size The amount of space to reserve, which must be at least 2. | |
138 */ | |
2442 | 139 static void put_ebml_void(ByteIOContext *pb, uint64_t size) |
140 { | |
141 offset_t currentpos = url_ftell(pb); | |
142 | |
143 if (size < 2) | |
144 return; | |
145 | |
146 put_ebml_id(pb, EBML_ID_VOID); | |
147 // we need to subtract the length needed to store the size from the size we need to reserve | |
148 // so 2 cases, we use 8 bytes to store the size if possible, 1 byte otherwise | |
149 if (size < 10) | |
150 put_ebml_size(pb, size-1, 0); | |
151 else | |
152 put_ebml_size(pb, size-9, 7); | |
153 url_fseek(pb, currentpos + size, SEEK_SET); | |
154 } | |
155 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
156 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
|
157 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
158 put_ebml_id(pb, elementid); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
159 // 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
|
160 // we should be smarter (additional parameter for expected size?) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
161 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
|
162 return url_ftell(pb); |
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 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
165 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
|
166 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
167 offset_t pos = url_ftell(pb); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
168 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
169 url_fseek(pb, start - 8, SEEK_SET); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
170 put_ebml_size(pb, pos - start, 7); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
171 url_fseek(pb, pos, SEEK_SET); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
172 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
173 |
2469 | 174 static void put_xiph_size(ByteIOContext *pb, int size) |
175 { | |
176 int i; | |
177 for (i = 0; i < size / 255; i++) | |
178 put_byte(pb, 255); | |
179 put_byte(pb, size % 255); | |
180 } | |
181 | |
2477 | 182 /** |
183 * Initialize a mkv_seekhead element to be ready to index level 1 Matroska elements. | |
184 * If a maximum number of elements is specified, enough space will be reserved at | |
185 * the current file location to write a seek head of that size. | |
186 * | |
187 * @param segment_offset the absolute offset into the file that the segment begins | |
188 * @param numelements the maximum number of elements that will be indexed by this | |
189 * seek head, 0 if unlimited. | |
190 */ | |
2447 | 191 static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, offset_t segment_offset, int numelements) |
192 { | |
193 mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead)); | |
194 if (new_seekhead == NULL) | |
195 return NULL; | |
196 | |
197 new_seekhead->segment_offset = segment_offset; | |
198 | |
199 if (numelements > 0) { | |
200 new_seekhead->filepos = url_ftell(pb); | |
201 // 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID and size, | |
202 // and 3 bytes to guarantee that an EBML void element will fit afterwards | |
203 // XXX: 28 bytes right now because begin_ebml_master() reserves more than necessary | |
204 new_seekhead->reserved_size = numelements * 28 + 13; | |
205 new_seekhead->max_entries = numelements; | |
206 put_ebml_void(pb, new_seekhead->reserved_size); | |
207 } | |
208 return new_seekhead; | |
209 } | |
210 | |
211 static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos) | |
212 { | |
213 mkv_seekhead_entry *entries = seekhead->entries; | |
214 int new_entry = seekhead->num_entries; | |
215 | |
216 // don't store more elements than we reserved space for | |
217 if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries) | |
218 return -1; | |
219 | |
220 entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry)); | |
221 if (entries == NULL) | |
222 return -1; | |
223 | |
224 entries[new_entry].elementid = elementid; | |
225 entries[new_entry].segmentpos = filepos - seekhead->segment_offset; | |
226 | |
227 seekhead->entries = entries; | |
228 seekhead->num_entries++; | |
229 | |
230 return 0; | |
231 } | |
232 | |
2477 | 233 /** |
234 * Write the seek head to the file and free it. If a maximum number of elements was | |
235 * specified to mkv_start_seekhead(), the seek head will be written at the location | |
236 * reserved for it. Otherwise, it is written at the current location in the file. | |
237 * | |
238 * @return the file offset where the seekhead was written | |
239 */ | |
2447 | 240 static offset_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead) |
241 { | |
242 offset_t metaseek, seekentry, currentpos; | |
243 int i; | |
244 | |
245 currentpos = url_ftell(pb); | |
246 | |
247 if (seekhead->reserved_size > 0) | |
248 url_fseek(pb, seekhead->filepos, SEEK_SET); | |
249 | |
250 metaseek = start_ebml_master(pb, MATROSKA_ID_SEEKHEAD); | |
251 for (i = 0; i < seekhead->num_entries; i++) { | |
252 mkv_seekhead_entry *entry = &seekhead->entries[i]; | |
253 | |
254 seekentry = start_ebml_master(pb, MATROSKA_ID_SEEKENTRY); | |
255 | |
256 put_ebml_id(pb, MATROSKA_ID_SEEKID); | |
257 put_ebml_size(pb, ebml_id_size(entry->elementid), 0); | |
258 put_ebml_id(pb, entry->elementid); | |
259 | |
260 put_ebml_uint(pb, MATROSKA_ID_SEEKPOSITION, entry->segmentpos); | |
261 end_ebml_master(pb, seekentry); | |
262 } | |
263 end_ebml_master(pb, metaseek); | |
264 | |
265 if (seekhead->reserved_size > 0) { | |
266 uint64_t remaining = seekhead->filepos + seekhead->reserved_size - url_ftell(pb); | |
267 put_ebml_void(pb, remaining); | |
268 url_fseek(pb, currentpos, SEEK_SET); | |
269 | |
270 currentpos = seekhead->filepos; | |
271 } | |
272 av_free(seekhead->entries); | |
273 av_free(seekhead); | |
274 | |
275 return currentpos; | |
276 } | |
277 | |
2451 | 278 static mkv_cues * mkv_start_cues(offset_t segment_offset) |
279 { | |
280 mkv_cues *cues = av_mallocz(sizeof(mkv_cues)); | |
281 if (cues == NULL) | |
282 return NULL; | |
283 | |
284 cues->segment_offset = segment_offset; | |
285 return cues; | |
286 } | |
287 | |
288 static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos) | |
289 { | |
290 mkv_cuepoint *entries = cues->entries; | |
291 int new_entry = cues->num_entries; | |
292 | |
293 entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint)); | |
294 if (entries == NULL) | |
295 return -1; | |
296 | |
297 entries[new_entry].pts = pkt->pts; | |
298 entries[new_entry].tracknum = pkt->stream_index + 1; | |
299 entries[new_entry].cluster_pos = cluster_pos - cues->segment_offset; | |
300 | |
301 cues->entries = entries; | |
302 cues->num_entries++; | |
303 return 0; | |
304 } | |
305 | |
306 static offset_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues) | |
307 { | |
308 offset_t currentpos, cues_element; | |
309 int i, j; | |
310 | |
311 currentpos = url_ftell(pb); | |
312 cues_element = start_ebml_master(pb, MATROSKA_ID_CUES); | |
313 | |
314 for (i = 0; i < cues->num_entries; i++) { | |
315 offset_t cuepoint, track_positions; | |
316 mkv_cuepoint *entry = &cues->entries[i]; | |
317 uint64_t pts = entry->pts; | |
318 | |
319 cuepoint = start_ebml_master(pb, MATROSKA_ID_POINTENTRY); | |
320 put_ebml_uint(pb, MATROSKA_ID_CUETIME, pts); | |
321 | |
322 // put all the entries from different tracks that have the exact same | |
323 // timestamp into the same CuePoint | |
324 for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) { | |
325 track_positions = start_ebml_master(pb, MATROSKA_ID_CUETRACKPOSITION); | |
326 put_ebml_uint(pb, MATROSKA_ID_CUETRACK , entry[j].tracknum ); | |
327 put_ebml_uint(pb, MATROSKA_ID_CUECLUSTERPOSITION, entry[j].cluster_pos); | |
328 end_ebml_master(pb, track_positions); | |
329 } | |
330 i += j - 1; | |
331 end_ebml_master(pb, cuepoint); | |
332 } | |
333 end_ebml_master(pb, cues_element); | |
334 | |
335 av_free(cues->entries); | |
336 av_free(cues); | |
337 return currentpos; | |
338 } | |
339 | |
2444
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
340 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
|
341 { |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
342 offset_t codecprivate; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
343 uint8_t *header_start[3]; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
344 int header_len[3]; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
345 int first_header_size; |
2469 | 346 int j; |
2444
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
347 |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
348 if (codec->codec_id == CODEC_ID_VORBIS) |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
349 first_header_size = 30; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
350 else |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
351 first_header_size = 42; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
352 |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
353 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
|
354 first_header_size, header_start, header_len) < 0) { |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
355 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
|
356 return -1; |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
357 } |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
358 |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
359 codecprivate = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE); |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
360 put_byte(pb, 2); // number packets - 1 |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
361 for (j = 0; j < 2; j++) { |
2469 | 362 put_xiph_size(pb, header_len[j]); |
2444
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
363 } |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
364 for (j = 0; j < 3; j++) |
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
365 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
|
366 end_ebml_master(pb, codecprivate); |
2446
b2f9523ee424
Make sure to return a value in functions that return a value
conrad
parents:
2445
diff
changeset
|
367 |
b2f9523ee424
Make sure to return a value in functions that return a value
conrad
parents:
2445
diff
changeset
|
368 return 0; |
2444
d954330691c5
Move Xiph's CodecPrivate writing code to its own function
conrad
parents:
2443
diff
changeset
|
369 } |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
370 |
2470 | 371 #define FLAC_STREAMINFO_SIZE 34 |
372 | |
373 static int put_flac_codecpriv(ByteIOContext *pb, AVCodecContext *codec) | |
374 { | |
375 offset_t codecpriv = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE); | |
376 | |
377 // if the extradata_size is greater than FLAC_STREAMINFO_SIZE, | |
378 // assume that it's in Matroska's format already | |
379 if (codec->extradata_size < FLAC_STREAMINFO_SIZE) { | |
380 av_log(codec, AV_LOG_ERROR, "Invalid FLAC extradata\n"); | |
381 return -1; | |
382 } else if (codec->extradata_size == FLAC_STREAMINFO_SIZE) { | |
383 // only the streaminfo packet | |
384 put_byte(pb, 0); | |
385 put_xiph_size(pb, codec->extradata_size); | |
386 av_log(codec, AV_LOG_ERROR, "Only one packet\n"); | |
387 } | |
388 put_buffer(pb, codec->extradata, codec->extradata_size); | |
389 end_ebml_master(pb, codecpriv); | |
390 return 0; | |
391 } | |
392 | |
2458
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
393 static void get_aac_sample_rates(AVCodecContext *codec, int *sample_rate, int *output_sample_rate) |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
394 { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
395 static const int aac_sample_rates[] = { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
396 96000, 88200, 64000, 48000, 44100, 32000, |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
397 24000, 22050, 16000, 12000, 11025, 8000, |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
398 }; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
399 int sri; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
400 |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
401 if (codec->extradata_size < 2) { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
402 av_log(codec, AV_LOG_WARNING, "no aac extradata, unable to determine sample rate\n"); |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
403 return; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
404 } |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
405 |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
406 sri = ((codec->extradata[0] << 1) & 0xE) | (codec->extradata[1] >> 7); |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
407 if (sri > 12) { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
408 av_log(codec, AV_LOG_WARNING, "aac samplerate index out of bounds\n"); |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
409 return; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
410 } |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
411 *sample_rate = aac_sample_rates[sri]; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
412 |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
413 // if sbr, get output sample rate as well |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
414 if (codec->extradata_size == 5) { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
415 sri = (codec->extradata[4] >> 3) & 0xF; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
416 if (sri > 12) { |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
417 av_log(codec, AV_LOG_WARNING, "aac output samplerate index out of bounds\n"); |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
418 return; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
419 } |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
420 *output_sample_rate = aac_sample_rates[sri]; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
421 } |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
422 } |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
423 |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
424 static int mkv_write_tracks(AVFormatContext *s) |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
425 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
426 MatroskaMuxContext *mkv = s->priv_data; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
427 ByteIOContext *pb = &s->pb; |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
428 offset_t tracks; |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
429 int i, j; |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
430 |
2447 | 431 if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, url_ftell(pb)) < 0) |
432 return -1; | |
433 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
434 tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
435 for (i = 0; i < s->nb_streams; i++) { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
436 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
|
437 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
|
438 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
|
439 int native_id = 0; |
2454 | 440 int bit_depth = av_get_bits_per_sample(codec->codec_id); |
2458
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
441 int sample_rate = codec->sample_rate; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
442 int output_sample_rate = 0; |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
443 |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
444 if (codec->codec_id == CODEC_ID_AAC) |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
445 get_aac_sample_rates(codec, &sample_rate, &output_sample_rate); |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
446 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
447 track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY); |
2439 | 448 put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1); |
449 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
|
450 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
|
451 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
452 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
|
453 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language); |
2476
4121545128f3
Set the language to undefined if no language specified
conrad
parents:
2475
diff
changeset
|
454 else |
4121545128f3
Set the language to undefined if no language specified
conrad
parents:
2475
diff
changeset
|
455 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und"); |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
456 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
457 // 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
|
458 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
|
459 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
|
460 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
|
461 native_id = 1; |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
462 break; |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
463 } |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
464 } |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
465 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
466 if (native_id) { |
2435
4dde24899d01
Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents:
2434
diff
changeset
|
467 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
|
468 if (put_xiph_codecpriv(pb, codec) < 0) |
2435
4dde24899d01
Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents:
2434
diff
changeset
|
469 return -1; |
2470 | 470 } else if (codec->codec_id == CODEC_ID_FLAC) { |
471 if (put_flac_codecpriv(pb, codec) < 0) | |
472 return -1; | |
2459 | 473 } else if (codec->extradata_size) { |
2435
4dde24899d01
Correctly write CodecPrivate element for Vorbis and Theora
conrad
parents:
2434
diff
changeset
|
474 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
|
475 } |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
476 } |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
477 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
478 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
|
479 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
|
480 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
|
481 |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
482 if (!native_id) { |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
483 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
|
484 // 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
|
485 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
|
486 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
|
487 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 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
|
492 } |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
493 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
|
494 // XXX: interlace flag? |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
495 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
|
496 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height); |
2473 | 497 if (codec->sample_aspect_ratio.num) { |
498 put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , codec->sample_aspect_ratio.num); | |
499 put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->sample_aspect_ratio.den); | |
500 } | |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
501 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
|
502 break; |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
503 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
504 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
|
505 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
|
506 |
2452
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
507 if (!native_id) { |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
508 offset_t wav_header; |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
509 // no mkv-specific ID, use ACM mode |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
510 codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
511 if (!codec->codec_tag) { |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
512 av_log(s, AV_LOG_ERROR, "no codec id found for stream %d", i); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
513 return -1; |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
514 } |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
515 |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
516 put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
517 wav_header = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
518 put_wav_header(pb, codec); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
519 end_ebml_master(pb, wav_header); |
1b6ea48f7f24
Write wav header if there is no native audio codec ID
conrad
parents:
2451
diff
changeset
|
520 } |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
521 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
|
522 put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels); |
2458
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
523 put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate); |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
524 if (output_sample_rate) |
7286ab3bf026
Determine the output sample rate for SBR AAC and write it
conrad
parents:
2457
diff
changeset
|
525 put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate); |
2453 | 526 if (bit_depth) |
527 put_ebml_uint(pb, MATROSKA_ID_AUDIOBITDEPTH, bit_depth); | |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
528 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
|
529 break; |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
530 |
2461 | 531 case CODEC_TYPE_SUBTITLE: |
532 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE); | |
533 break; | |
2432
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
534 default: |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
535 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
|
536 break; |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
537 } |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
538 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
|
539 |
68743e7fa627
First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents:
2431
diff
changeset
|
540 // 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
|
541 av_set_pts_info(st, 64, 1, 1000); |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
542 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
543 end_ebml_master(pb, tracks); |
2446
b2f9523ee424
Make sure to return a value in functions that return a value
conrad
parents:
2445
diff
changeset
|
544 return 0; |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
545 } |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
546 |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
547 static int mkv_write_header(AVFormatContext *s) |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
548 { |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
549 MatroskaMuxContext *mkv = s->priv_data; |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
550 ByteIOContext *pb = &s->pb; |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
551 offset_t ebml_header, segment_info; |
2468 | 552 int i; |
553 | |
554 av_init_random(av_gettime(), &mkv->rand_state); | |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
555 |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
556 ebml_header = start_ebml_master(pb, EBML_ID_HEADER); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
557 put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
558 put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
559 put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
560 put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
561 put_ebml_string (pb, EBML_ID_DOCTYPE , "matroska"); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
562 put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
563 put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
564 end_ebml_master(pb, ebml_header); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
565 |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
566 mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT); |
2447 | 567 mkv->segment_offset = url_ftell(pb); |
568 | |
569 // we write 2 seek heads - one at the end of the file to point to each cluster, and | |
570 // one at the beginning to point to all other level one elements (including the seek | |
571 // head at the end of the file), which isn't more than 10 elements if we only write one | |
572 // of each other currently defined level 1 element | |
573 mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10); | |
574 mkv->cluster_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 0); | |
575 | |
576 if (mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, url_ftell(pb)) < 0) | |
577 return -1; | |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
578 |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
579 segment_info = start_ebml_master(pb, MATROSKA_ID_INFO); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
580 put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
581 if (strlen(s->title)) |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
582 put_ebml_string(pb, MATROSKA_ID_TITLE, s->title); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
583 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { |
2468 | 584 uint8_t segmentuid[16]; |
585 for (i = 0; i < 16; i++) | |
586 segmentuid[i] = av_random(&mkv->rand_state); | |
587 | |
2466 | 588 put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
589 put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); |
2468 | 590 put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segmentuid, 16); |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
591 } |
2468 | 592 |
2445
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
593 // reserve space for the duration |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
594 mkv->duration = 0; |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
595 mkv->duration_offset = url_ftell(pb); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
596 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
|
597 end_ebml_master(pb, segment_info); |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
598 |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
599 if (mkv_write_tracks(s) < 0) |
86466f60fc5d
Move writing the tracks element to its own function
conrad
parents:
2444
diff
changeset
|
600 return -1; |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
601 |
2447 | 602 if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0) |
603 return -1; | |
604 | |
2451 | 605 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
|
606 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
|
607 put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, 0); |
2437 | 608 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
|
609 |
2451 | 610 mkv->cues = mkv_start_cues(mkv->segment_offset); |
611 if (mkv->cues == NULL) | |
612 return -1; | |
613 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
614 return 0; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
615 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
616 |
2460 | 617 static void mkv_write_block(AVFormatContext *s, unsigned int blockid, AVPacket *pkt, int flags) |
618 { | |
619 MatroskaMuxContext *mkv = s->priv_data; | |
620 ByteIOContext *pb = &s->pb; | |
621 | |
2474 | 622 av_log(s, AV_LOG_DEBUG, "Writing block at offset %llu, size %d, pts %lld, dts %lld, duration %d, flags %d\n", |
623 url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags); | |
2460 | 624 put_ebml_id(pb, blockid); |
625 put_ebml_size(pb, pkt->size + 4, 0); | |
626 put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 | |
627 put_be16(pb, pkt->pts - mkv->cluster_pts); | |
628 put_byte(pb, flags); | |
629 put_buffer(pb, pkt->data, pkt->size); | |
630 } | |
631 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
632 static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
633 { |
2437 | 634 MatroskaMuxContext *mkv = s->priv_data; |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
635 ByteIOContext *pb = &s->pb; |
2463 | 636 AVCodecContext *codec = s->streams[pkt->stream_index]->codec; |
2455 | 637 int keyframe = !!(pkt->flags & PKT_FLAG_KEY); |
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
|
638 |
2437 | 639 // start a new cluster every 5 MB or 5 sec |
640 if (url_ftell(pb) > mkv->cluster + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) { | |
2474 | 641 av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %llu bytes, pts %llu\n", url_ftell(pb), pkt->pts); |
2437 | 642 end_ebml_master(pb, mkv->cluster); |
2447 | 643 |
644 if (mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)) < 0) | |
645 return -1; | |
646 | |
2451 | 647 mkv->cluster_pos = url_ftell(pb); |
2437 | 648 mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER); |
649 put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, pkt->pts); | |
650 mkv->cluster_pts = pkt->pts; | |
651 } | |
652 | |
2463 | 653 if (codec->codec_type != CODEC_TYPE_SUBTITLE) { |
2462 | 654 mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); |
2461 | 655 } else { |
656 offset_t blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP); | |
657 mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0); | |
658 put_ebml_uint(pb, MATROSKA_ID_DURATION, pkt->duration); | |
659 end_ebml_master(pb, blockgroup); | |
660 } | |
2443 | 661 |
2463 | 662 if (codec->codec_type == CODEC_TYPE_VIDEO && keyframe) { |
2451 | 663 if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0) |
664 return -1; | |
665 } | |
666 | |
2443 | 667 mkv->duration = pkt->pts + pkt->duration; |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
668 return 0; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
669 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
670 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
671 static int mkv_write_trailer(AVFormatContext *s) |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
672 { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
673 MatroskaMuxContext *mkv = s->priv_data; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
674 ByteIOContext *pb = &s->pb; |
2451 | 675 offset_t currentpos, second_seekhead, cuespos; |
2443 | 676 |
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
|
677 end_ebml_master(pb, mkv->cluster); |
2443 | 678 |
2451 | 679 cuespos = mkv_write_cues(pb, mkv->cues); |
2447 | 680 second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead); |
2451 | 681 |
682 mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos); | |
2447 | 683 mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead); |
684 mkv_write_seekhead(pb, mkv->main_seekhead); | |
685 | |
2443 | 686 // update the duration |
2474 | 687 av_log(s, AV_LOG_DEBUG, "end duration = %llu\n", mkv->duration); |
2443 | 688 currentpos = url_ftell(pb); |
689 url_fseek(pb, mkv->duration_offset, SEEK_SET); | |
690 put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration); | |
691 url_fseek(pb, currentpos, SEEK_SET); | |
692 | |
2425
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
693 end_ebml_master(pb, mkv->segment); |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
694 return 0; |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
695 } |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
696 |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
697 AVOutputFormat matroska_muxer = { |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
698 "matroska", |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
699 "Matroska File Format", |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
700 "video/x-matroska", |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
701 "mkv", |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
702 sizeof(MatroskaMuxContext), |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
703 CODEC_ID_MP2, |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
704 CODEC_ID_MPEG4, |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
705 mkv_write_header, |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
706 mkv_write_packet, |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
707 mkv_write_trailer, |
8c51e92edd7d
Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff
changeset
|
708 .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
|
709 }; |
2475 | 710 |
711 AVOutputFormat matroska_audio_muxer = { | |
712 "matroska", | |
713 "Matroska File Format", | |
714 "audio/x-matroska", | |
715 "mka", | |
716 sizeof(MatroskaMuxContext), | |
717 CODEC_ID_MP2, | |
718 CODEC_ID_NONE, | |
719 mkv_write_header, | |
720 mkv_write_packet, | |
721 mkv_write_trailer, | |
722 .codec_tag = (const AVCodecTag*[]){codec_wav_tags, 0}, | |
723 }; |