annotate matroskaenc.c @ 5746:89acf6c8fe9f libavformat

Fix indentation
author conrad
date Thu, 04 Mar 2010 08:53:11 +0000
parents c31eb582165d
children 551765b1772b
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"
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
23 #include "riff.h"
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
24 #include "isom.h"
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
25 #include "matroska.h"
2923
0fde8da65761 Use the isom avcc formatting for h264 extradata in matroska.
aurel
parents: 2771
diff changeset
26 #include "avc.h"
4581
c52d40f0a955 Share the function to write a raw FLAC header and use it in the Matroska
jbr
parents: 4578
diff changeset
27 #include "flacenc.h"
4201
7d2f3f1b68d8 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 4002
diff changeset
28 #include "libavutil/intreadwrite.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3271
diff changeset
29 #include "libavutil/md5.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3271
diff changeset
30 #include "libavcodec/xiph.h"
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
31 #include "libavcodec/mpeg4audio.h"
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
32
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
33 typedef struct ebml_master {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
34 int64_t pos; ///< absolute offset in the file where the master's elements start
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
35 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
36 } 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
37
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
38 typedef struct mkv_seekhead_entry {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
39 unsigned int elementid;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
40 uint64_t segmentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
41 } mkv_seekhead_entry;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
42
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
43 typedef struct mkv_seekhead {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
44 int64_t filepos;
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
45 int64_t segment_offset; ///< the file offset to the beginning of the segment
2450
8ac88c6c10e4 Doxygenize comments
conrad
parents: 2449
diff changeset
46 int reserved_size; ///< -1 if appending to file
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
47 int max_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
48 mkv_seekhead_entry *entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
49 int num_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
50 } mkv_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
51
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
52 typedef struct {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
53 uint64_t pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
54 int tracknum;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
55 int64_t cluster_pos; ///< file offset of the cluster containing the block
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
56 } mkv_cuepoint;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
57
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
58 typedef struct {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
59 int64_t segment_offset;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
60 mkv_cuepoint *entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
61 int num_entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
62 } mkv_cues;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
63
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
64 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
65 ebml_master segment;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
66 int64_t segment_offset;
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
67 int64_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
68 ebml_master cluster;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
69 int64_t cluster_pos; ///< file offset of the current cluster
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
70 uint64_t cluster_pts;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
71 int64_t duration_offset;
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
72 uint64_t duration;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
73 mkv_seekhead *main_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
74 mkv_seekhead *cluster_seekhead;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
75 mkv_cues *cues;
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
76
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
77 struct AVMD5 *md5_ctx;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
78 } MatroskaMuxContext;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
79
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
80
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
81 /** 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
82 * 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
83 #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
84
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
85 /** per-cuepoint-track - 3 1-byte EBML IDs, 3 1-byte EBML sizes, 2
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
86 * 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
87 #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
88
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
89 /** 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
90 #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
91
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
92
2481
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
93 static int ebml_id_size(unsigned int id)
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
94 {
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
95 return (av_log2(id+1)-1)/7+1;
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
96 }
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
97
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
98 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
99 {
2482
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
100 int i = ebml_id_size(id);
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
101 while (i--)
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
102 put_byte(pb, id >> (i*8));
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
103 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
104
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
105 /**
2530
9e93e15ea3c1 spelling/wording nits in some Doxygen comments
diego
parents: 2519
diff changeset
106 * Write an EBML size meaning "unknown size".
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
107 *
2530
9e93e15ea3c1 spelling/wording nits in some Doxygen comments
diego
parents: 2519
diff changeset
108 * @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
109 */
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
110 static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
111 {
2497
5da824da8e3e Use assert for conditions that must be true
conrad
parents: 2496
diff changeset
112 assert(bytes <= 8);
2496
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
113 put_byte(pb, 0x1ff >> bytes);
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
114 while (--bytes)
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
115 put_byte(pb, 0xff);
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
116 }
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
117
2484
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
118 /**
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
119 * 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
120 */
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
121 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
122 {
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
123 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
124 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
125 return bytes;
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
126 }
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
127
2487
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
128 /**
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
129 * 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
130 *
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
131 * @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
132 * 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
133 */
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
134 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
135 {
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
136 int i, needed_bytes = ebml_num_size(num);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
137
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
138 // 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
139 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
140
2487
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
141 if (bytes == 0)
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
142 // 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
143 bytes = needed_bytes;
2498
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
144 // the bytes needed to write the given size would exceed the bytes
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
145 // 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
146 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
147
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
148 num |= 1ULL << bytes*7;
2485
d0a635b1ae35 Simplify
conrad
parents: 2484
diff changeset
149 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
150 put_byte(pb, num >> i*8);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
151 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
152
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
153 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
154 {
2483
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
155 int i, bytes = 1;
3097
298c49463701 simplification proposed by Rich
aurel
parents: 3089
diff changeset
156 uint64_t tmp = val;
298c49463701 simplification proposed by Rich
aurel
parents: 3089
diff changeset
157 while (tmp>>=8) bytes++;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
158
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
159 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
160 put_ebml_num(pb, bytes, 0);
2483
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
161 for (i = bytes - 1; i >= 0; i--)
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
162 put_byte(pb, val >> i*8);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
163 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
164
2430
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
165 static void put_ebml_float(ByteIOContext *pb, unsigned int elementid, double val)
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
166 {
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
167 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
168 put_ebml_num(pb, 8, 0);
2430
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
169 put_be64(pb, av_dbl2int(val));
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
170 }
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
171
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
172 static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid,
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
173 const uint8_t *buf, int size)
2425
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 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
176 put_ebml_num(pb, size, 0);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
177 put_buffer(pb, buf, size);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
178 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
179
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
180 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
181 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
182 put_ebml_binary(pb, elementid, str, strlen(str));
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
183 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
184
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
185 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
186 * Writes a void element of a given size. Useful for reserving space in
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
187 * the file to be written to later.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
188 *
2491
51d707a515f2 Clarify comments
conrad
parents: 2490
diff changeset
189 * @param size The number of bytes to reserve, which must be at least 2.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
190 */
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
191 static void put_ebml_void(ByteIOContext *pb, uint64_t size)
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
192 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
193 int64_t currentpos = url_ftell(pb);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
194
2497
5da824da8e3e Use assert for conditions that must be true
conrad
parents: 2496
diff changeset
195 assert(size >= 2);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
196
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
197 put_ebml_id(pb, EBML_ID_VOID);
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
198 // we need to subtract the length needed to store the size from the
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
199 // size we need to reserve so 2 cases, we use 8 bytes to store the
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
200 // size if possible, 1 byte otherwise
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
201 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
202 put_ebml_num(pb, size-1, 0);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
203 else
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
204 put_ebml_num(pb, size-9, 8);
2928
bdc992cb8e46 Write 0 instead of seeking forward (and leaving bytes uninitalized),
michael
parents: 2927
diff changeset
205 while(url_ftell(pb) < currentpos + size)
bdc992cb8e46 Write 0 instead of seeking forward (and leaving bytes uninitalized),
michael
parents: 2927
diff changeset
206 put_byte(pb, 0);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
207 }
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
208
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 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
210 {
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
211 int bytes = expectedsize ? ebml_num_size(expectedsize) : 8;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
212 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
213 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
214 return (ebml_master){ url_ftell(pb), bytes };
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
215 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
216
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
217 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
218 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
219 int64_t pos = url_ftell(pb);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
220
5743
0c1e9df4e3cd Attempt seeking to write EBML master sizes even if streamed
conrad
parents: 5742
diff changeset
221 if (url_fseek(pb, master.pos - master.sizebytes, SEEK_SET) < 0)
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
222 return;
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
223 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
224 url_fseek(pb, pos, SEEK_SET);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
225 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
226
2469
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
227 static void put_xiph_size(ByteIOContext *pb, int size)
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
228 {
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
229 int i;
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
230 for (i = 0; i < size / 255; i++)
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
231 put_byte(pb, 255);
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
232 put_byte(pb, size % 255);
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
233 }
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
234
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
235 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
236 * Initialize a mkv_seekhead element to be ready to index level 1 Matroska
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
237 * elements. If a maximum number of elements is specified, enough space
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
238 * will be reserved at the current file location to write a seek head of
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
239 * that size.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
240 *
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
241 * @param segment_offset The absolute offset to the position in the file
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
242 * where the segment begins.
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
243 * @param numelements The maximum number of elements that will be indexed
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
244 * by this seek head, 0 if unlimited.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
245 */
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
246 static mkv_seekhead * mkv_start_seekhead(ByteIOContext *pb, int64_t segment_offset, int numelements)
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
247 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
248 mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
249 if (new_seekhead == NULL)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
250 return NULL;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
251
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
252 new_seekhead->segment_offset = segment_offset;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
253
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
254 if (numelements > 0) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
255 new_seekhead->filepos = url_ftell(pb);
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
256 // 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
257 // and size, and 3 bytes to guarantee that an EBML void element
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
258 // 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
259 new_seekhead->reserved_size = numelements * MAX_SEEKENTRY_SIZE + 13;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
260 new_seekhead->max_entries = numelements;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
261 put_ebml_void(pb, new_seekhead->reserved_size);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
262 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
263 return new_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
264 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
265
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
266 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
267 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
268 mkv_seekhead_entry *entries = seekhead->entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
269
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
270 // don't store more elements than we reserved space for
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
271 if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
272 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
273
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
274 entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
275 if (entries == NULL)
2499
77d6661f1947 Return AVERROR(ENOMEM) when appropriate
conrad
parents: 2498
diff changeset
276 return AVERROR(ENOMEM);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
277
2507
048f4f45a84c Use num_entries directly rather than mixing it with a local copy
conrad
parents: 2506
diff changeset
278 entries[seekhead->num_entries ].elementid = elementid;
048f4f45a84c Use num_entries directly rather than mixing it with a local copy
conrad
parents: 2506
diff changeset
279 entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
280
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
281 seekhead->entries = entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
282 return 0;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
283 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
284
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
285 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
286 * Write the seek head to the file and free it. If a maximum number of
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
287 * elements was specified to mkv_start_seekhead(), the seek head will
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
288 * be written at the location reserved for it. Otherwise, it is written
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
289 * at the current location in the file.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
290 *
5744
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
291 * @return The file offset where the seekhead was written,
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
292 * -1 if an error occurred.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
293 */
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
294 static int64_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead)
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
295 {
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
296 ebml_master metaseek, seekentry;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
297 int64_t currentpos;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
298 int i;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
299
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
300 currentpos = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
301
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
302 if (seekhead->reserved_size > 0)
5744
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
303 if (url_fseek(pb, seekhead->filepos, SEEK_SET) < 0)
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
304 return -1;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
305
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
306 metaseek = start_ebml_master(pb, MATROSKA_ID_SEEKHEAD, seekhead->reserved_size);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
307 for (i = 0; i < seekhead->num_entries; i++) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
308 mkv_seekhead_entry *entry = &seekhead->entries[i];
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
309
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
310 seekentry = start_ebml_master(pb, MATROSKA_ID_SEEKENTRY, MAX_SEEKENTRY_SIZE);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
311
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
312 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
313 put_ebml_num(pb, ebml_id_size(entry->elementid), 0);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
314 put_ebml_id(pb, entry->elementid);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
315
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
316 put_ebml_uint(pb, MATROSKA_ID_SEEKPOSITION, entry->segmentpos);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
317 end_ebml_master(pb, seekentry);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
318 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
319 end_ebml_master(pb, metaseek);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
320
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
321 if (seekhead->reserved_size > 0) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
322 uint64_t remaining = seekhead->filepos + seekhead->reserved_size - url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
323 put_ebml_void(pb, remaining);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
324 url_fseek(pb, currentpos, SEEK_SET);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
325
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
326 currentpos = seekhead->filepos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
327 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
328 av_free(seekhead->entries);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
329 av_free(seekhead);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
330
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
331 return currentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
332 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
333
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
334 static mkv_cues * mkv_start_cues(int64_t segment_offset)
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
335 {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
336 mkv_cues *cues = av_mallocz(sizeof(mkv_cues));
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
337 if (cues == NULL)
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
338 return NULL;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
339
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
340 cues->segment_offset = segment_offset;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
341 return cues;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
342 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
343
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
344 static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, int64_t cluster_pos)
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
345 {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
346 mkv_cuepoint *entries = cues->entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
347
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
348 entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
349 if (entries == NULL)
2499
77d6661f1947 Return AVERROR(ENOMEM) when appropriate
conrad
parents: 2498
diff changeset
350 return AVERROR(ENOMEM);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
351
2507
048f4f45a84c Use num_entries directly rather than mixing it with a local copy
conrad
parents: 2506
diff changeset
352 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
353 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
354 entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
355
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
356 cues->entries = entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
357 return 0;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
358 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
359
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
360 static int64_t mkv_write_cues(ByteIOContext *pb, mkv_cues *cues, int num_tracks)
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
361 {
2489
3ef5728030da Calculate the size of key EBML master elements beforehand so only just enough size is reserved for the size
conrad
parents: 2488
diff changeset
362 ebml_master cues_element;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
363 int64_t currentpos;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
364 int i, j;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
365
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
366 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
367 cues_element = start_ebml_master(pb, MATROSKA_ID_CUES, 0);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
368
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
369 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
370 ebml_master cuepoint, track_positions;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
371 mkv_cuepoint *entry = &cues->entries[i];
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
372 uint64_t pts = entry->pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
373
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
374 cuepoint = start_ebml_master(pb, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_SIZE(num_tracks));
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
375 put_ebml_uint(pb, MATROSKA_ID_CUETIME, pts);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
376
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
377 // put all the entries from different tracks that have the exact same
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
378 // timestamp into the same CuePoint
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
379 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
380 track_positions = start_ebml_master(pb, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
381 put_ebml_uint(pb, MATROSKA_ID_CUETRACK , entry[j].tracknum );
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
382 put_ebml_uint(pb, MATROSKA_ID_CUECLUSTERPOSITION, entry[j].cluster_pos);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
383 end_ebml_master(pb, track_positions);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
384 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
385 i += j - 1;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
386 end_ebml_master(pb, cuepoint);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
387 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
388 end_ebml_master(pb, cues_element);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
389
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
390 av_free(cues->entries);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
391 av_free(cues);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
392 return currentpos;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
393 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
394
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
395 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
396 {
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
397 uint8_t *header_start[3];
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
398 int header_len[3];
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
399 int first_header_size;
2469
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
400 int j;
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
401
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
402 if (codec->codec_id == CODEC_ID_VORBIS)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
403 first_header_size = 30;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
404 else
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
405 first_header_size = 42;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
406
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
407 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
408 first_header_size, header_start, header_len) < 0) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
409 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
410 return -1;
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
411 }
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
412
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
413 put_byte(pb, 2); // number packets - 1
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
414 for (j = 0; j < 2; j++) {
2469
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
415 put_xiph_size(pb, header_len[j]);
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
416 }
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
417 for (j = 0; j < 3; j++)
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
418 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
419
b2f9523ee424 Make sure to return a value in functions that return a value
conrad
parents: 2445
diff changeset
420 return 0;
2444
d954330691c5 Move Xiph's CodecPrivate writing code to its own function
conrad
parents: 2443
diff changeset
421 }
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
422
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
423 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
424 {
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
425 int sri;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
426
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
427 if (codec->extradata_size < 2) {
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
428 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
429 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
430 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
431
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
432 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
433 if (sri > 12) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
434 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
435 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
436 }
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
437 *sample_rate = ff_mpeg4audio_sample_rates[sri];
2458
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
438
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
439 // 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
440 if (codec->extradata_size == 5) {
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
441 sri = (codec->extradata[4] >> 3) & 0xF;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
442 if (sri > 12) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
443 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
444 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
445 }
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
446 *output_sample_rate = ff_mpeg4audio_sample_rates[sri];
2458
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
447 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
448 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
449
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
450 static int mkv_write_codecprivate(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec, int native_id, int qt_id)
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
451 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
452 ByteIOContext *dyn_cp;
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
453 uint8_t *codecpriv;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
454 int ret, codecpriv_size;
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
455
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
456 ret = url_open_dyn_buf(&dyn_cp);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
457 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
458 return ret;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
459
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
460 if (native_id) {
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
461 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
462 ret = put_xiph_codecpriv(s, dyn_cp, codec);
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
463 else if (codec->codec_id == CODEC_ID_FLAC)
4581
c52d40f0a955 Share the function to write a raw FLAC header and use it in the Matroska
jbr
parents: 4578
diff changeset
464 ret = ff_flac_write_header(dyn_cp, codec);
2923
0fde8da65761 Use the isom avcc formatting for h264 extradata in matroska.
aurel
parents: 2771
diff changeset
465 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
466 ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
467 else if (codec->extradata_size)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
468 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
469 } else if (codec->codec_type == CODEC_TYPE_VIDEO) {
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
470 if (qt_id) {
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
471 if (!codec->codec_tag)
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
472 codec->codec_tag = ff_codec_get_tag(codec_movvideo_tags, codec->codec_id);
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
473 if (codec->extradata_size)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
474 put_buffer(dyn_cp, codec->extradata, codec->extradata_size);
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
475 } else {
5746
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
476 if (!codec->codec_tag)
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
477 codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
478 if (!codec->codec_tag) {
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
479 av_log(s, AV_LOG_ERROR, "No bmp codec ID found.");
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
480 ret = -1;
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
481 }
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
482
5746
89acf6c8fe9f Fix indentation
conrad
parents: 5745
diff changeset
483 ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0);
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
484 }
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
485
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
486 } 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
487 if (!codec->codec_tag)
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
488 codec->codec_tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
489 if (!codec->codec_tag) {
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
490 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
491 ret = -1;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
492 }
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
493
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
494 ff_put_wav_header(dyn_cp, codec);
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
495 }
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
496
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
497 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
498 if (codecpriv_size)
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
499 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
500 av_free(codecpriv);
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
501 return ret;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
502 }
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
503
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
504 static int mkv_write_tracks(AVFormatContext *s)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
505 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
506 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
507 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
508 ebml_master tracks;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
509 int i, j, ret;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
510
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
511 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
512 if (ret < 0) return ret;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
513
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
514 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
515 for (i = 0; i < s->nb_streams; i++) {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
516 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
517 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
518 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
519 int native_id = 0;
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
520 int qt_id = 0;
2454
ad38b19b0f1a Use av_get_bits_per_sample
conrad
parents: 2453
diff changeset
521 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
522 int sample_rate = codec->sample_rate;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
523 int output_sample_rate = 0;
4498
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
524 AVMetadataTag *tag;
2458
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
525
2493
61bc7a789851 Use sample format for bit depth if av_get_bits_per_sample() doesn't give one
conrad
parents: 2492
diff changeset
526 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
527 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
528
2458
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
529 if (codec->codec_id == CODEC_ID_AAC)
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
530 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
531
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
532 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
533 put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
04ae6910d903 Track number and UID only have to be nonzero
conrad
parents: 2438
diff changeset
534 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
535 put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
5573
6aee72615229 mkvenc: Write TrackTimecodeScale
conrad
parents: 5299
diff changeset
536 put_ebml_float(pb, MATROSKA_ID_TRACKTIMECODESCALE, 1.0);
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
537
5742
f50c86f67772 matroskaenc: use "title" tag instead of "description" in track title.
conrad
parents: 5573
diff changeset
538 if ((tag = av_metadata_get(st->metadata, "title", NULL, 0)))
4498
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
539 put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
540 tag = av_metadata_get(st->metadata, "language", NULL, 0);
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
541 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und");
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
542
4240
dff232a64d7c Treat disposition==0 as undefined and don't write the default flag
conrad
parents: 4239
diff changeset
543 if (st->disposition)
4241
c507e877c0ee Cosmetics: indent
conrad
parents: 4240
diff changeset
544 put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
3120
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3097
diff changeset
545
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
546 // look for a codec ID string specific to mkv to use,
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
547 // 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
548 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
549 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
550 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
551 native_id = 1;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
552 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
553 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
554 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
555
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
556 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
557 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
558 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
559
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
560 if (!native_id &&
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
561 ff_codec_get_tag(codec_movvideo_tags, codec->codec_id) &&
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
562 (!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id)
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
563 || codec->codec_id == CODEC_ID_SVQ1
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
564 || codec->codec_id == CODEC_ID_SVQ3
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
565 || codec->codec_id == CODEC_ID_CINEPAK))
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
566 qt_id = 1;
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
567
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
568 if (qt_id)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
569 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
570 else if (!native_id)
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
571 // if there is no mkv-specific codec ID, use VFW mode
3687
494a55f131f3 matroska: expand useless define for MS compat codec id strings
aurel
parents: 3601
diff changeset
572 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
573
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
574 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
575 // XXX: interlace flag?
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_VIDEOPIXELWIDTH , codec->width);
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
577 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3692
diff changeset
578 if (st->sample_aspect_ratio.num) {
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3692
diff changeset
579 int d_width = codec->width*av_q2d(st->sample_aspect_ratio);
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3692
diff changeset
580 put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width);
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3692
diff changeset
581 put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height);
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
3687
494a55f131f3 matroska: expand useless define for MS compat codec id strings
aurel
parents: 3601
diff changeset
591 put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/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 }
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
610 ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_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
5299
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
622 static int mkv_write_chapters(AVFormatContext *s)
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
623 {
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
624 MatroskaMuxContext *mkv = s->priv_data;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
625 ByteIOContext *pb = s->pb;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
626 ebml_master chapters, editionentry;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
627 AVRational scale = {1, 1E9};
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
628 int i, ret;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
629
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
630 if (!s->nb_chapters)
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
631 return 0;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
632
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
633 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, url_ftell(pb));
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
634 if (ret < 0) return ret;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
635
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
636 chapters = start_ebml_master(pb, MATROSKA_ID_CHAPTERS , 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
637 editionentry = start_ebml_master(pb, MATROSKA_ID_EDITIONENTRY, 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
638 put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGDEFAULT, 1);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
639 put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGHIDDEN , 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
640 for (i = 0; i < s->nb_chapters; i++) {
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
641 ebml_master chapteratom, chapterdisplay;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
642 AVChapter *c = s->chapters[i];
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
643 AVMetadataTag *t = NULL;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
644
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
645 chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
646 put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
647 put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART,
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
648 av_rescale_q(c->start, c->time_base, scale));
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
649 put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND,
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
650 av_rescale_q(c->end, c->time_base, scale));
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
651 put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGHIDDEN , 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
652 put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
653 if ((t = av_metadata_get(c->metadata, "title", NULL, 0))) {
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
654 chapterdisplay = start_ebml_master(pb, MATROSKA_ID_CHAPTERDISPLAY, 0);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
655 put_ebml_string(pb, MATROSKA_ID_CHAPSTRING, t->value);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
656 put_ebml_string(pb, MATROSKA_ID_CHAPLANG , "und");
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
657 end_ebml_master(pb, chapterdisplay);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
658 }
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
659 end_ebml_master(pb, chapteratom);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
660 }
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
661 end_ebml_master(pb, editionentry);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
662 end_ebml_master(pb, chapters);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
663 return 0;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
664 }
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
665
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
666 static int mkv_write_header(AVFormatContext *s)
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
667 {
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
668 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
669 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
670 ebml_master ebml_header, segment_info;
4498
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
671 AVMetadataTag *tag;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
672 int ret;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
673
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
674 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
675 av_md5_init(mkv->md5_ctx);
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
676
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
677 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
678 put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
679 put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
680 put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
681 put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
682 put_ebml_string (pb, EBML_ID_DOCTYPE , "matroska");
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
683 put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
684 put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
685 end_ebml_master(pb, ebml_header);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
686
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
687 mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT, 0);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
688 mkv->segment_offset = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
689
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
690 // 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
691 // cluster, and one at the beginning to point to all other level one
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
692 // elements (including the seek head at the end of the file), which
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
693 // isn't more than 10 elements if we only write one of each other
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
694 // currently defined level 1 element
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
695 mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
696 mkv->cluster_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 0);
2500
57954e76863d Check that the seekheads were created
conrad
parents: 2499
diff changeset
697 if (mkv->main_seekhead == NULL || mkv->cluster_seekhead == NULL)
57954e76863d Check that the seekheads were created
conrad
parents: 2499
diff changeset
698 return AVERROR(ENOMEM);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
699
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
700 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
701 if (ret < 0) return ret;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
702
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
703 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
704 put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
4498
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
705 if ((tag = av_metadata_get(s->metadata, "title", NULL, 0)))
d7a7c516f281 matroskaenc: use new metadata API
aurel
parents: 4256
diff changeset
706 put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value);
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
707 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
2466
6395824043bd Cosmetics
conrad
parents: 2465
diff changeset
708 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
709 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
710
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
711 // 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
712 mkv->segment_uid = url_ftell(pb);
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
713 put_ebml_void(pb, 19);
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
714 }
2468
9f5ae944ea07 Write segment UID
conrad
parents: 2467
diff changeset
715
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
716 // reserve space for the duration
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
717 mkv->duration = 0;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
718 mkv->duration_offset = url_ftell(pb);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
719 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
720 end_ebml_master(pb, segment_info);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
721
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
722 ret = mkv_write_tracks(s);
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
723 if (ret < 0) return ret;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
724
5299
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
725 ret = mkv_write_chapters(s);
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
726 if (ret < 0) return ret;
1406417325ea matroskaenc: Add support for writing chapters.
aurel
parents: 5058
diff changeset
727
5744
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
728 if (url_is_streamed(s->pb))
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
729 mkv_write_seekhead(pb, mkv->main_seekhead);
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
730
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
731 mkv->cues = mkv_start_cues(mkv->segment_offset);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
732 if (mkv->cues == NULL)
2499
77d6661f1947 Return AVERROR(ENOMEM) when appropriate
conrad
parents: 2498
diff changeset
733 return AVERROR(ENOMEM);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
734
4239
5d0ac4d87ba1 Flush the buffer after writing the header and when done with writing the files
conrad
parents: 4223
diff changeset
735 put_flush_packet(pb);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
736 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
737 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
738
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
739 static int mkv_blockgroup_size(int pkt_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
740 {
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
741 int size = pkt_size + 4;
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
742 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
743 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
744 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
745 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
746 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
747 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
748 }
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
749
3988
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
750 static int ass_get_duration(const uint8_t *p)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
751 {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
752 int sh, sm, ss, sc, eh, em, es, ec;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
753 uint64_t start, end;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
754
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
755 if (sscanf(p, "%*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d",
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
756 &sh, &sm, &ss, &sc, &eh, &em, &es, &ec) != 8)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
757 return 0;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
758 start = 3600000*sh + 60000*sm + 1000*ss + 10*sc;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
759 end = 3600000*eh + 60000*em + 1000*es + 10*ec;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
760 return end - start;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
761 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
762
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
763 static int mkv_write_ass_blocks(AVFormatContext *s, AVPacket *pkt)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
764 {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
765 MatroskaMuxContext *mkv = s->priv_data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
766 ByteIOContext *pb = s->pb;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
767 int i, layer = 0, max_duration = 0, size, line_size, data_size = pkt->size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
768 uint8_t *start, *end, *data = pkt->data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
769 ebml_master blockgroup;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
770 char buffer[2048];
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
771
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
772 while (data_size) {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
773 int duration = ass_get_duration(data);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
774 max_duration = FFMAX(duration, max_duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
775 end = memchr(data, '\n', data_size);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
776 size = line_size = end ? end-data+1 : data_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
777 size -= end ? (end[-1]=='\r')+1 : 0;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
778 start = data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
779 for (i=0; i<3; i++, start++)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
780 if (!(start = memchr(start, ',', size-(start-data))))
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
781 return max_duration;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
782 size -= start - data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
783 sscanf(data, "Dialogue: %d,", &layer);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
784 i = snprintf(buffer, sizeof(buffer), "%"PRId64",%d,",
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
785 s->streams[pkt->stream_index]->nb_frames++, layer);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
786 size = FFMIN(i+size, sizeof(buffer));
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
787 memcpy(buffer+i, start, size-i);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
788
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
789 av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
790 "pts %" PRId64 ", duration %d\n",
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
791 url_ftell(pb), size, pkt->pts, duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
792 blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
793 put_ebml_id(pb, MATROSKA_ID_BLOCK);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
794 put_ebml_num(pb, size+4, 0);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
795 put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
796 put_be16(pb, pkt->pts - mkv->cluster_pts);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
797 put_byte(pb, 0);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
798 put_buffer(pb, buffer, size);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
799 put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
800 end_ebml_master(pb, blockgroup);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
801
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
802 data += line_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
803 data_size -= line_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
804 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
805
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
806 return max_duration;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
807 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
808
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
809 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
810 {
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
811 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
812 ByteIOContext *pb = s->pb;
4222
0267c4299992 Do not reallocate AVPacket's data when muxing a packet
lucabe
parents: 4201
diff changeset
813 AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
4256
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
814 uint8_t *data = NULL;
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
815 int size = pkt->size;
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
816
2504
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
817 av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
818 "pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n",
2474
f2a36975b73b Add some debug logging
conrad
parents: 2473
diff changeset
819 url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags);
4256
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
820 if (codec->codec_id == CODEC_ID_H264 && codec->extradata_size > 0 &&
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
821 (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1))
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
822 ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
823 else
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
824 data = pkt->data;
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
825 put_ebml_id(pb, blockid);
4256
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
826 put_ebml_num(pb, size+4, 0);
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
827 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
828 put_be16(pb, pkt->pts - mkv->cluster_pts);
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
829 put_byte(pb, flags);
4256
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
830 put_buffer(pb, data, size);
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
831 if (data != pkt->data)
3f5d00cb1f61 matroskaenc: correctly handle h264 streams with 3 bytes nal startcodes
aurel
parents: 4241
diff changeset
832 av_free(data);
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
833 }
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
834
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
835 static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
836 {
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
837 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
838 ByteIOContext *pb = s->pb;
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
839 AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
2455
5589c058b0f9 Simplify
conrad
parents: 2454
diff changeset
840 int keyframe = !!(pkt->flags & PKT_FLAG_KEY);
3892
8f1928b41f45 matroska: subtitle display duration must be stored in pkt->convergence_duration
aurel
parents: 3766
diff changeset
841 int duration = pkt->duration;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
842 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
843
5745
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
844 if (!mkv->cluster_pos) {
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
845 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
846 if (ret < 0) return ret;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
847
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
848 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
849 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
850 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
851 mkv->cluster_pts = pkt->pts;
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
852 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
853 }
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
854
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
855 if (codec->codec_type != CODEC_TYPE_SUBTITLE) {
2462
2ffe818df0c6 Indentation
conrad
parents: 2461
diff changeset
856 mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
3988
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
857 } else if (codec->codec_id == CODEC_ID_SSA) {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
858 duration = mkv_write_ass_blocks(s, pkt);
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
859 } else {
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
860 ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size));
3892
8f1928b41f45 matroska: subtitle display duration must be stored in pkt->convergence_duration
aurel
parents: 3766
diff changeset
861 duration = pkt->convergence_duration;
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
862 mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0);
3987
632514d0ee21 matroskaenc: use correct EBML ID for block duration
aurel
parents: 3986
diff changeset
863 put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
864 end_ebml_master(pb, blockgroup);
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
865 }
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
866
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
867 if (codec->codec_type == CODEC_TYPE_VIDEO && keyframe) {
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
868 ret = mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos);
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
869 if (ret < 0) return ret;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
870 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
871
5745
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
872 // start a new cluster every 5 MB or 5 sec
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
873 if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
874 av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
875 " bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts);
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
876 end_ebml_master(pb, mkv->cluster);
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
877 mkv->cluster_pos = 0;
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
878 }
c31eb582165d Simplify starting and ending clusters
conrad
parents: 5744
diff changeset
879
3892
8f1928b41f45 matroska: subtitle display duration must be stored in pkt->convergence_duration
aurel
parents: 3766
diff changeset
880 mkv->duration = FFMAX(mkv->duration, pkt->pts + duration);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
881 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
882 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
883
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
884 static int mkv_write_trailer(AVFormatContext *s)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
885 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
886 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
887 ByteIOContext *pb = s->pb;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
888 int64_t currentpos, second_seekhead, cuespos;
2502
3230f4c53b17 Always check the return of mkv_add_seekhead_entry
conrad
parents: 2501
diff changeset
889 int ret;
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
890
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
891 end_ebml_master(pb, mkv->cluster);
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
892
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
893 if (!url_is_streamed(pb)) {
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
894 cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
895 second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
896
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
897 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
898 if (ret < 0) return ret;
5744
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
899 if (second_seekhead >= 0) {
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
900 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead);
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
901 if (ret < 0) return ret;
a656843c86aa Write the first seekhead if writing to a stream, we won't be able to seek
conrad
parents: 5743
diff changeset
902 }
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
903 mkv_write_seekhead(pb, mkv->main_seekhead);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
904
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
905 // update the duration
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
906 av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
907 currentpos = url_ftell(pb);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
908 url_fseek(pb, mkv->duration_offset, SEEK_SET);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
909 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
910
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
911 // write the md5sum of some frames as the segment UID
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
912 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
913 uint8_t segment_uid[16];
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
914 av_md5_final(mkv->md5_ctx, segment_uid);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
915 url_fseek(pb, mkv->segment_uid, SEEK_SET);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
916 put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
917 }
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
918 url_fseek(pb, currentpos, SEEK_SET);
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
919 }
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
920
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
921 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
922 av_free(mkv->md5_ctx);
4239
5d0ac4d87ba1 Flush the buffer after writing the header and when done with writing the files
conrad
parents: 4223
diff changeset
923 put_flush_packet(pb);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
924 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
925 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
926
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
927 AVOutputFormat matroska_muxer = {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
928 "matroska",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
929 NULL_IF_CONFIG_SMALL("Matroska file format"),
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
930 "video/x-matroska",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
931 "mkv",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
932 sizeof(MatroskaMuxContext),
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
933 CODEC_ID_MP2,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
934 CODEC_ID_MPEG4,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
935 mkv_write_header,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
936 mkv_write_packet,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
937 mkv_write_trailer,
4567
963e3b76c7a6 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
michael
parents: 4498
diff changeset
938 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
939 .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
2486
5d8e311d7681 Set default subtitle_codec to CODEC_ID_TEXT
conrad
parents: 2485
diff changeset
940 .subtitle_codec = CODEC_ID_TEXT,
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
941 };
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
942
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
943 AVOutputFormat matroska_audio_muxer = {
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
944 "matroska",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
945 NULL_IF_CONFIG_SMALL("Matroska file format"),
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
946 "audio/x-matroska",
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
947 "mka",
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
948 sizeof(MatroskaMuxContext),
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
949 CODEC_ID_MP2,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
950 CODEC_ID_NONE,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
951 mkv_write_header,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
952 mkv_write_packet,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
953 mkv_write_trailer,
4002
65cb6eca2944 matroskaenc: require global header
aurel
parents: 3988
diff changeset
954 .flags = AVFMT_GLOBALHEADER,
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4581
diff changeset
955 .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
956 };