annotate matroskaenc.c @ 2481:3d34222171b2 libavformat

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