annotate matroskaenc.c @ 3152:1d9a55c8d259 libavformat

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