annotate matroskaenc.c @ 2507:048f4f45a84c libavformat

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