annotate matroskaenc.c @ 4201:7d2f3f1b68d8 libavformat

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
author diego
date Sun, 11 Jan 2009 22:19:48 +0000
parents 65cb6eca2944
children 0267c4299992
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"
4201
7d2f3f1b68d8 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
diego
parents: 4002
diff changeset
27 #include "libavutil/intreadwrite.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3271
diff changeset
28 #include "libavutil/md5.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3271
diff changeset
29 #include "libavcodec/xiph.h"
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
30 #include "libavcodec/mpeg4audio.h"
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
31
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
32 typedef struct ebml_master {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
33 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
34 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
35 } 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
36
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
37 typedef struct mkv_seekhead_entry {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
38 unsigned int elementid;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
39 uint64_t segmentpos;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
40 } mkv_seekhead_entry;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
41
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
42 typedef struct mkv_seekhead {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
43 int64_t filepos;
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
44 int64_t segment_offset; ///< the file offset to the beginning of the segment
2450
8ac88c6c10e4 Doxygenize comments
conrad
parents: 2449
diff changeset
45 int reserved_size; ///< -1 if appending to file
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
46 int max_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
47 mkv_seekhead_entry *entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
48 int num_entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
49 } mkv_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
50
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
51 typedef struct {
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
52 uint64_t pts;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
53 int tracknum;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
54 int64_t cluster_pos; ///< file offset of the cluster containing the block
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
55 } mkv_cuepoint;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
56
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
57 typedef struct {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
58 int64_t segment_offset;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
59 mkv_cuepoint *entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
60 int num_entries;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
61 } mkv_cues;
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
62
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
63 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
64 ebml_master segment;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
65 int64_t segment_offset;
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
66 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
67 ebml_master cluster;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
68 int64_t cluster_pos; ///< file offset of the current cluster
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
69 uint64_t cluster_pts;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
70 int64_t duration_offset;
2448
bc52328116ac Indentation
conrad
parents: 2447
diff changeset
71 uint64_t duration;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
72 mkv_seekhead *main_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
73 mkv_seekhead *cluster_seekhead;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
74 mkv_cues *cues;
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
75
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
76 struct AVMD5 *md5_ctx;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
77 } MatroskaMuxContext;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
78
2489
3ef5728030da Calculate the size of key EBML master elements beforehand so only just enough size is reserved for the size
conrad
parents: 2488
diff changeset
79
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
80 /** 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
81 * 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
82 #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
83
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
84 /** per-cuepoint-track - 3 1-byte EBML IDs, 3 1-byte EBML sizes, 2
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
85 * 8-byte uint max */
2489
3ef5728030da Calculate the size of key EBML master elements beforehand so only just enough size is reserved for the size
conrad
parents: 2488
diff changeset
86 #define MAX_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
87
2506
623cb1c85104 Doxygenify comments
conrad
parents: 2505
diff changeset
88 /** 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
89 #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
90
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
2481
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
92 static int ebml_id_size(unsigned int id)
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
93 {
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
94 return (av_log2(id+1)-1)/7+1;
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
95 }
3d34222171b2 Move ebml_id_size()
conrad
parents: 2480
diff changeset
96
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
97 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
98 {
2482
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
99 int i = ebml_id_size(id);
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
100 while (i--)
d13c92b200a8 Simplify put_ebml_id()
conrad
parents: 2481
diff changeset
101 put_byte(pb, id >> (i*8));
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
102 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
103
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
104 /**
2530
9e93e15ea3c1 spelling/wording nits in some Doxygen comments
diego
parents: 2519
diff changeset
105 * Write an EBML size meaning "unknown size".
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
106 *
2530
9e93e15ea3c1 spelling/wording nits in some Doxygen comments
diego
parents: 2519
diff changeset
107 * @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
108 */
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
109 static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
110 {
2497
5da824da8e3e Use assert for conditions that must be true
conrad
parents: 2496
diff changeset
111 assert(bytes <= 8);
2496
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
112 put_byte(pb, 0x1ff >> bytes);
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
113 while (--bytes)
215eef1f3f37 Simplify
conrad
parents: 2495
diff changeset
114 put_byte(pb, 0xff);
2480
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
115 }
158f2c199956 Correct handling of smaller unknown sizes
conrad
parents: 2479
diff changeset
116
2484
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
117 /**
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
118 * 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
119 */
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
120 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
121 {
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
122 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
123 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
124 return bytes;
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
125 }
60428e4e5242 Move calculating the bytes needed to represent a size in EBML to its own function
conrad
parents: 2483
diff changeset
126
2487
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
127 /**
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
128 * 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
129 *
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
130 * @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
131 * 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
132 */
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
133 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
134 {
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
135 int i, needed_bytes = ebml_num_size(num);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
136
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
137 // 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
138 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
139
2487
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
140 if (bytes == 0)
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
141 // don't care how many bytes are used, so use the min
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
142 bytes = needed_bytes;
2498
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
143 // the bytes needed to write the given size would exceed the bytes
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
144 // that we need to use, so write unknown size. This shouldn't happen.
2497
5da824da8e3e Use assert for conditions that must be true
conrad
parents: 2496
diff changeset
145 assert(bytes >= needed_bytes);
2487
9a9c45b95c6f Modify put_ebml_size() so that the bytes parameter is exact rather than minimum
conrad
parents: 2486
diff changeset
146
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
147 num |= 1ULL << bytes*7;
2485
d0a635b1ae35 Simplify
conrad
parents: 2484
diff changeset
148 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
149 put_byte(pb, num >> i*8);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
150 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
151
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
152 static void put_ebml_uint(ByteIOContext *pb, unsigned int elementid, uint64_t val)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
153 {
2483
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
154 int i, bytes = 1;
3097
298c49463701 simplification proposed by Rich
aurel
parents: 3089
diff changeset
155 uint64_t tmp = val;
298c49463701 simplification proposed by Rich
aurel
parents: 3089
diff changeset
156 while (tmp>>=8) bytes++;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
157
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
158 put_ebml_id(pb, elementid);
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
159 put_ebml_num(pb, bytes, 0);
2483
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
160 for (i = bytes - 1; i >= 0; i--)
d5428813739d Make a byte always mean a byte
conrad
parents: 2482
diff changeset
161 put_byte(pb, val >> i*8);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
162 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
163
2430
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
164 static void put_ebml_float(ByteIOContext *pb, unsigned int elementid, double val)
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
165 {
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
166 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
167 put_ebml_num(pb, 8, 0);
2430
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
168 put_be64(pb, av_dbl2int(val));
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
169 }
da0227bd105a put_ebml_float()
conrad
parents: 2429
diff changeset
170
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
171 static void put_ebml_binary(ByteIOContext *pb, unsigned int elementid,
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
172 const uint8_t *buf, int size)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
173 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
174 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
175 put_ebml_num(pb, size, 0);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
176 put_buffer(pb, buf, size);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
177 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
178
2429
326e6fcf9f85 Const correctness
conrad
parents: 2428
diff changeset
179 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
180 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
181 put_ebml_binary(pb, elementid, str, strlen(str));
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
182 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
183
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
184 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
185 * Writes a void element of a given size. Useful for reserving space in
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
186 * the file to be written to later.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
187 *
2491
51d707a515f2 Clarify comments
conrad
parents: 2490
diff changeset
188 * @param size The number of bytes to reserve, which must be at least 2.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
189 */
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
190 static void put_ebml_void(ByteIOContext *pb, uint64_t size)
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
191 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
192 int64_t currentpos = url_ftell(pb);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
193
2497
5da824da8e3e Use assert for conditions that must be true
conrad
parents: 2496
diff changeset
194 assert(size >= 2);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
195
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
196 put_ebml_id(pb, EBML_ID_VOID);
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
197 // we need to subtract the length needed to store the size from the
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
198 // size we need to reserve so 2 cases, we use 8 bytes to store the
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
199 // size if possible, 1 byte otherwise
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
200 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
201 put_ebml_num(pb, size-1, 0);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
202 else
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
203 put_ebml_num(pb, size-9, 8);
2928
bdc992cb8e46 Write 0 instead of seeking forward (and leaving bytes uninitalized),
michael
parents: 2927
diff changeset
204 while(url_ftell(pb) < currentpos + size)
bdc992cb8e46 Write 0 instead of seeking forward (and leaving bytes uninitalized),
michael
parents: 2927
diff changeset
205 put_byte(pb, 0);
2442
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
206 }
806e9837fea4 put_ebml_void()
conrad
parents: 2441
diff changeset
207
2489
3ef5728030da Calculate the size of key EBML master elements beforehand so only just enough size is reserved for the size
conrad
parents: 2488
diff changeset
208 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
209 {
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
210 int bytes = expectedsize ? ebml_num_size(expectedsize) : 8;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
211 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
212 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
213 return (ebml_master){ url_ftell(pb), bytes };
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
214 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
215
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
216 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
217 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
218 int64_t pos = url_ftell(pb);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
219
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
220 // leave the unknown size for masters when streaming
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
221 if (url_is_streamed(pb))
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
222 return;
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
223
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
224 url_fseek(pb, master.pos - master.sizebytes, SEEK_SET);
2517
ac3e650ec92c Rename ebml size functions to indicate that they can be used for more kinds of numbers
conrad
parents: 2516
diff changeset
225 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
226 url_fseek(pb, pos, SEEK_SET);
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
227 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
228
2469
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
229 static void put_xiph_size(ByteIOContext *pb, int size)
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
230 {
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
231 int i;
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
232 for (i = 0; i < size / 255; i++)
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
233 put_byte(pb, 255);
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
234 put_byte(pb, size % 255);
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
235 }
335446056965 Move writing Xiph-style sizes to its own function
conrad
parents: 2468
diff changeset
236
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
237 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
238 * Initialize a mkv_seekhead element to be ready to index level 1 Matroska
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
239 * elements. If a maximum number of elements is specified, enough space
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
240 * will be reserved at the current file location to write a seek head of
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
241 * that size.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
242 *
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
243 * @param segment_offset The absolute offset to the position in the file
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
244 * where the segment begins.
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
245 * @param numelements The maximum number of elements that will be indexed
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
246 * by this seek head, 0 if unlimited.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
247 */
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
248 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
249 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
250 mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
251 if (new_seekhead == NULL)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
252 return NULL;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
253
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
254 new_seekhead->segment_offset = segment_offset;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
255
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
256 if (numelements > 0) {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
257 new_seekhead->filepos = url_ftell(pb);
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
258 // 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
259 // and size, and 3 bytes to guarantee that an EBML void element
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
260 // 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
261 new_seekhead->reserved_size = numelements * MAX_SEEKENTRY_SIZE + 13;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
262 new_seekhead->max_entries = numelements;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
263 put_ebml_void(pb, new_seekhead->reserved_size);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
264 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
265 return new_seekhead;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
266 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
267
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
268 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
269 {
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
270 mkv_seekhead_entry *entries = seekhead->entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
271
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
272 // don't store more elements than we reserved space for
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
273 if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
274 return -1;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
275
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
276 entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
277 if (entries == NULL)
2499
77d6661f1947 Return AVERROR(ENOMEM) when appropriate
conrad
parents: 2498
diff changeset
278 return AVERROR(ENOMEM);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
279
2507
048f4f45a84c Use num_entries directly rather than mixing it with a local copy
conrad
parents: 2506
diff changeset
280 entries[seekhead->num_entries ].elementid = elementid;
048f4f45a84c Use num_entries directly rather than mixing it with a local copy
conrad
parents: 2506
diff changeset
281 entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
282
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
283 seekhead->entries = entries;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
284 return 0;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
285 }
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
286
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
287 /**
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
288 * Write the seek head to the file and free it. If a maximum number of
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
289 * elements was specified to mkv_start_seekhead(), the seek head will
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
290 * be written at the location reserved for it. Otherwise, it is written
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
291 * at the current location in the file.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
292 *
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
293 * @return The file offset where the seekhead was written.
2477
d802e4390b2c Doxygenize some comments
conrad
parents: 2476
diff changeset
294 */
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
295 static int64_t mkv_write_seekhead(ByteIOContext *pb, mkv_seekhead *seekhead)
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
296 {
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
297 ebml_master metaseek, seekentry;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
298 int64_t currentpos;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
299 int i;
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
300
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
301 currentpos = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
302
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
303 if (seekhead->reserved_size > 0)
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
304 url_fseek(pb, seekhead->filepos, SEEK_SET);
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
2470
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
423 #define FLAC_STREAMINFO_SIZE 34
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
424
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
425 static int put_flac_codecpriv(AVFormatContext *s, ByteIOContext *pb, AVCodecContext *codec)
2470
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
426 {
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
427 // if the extradata_size is greater than FLAC_STREAMINFO_SIZE,
3692
e8f67b6063c3 misc spelling/grammar fixes
diego
parents: 3687
diff changeset
428 // assume that it's in Matroska format already
2470
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
429 if (codec->extradata_size < FLAC_STREAMINFO_SIZE) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
430 av_log(s, AV_LOG_ERROR, "Invalid FLAC extradata\n");
2470
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
431 return -1;
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
432 } else if (codec->extradata_size == FLAC_STREAMINFO_SIZE) {
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
433 // only the streaminfo packet
3271
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
434 put_buffer(pb, "fLaC", 4);
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
435 put_byte(pb, 0x80);
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
436 put_be24(pb, FLAC_STREAMINFO_SIZE);
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
437 } else if(memcmp("fLaC", codec->extradata, 4)) {
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
438 av_log(s, AV_LOG_ERROR, "Invalid FLAC extradata\n");
c702c1c5b890 fix encoding of flac private data
jbr
parents: 3201
diff changeset
439 return -1;
2470
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
440 }
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
441 put_buffer(pb, codec->extradata, codec->extradata_size);
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
442 return 0;
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
443 }
159f87f699a5 Write FLAC codec private correctly
conrad
parents: 2469
diff changeset
444
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
445 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
446 {
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
447 int sri;
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 if (codec->extradata_size < 2) {
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
450 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
451 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
452 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
453
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
454 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
455 if (sri > 12) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
456 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
457 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
458 }
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
459 *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
460
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
461 // 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
462 if (codec->extradata_size == 5) {
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
463 sri = (codec->extradata[4] >> 3) & 0xF;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
464 if (sri > 12) {
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
465 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
466 return;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
467 }
3201
1a16b069daca use common aac sample rate tables
aurel
parents: 3120
diff changeset
468 *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
469 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
470 }
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
471
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
472 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
473 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
474 ByteIOContext *dyn_cp;
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
475 uint8_t *codecpriv;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
476 int ret, codecpriv_size;
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
477
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
478 ret = url_open_dyn_buf(&dyn_cp);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
479 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
480 return ret;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
481
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
482 if (native_id) {
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
483 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
484 ret = put_xiph_codecpriv(s, dyn_cp, codec);
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
485 else if (codec->codec_id == CODEC_ID_FLAC)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
486 ret = put_flac_codecpriv(s, dyn_cp, codec);
2923
0fde8da65761 Use the isom avcc formatting for h264 extradata in matroska.
aurel
parents: 2771
diff changeset
487 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
488 ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
489 else if (codec->extradata_size)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
490 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
491 } else if (codec->codec_type == CODEC_TYPE_VIDEO) {
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
492 if (qt_id) {
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
493 if (!codec->codec_tag)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
494 codec->codec_tag = codec_get_tag(codec_movvideo_tags, codec->codec_id);
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
495 if (codec->extradata_size)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
496 put_buffer(dyn_cp, codec->extradata, codec->extradata_size);
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
497 } else {
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
498 if (!codec->codec_tag)
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
499 codec->codec_tag = codec_get_tag(codec_bmp_tags, codec->codec_id);
2511
0ca390638aa5 Match the behaviour betwen the bmp and wav codec tag lookups
conrad
parents: 2510
diff changeset
500 if (!codec->codec_tag) {
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
501 av_log(s, AV_LOG_ERROR, "No bmp codec ID found.");
2511
0ca390638aa5 Match the behaviour betwen the bmp and wav codec tag lookups
conrad
parents: 2510
diff changeset
502 ret = -1;
0ca390638aa5 Match the behaviour betwen the bmp and wav codec tag lookups
conrad
parents: 2510
diff changeset
503 }
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
504
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
505 put_bmp_header(dyn_cp, codec, codec_bmp_tags, 0);
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
506 }
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
507
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
508 } 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
509 if (!codec->codec_tag)
2512
conrad
parents: 2511
diff changeset
510 codec->codec_tag = codec_get_tag(codec_wav_tags, codec->codec_id);
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
511 if (!codec->codec_tag) {
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
512 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
513 ret = -1;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
514 }
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
515
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
516 put_wav_header(dyn_cp, codec);
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
517 }
2510
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
518
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
519 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
520 if (codecpriv_size)
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
521 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
522 av_free(codecpriv);
4ba8d5f648a4 Write codecprivate to a dynamic buffer so that seeking isn't required
conrad
parents: 2509
diff changeset
523 return ret;
2509
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
524 }
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
525
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
526 static int mkv_write_tracks(AVFormatContext *s)
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
527 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
528 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
529 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
530 ebml_master tracks;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
531 int i, j, ret;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
532
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
533 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
534 if (ret < 0) return ret;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
535
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
536 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
537 for (i = 0; i < s->nb_streams; i++) {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
538 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
539 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
540 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
541 int native_id = 0;
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
542 int qt_id = 0;
2454
ad38b19b0f1a Use av_get_bits_per_sample
conrad
parents: 2453
diff changeset
543 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
544 int sample_rate = codec->sample_rate;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
545 int output_sample_rate = 0;
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
546
2493
61bc7a789851 Use sample format for bit depth if av_get_bits_per_sample() doesn't give one
conrad
parents: 2492
diff changeset
547 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
548 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
549
2458
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
550 if (codec->codec_id == CODEC_ID_AAC)
2518
8d649d879e65 Always use AVFormatContext for av_log messages
conrad
parents: 2517
diff changeset
551 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
552
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
553 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
554 put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
04ae6910d903 Track number and UID only have to be nonzero
conrad
parents: 2438
diff changeset
555 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
556 put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
557
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
558 if (st->language[0])
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
559 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, st->language);
2476
4121545128f3 Set the language to undefined if no language specified
conrad
parents: 2475
diff changeset
560 else
4121545128f3 Set the language to undefined if no language specified
conrad
parents: 2475
diff changeset
561 put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, "und");
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
562
3120
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3097
diff changeset
563 put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3097
diff changeset
564
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
565 // look for a codec ID string specific to mkv to use,
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
566 // 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
567 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
568 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
569 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
570 native_id = 1;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
571 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
572 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
573 }
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
574
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
575 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
576 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
577 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
578
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
579 if (!native_id &&
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
580 codec_get_tag(codec_movvideo_tags, codec->codec_id) &&
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
581 (!codec_get_tag(codec_bmp_tags, codec->codec_id)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
582 || codec->codec_id == CODEC_ID_SVQ1
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
583 || codec->codec_id == CODEC_ID_SVQ3
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
584 || codec->codec_id == CODEC_ID_CINEPAK))
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
585 qt_id = 1;
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
586
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
587 if (qt_id)
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
588 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
589 else if (!native_id)
2519
0ddd5ae4c702 Grammar nits
conrad
parents: 2518
diff changeset
590 // 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
591 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
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_TRACKVIDEO, 0);
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
594 // XXX: interlace flag?
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
595 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
596 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
597 if (st->sample_aspect_ratio.num) {
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3692
diff changeset
598 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
599 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
600 put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height);
2473
e7a1cf0b0693 Write the display size elements
conrad
parents: 2472
diff changeset
601 }
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
602 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
603 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
604
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
605 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
606 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
607
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
608 if (!native_id)
2452
1b6ea48f7f24 Write wav header if there is no native audio codec ID
conrad
parents: 2451
diff changeset
609 // no mkv-specific ID, use ACM mode
3687
494a55f131f3 matroska: expand useless define for MS compat codec id strings
aurel
parents: 3601
diff changeset
610 put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
2513
c4413ad376b9 Get rid of useless braces
conrad
parents: 2512
diff changeset
611
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
612 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
613 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
614 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
615 if (output_sample_rate)
7286ab3bf026 Determine the output sample rate for SBR AAC and write it
conrad
parents: 2457
diff changeset
616 put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
2453
2965cc9aa501 Write bit depth for PCM audio
conrad
parents: 2452
diff changeset
617 if (bit_depth)
2965cc9aa501 Write bit depth for PCM audio
conrad
parents: 2452
diff changeset
618 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
619 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
620 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
621
2498
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
622 case CODEC_TYPE_SUBTITLE:
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
623 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE);
b1cd4cd56eed Indentation
conrad
parents: 2497
diff changeset
624 break;
2432
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
625 default:
2503
9b43d21cc638 Correct message
conrad
parents: 2502
diff changeset
626 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
627 break;
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
628 }
3601
c0955bfc27be matroska: add support for V_QUICKTIME track type
aurel
parents: 3424
diff changeset
629 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
630 if (ret < 0) return ret;
5abcad2566b3 Move writing codec private element to its own function
conrad
parents: 2508
diff changeset
631
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
632 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
633
68743e7fa627 First stab at writing the tracks element, still needs some additional cases for certain codecs
conrad
parents: 2431
diff changeset
634 // 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
635 av_set_pts_info(st, 64, 1, 1000);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
636 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
637 end_ebml_master(pb, tracks);
2446
b2f9523ee424 Make sure to return a value in functions that return a value
conrad
parents: 2445
diff changeset
638 return 0;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
639 }
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
640
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
641 static int mkv_write_header(AVFormatContext *s)
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
642 {
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
643 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
644 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
645 ebml_master ebml_header, segment_info;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
646 int ret;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
647
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
648 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
649 av_md5_init(mkv->md5_ctx);
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
650
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
651 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
652 put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
653 put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
654 put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
655 put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
656 put_ebml_string (pb, EBML_ID_DOCTYPE , "matroska");
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
657 put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
658 put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
659 end_ebml_master(pb, ebml_header);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
660
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
661 mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT, 0);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
662 mkv->segment_offset = url_ftell(pb);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
663
2494
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
664 // 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
665 // cluster, and one at the beginning to point to all other level one
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
666 // elements (including the seek head at the end of the file), which
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
667 // isn't more than 10 elements if we only write one of each other
7dfbd8e0502f Break long comments
conrad
parents: 2493
diff changeset
668 // currently defined level 1 element
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
669 mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10);
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
670 mkv->cluster_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 0);
2500
57954e76863d Check that the seekheads were created
conrad
parents: 2499
diff changeset
671 if (mkv->main_seekhead == NULL || mkv->cluster_seekhead == NULL)
57954e76863d Check that the seekheads were created
conrad
parents: 2499
diff changeset
672 return AVERROR(ENOMEM);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
673
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
674 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
675 if (ret < 0) return ret;
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
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 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
678 put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
679 if (strlen(s->title))
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
680 put_ebml_string(pb, MATROSKA_ID_TITLE, s->title);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
681 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
2466
6395824043bd Cosmetics
conrad
parents: 2465
diff changeset
682 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
683 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
684
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
685 // 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
686 mkv->segment_uid = url_ftell(pb);
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
687 put_ebml_void(pb, 19);
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
688 }
2468
9f5ae944ea07 Write segment UID
conrad
parents: 2467
diff changeset
689
2445
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
690 // reserve space for the duration
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
691 mkv->duration = 0;
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
692 mkv->duration_offset = url_ftell(pb);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
693 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
694 end_ebml_master(pb, segment_info);
86466f60fc5d Move writing the tracks element to its own function
conrad
parents: 2444
diff changeset
695
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
696 ret = mkv_write_tracks(s);
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
697 if (ret < 0) return ret;
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
698
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
699 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
700 if (ret < 0) return ret;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
701
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
702 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
703 mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0);
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
704 put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, 0);
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
705 mkv->cluster_pts = 0;
2433
0c047310f205 Write one cluster and SimpleBlocks for the frames. Should now create playable mkv files for some video codecs (H.264 and VP3 checked)
conrad
parents: 2432
diff changeset
706
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
707 mkv->cues = mkv_start_cues(mkv->segment_offset);
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
708 if (mkv->cues == NULL)
2499
77d6661f1947 Return AVERROR(ENOMEM) when appropriate
conrad
parents: 2498
diff changeset
709 return AVERROR(ENOMEM);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
710
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
711 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
712 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
713
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
714 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
715 {
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
716 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
717 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
718 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
719 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
720 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
721 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
722 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
723 }
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
724
3988
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
725 static int ass_get_duration(const uint8_t *p)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
726 {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
727 int sh, sm, ss, sc, eh, em, es, ec;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
728 uint64_t start, end;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
729
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
730 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
731 &sh, &sm, &ss, &sc, &eh, &em, &es, &ec) != 8)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
732 return 0;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
733 start = 3600000*sh + 60000*sm + 1000*ss + 10*sc;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
734 end = 3600000*eh + 60000*em + 1000*es + 10*ec;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
735 return end - start;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
736 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
737
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
738 static int mkv_write_ass_blocks(AVFormatContext *s, AVPacket *pkt)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
739 {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
740 MatroskaMuxContext *mkv = s->priv_data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
741 ByteIOContext *pb = s->pb;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
742 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
743 uint8_t *start, *end, *data = pkt->data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
744 ebml_master blockgroup;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
745 char buffer[2048];
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
746
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
747 while (data_size) {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
748 int duration = ass_get_duration(data);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
749 max_duration = FFMAX(duration, max_duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
750 end = memchr(data, '\n', data_size);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
751 size = line_size = end ? end-data+1 : data_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
752 size -= end ? (end[-1]=='\r')+1 : 0;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
753 start = data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
754 for (i=0; i<3; i++, start++)
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
755 if (!(start = memchr(start, ',', size-(start-data))))
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
756 return max_duration;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
757 size -= start - data;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
758 sscanf(data, "Dialogue: %d,", &layer);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
759 i = snprintf(buffer, sizeof(buffer), "%"PRId64",%d,",
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
760 s->streams[pkt->stream_index]->nb_frames++, layer);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
761 size = FFMIN(i+size, sizeof(buffer));
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
762 memcpy(buffer+i, start, size-i);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
763
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
764 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
765 "pts %" PRId64 ", duration %d\n",
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
766 url_ftell(pb), size, pkt->pts, duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
767 blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
768 put_ebml_id(pb, MATROSKA_ID_BLOCK);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
769 put_ebml_num(pb, size+4, 0);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
770 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
771 put_be16(pb, pkt->pts - mkv->cluster_pts);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
772 put_byte(pb, 0);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
773 put_buffer(pb, buffer, size);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
774 put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
775 end_ebml_master(pb, blockgroup);
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
776
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
777 data += line_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
778 data_size -= line_size;
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
779 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
780
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 }
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
783
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
784 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
785 {
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
786 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
787 ByteIOContext *pb = s->pb;
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
788
2504
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
789 av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
790 "pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n",
2474
f2a36975b73b Add some debug logging
conrad
parents: 2473
diff changeset
791 url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags);
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
792 put_ebml_id(pb, blockid);
3985
acb0ad37d372 matroskaenc: remove useless mkv_block_size() function
aurel
parents: 3973
diff changeset
793 put_ebml_num(pb, pkt->size+4, 0);
2460
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
794 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
795 put_be16(pb, pkt->pts - mkv->cluster_pts);
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
796 put_byte(pb, flags);
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
797 put_buffer(pb, pkt->data, pkt->size);
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
798 }
c13388c21c2d Move writing a block to its own function
conrad
parents: 2459
diff changeset
799
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
800 static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
801 {
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
802 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
803 ByteIOContext *pb = s->pb;
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
804 AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
2455
5589c058b0f9 Simplify
conrad
parents: 2454
diff changeset
805 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
806 int duration = pkt->duration;
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
807 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
808
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
809 // start a new cluster every 5 MB or 5 sec
2488
7420572a8d72 Use cluster_pos when checking cluster position
conrad
parents: 2487
diff changeset
810 if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
2504
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
811 av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
39c0db7c20be Split some really long lines
conrad
parents: 2503
diff changeset
812 " bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts);
2437
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
813 end_ebml_master(pb, mkv->cluster);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
814
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
815 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
816 if (ret < 0) return ret;
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
817
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
818 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
819 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
820 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
821 mkv->cluster_pts = pkt->pts;
2479
139406606437 Use a MD5 hash of some frames to write the segment uid
conrad
parents: 2478
diff changeset
822 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
823 }
36350b4c94fa Start a new cluster every 5 MB or 5 seconds
conrad
parents: 2436
diff changeset
824
2926
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
825 if (codec->codec_id == CODEC_ID_H264 &&
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
826 codec->extradata_size > 0 && AV_RB32(codec->extradata) == 0x00000001) {
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
827 /* from x264 or from bytestream h264 */
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
828 /* nal reformating needed */
2927
b75a49790f31 add a ff_ prefix to newly exported functions from avc.c
aurel
parents: 2926
diff changeset
829 int ret = ff_avc_parse_nal_units(pkt->data, &pkt->data, &pkt->size);
2926
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
830 if (ret < 0)
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
831 return ret;
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
832 assert(pkt->size);
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
833 }
a6730b458d6c Matroska muxer needs to format all NAL units, not only extradata.
aurel
parents: 2923
diff changeset
834
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
835 if (codec->codec_type != CODEC_TYPE_SUBTITLE) {
2462
2ffe818df0c6 Indentation
conrad
parents: 2461
diff changeset
836 mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
3988
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
837 } else if (codec->codec_id == CODEC_ID_SSA) {
edb053f67ffc matroskaenc: correct muxing of ASS packets
aurel
parents: 3987
diff changeset
838 duration = mkv_write_ass_blocks(s, pkt);
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
839 } else {
3986
2a7d8acde051 matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
aurel
parents: 3985
diff changeset
840 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
841 duration = pkt->convergence_duration;
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
842 mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0);
3987
632514d0ee21 matroskaenc: use correct EBML ID for block duration
aurel
parents: 3986
diff changeset
843 put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
2461
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
844 end_ebml_master(pb, blockgroup);
3a1ecd4ad76d Write subtitle tracks
conrad
parents: 2460
diff changeset
845 }
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
846
2463
f4c247d28e9d Simplify
conrad
parents: 2462
diff changeset
847 if (codec->codec_type == CODEC_TYPE_VIDEO && keyframe) {
2501
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
848 ret = mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos);
b91eb35b1237 Pass the returned error code of functions up
conrad
parents: 2500
diff changeset
849 if (ret < 0) return ret;
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
850 }
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
851
3892
8f1928b41f45 matroska: subtitle display duration must be stored in pkt->convergence_duration
aurel
parents: 3766
diff changeset
852 mkv->duration = FFMAX(mkv->duration, pkt->pts + duration);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
853 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
854 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
855
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
856 static int mkv_write_trailer(AVFormatContext *s)
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
857 {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
858 MatroskaMuxContext *mkv = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2530
diff changeset
859 ByteIOContext *pb = s->pb;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3892
diff changeset
860 int64_t currentpos, second_seekhead, cuespos;
2502
3230f4c53b17 Always check the return of mkv_add_seekhead_entry
conrad
parents: 2501
diff changeset
861 int ret;
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
862
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
863 end_ebml_master(pb, mkv->cluster);
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
864
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
865 if (!url_is_streamed(pb)) {
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
866 cuespos = mkv_write_cues(pb, mkv->cues, s->nb_streams);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
867 second_seekhead = mkv_write_seekhead(pb, mkv->cluster_seekhead);
2451
b66287f9c892 Write the cues element
conrad
parents: 2450
diff changeset
868
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
869 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES , cuespos);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
870 if (ret < 0) return ret;
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
871 ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_SEEKHEAD, second_seekhead);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
872 if (ret < 0) return ret;
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
873 mkv_write_seekhead(pb, mkv->main_seekhead);
2447
54f0053730cf Write the Seek Head element
conrad
parents: 2446
diff changeset
874
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
875 // update the duration
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
876 av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
877 currentpos = url_ftell(pb);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
878 url_fseek(pb, mkv->duration_offset, SEEK_SET);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
879 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
880
2515
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
881 // write the md5sum of some frames as the segment UID
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
882 if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
883 uint8_t segment_uid[16];
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
884 av_md5_final(mkv->md5_ctx, segment_uid);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
885 url_fseek(pb, mkv->segment_uid, SEEK_SET);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
886 put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
887 }
0b8c1ddfa711 Indentation
conrad
parents: 2514
diff changeset
888 url_fseek(pb, currentpos, SEEK_SET);
2514
959cec4fc0c2 Don't seek when streamed
conrad
parents: 2513
diff changeset
889 }
2443
7cb4e029fd09 Write the duration of the file
conrad
parents: 2442
diff changeset
890
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
891 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
892 av_free(mkv->md5_ctx);
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
893 return 0;
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
894 }
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
895
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
896 AVOutputFormat matroska_muxer = {
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
897 "matroska",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
898 NULL_IF_CONFIG_SMALL("Matroska file format"),
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
899 "video/x-matroska",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
900 "mkv",
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
901 sizeof(MatroskaMuxContext),
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
902 CODEC_ID_MP2,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
903 CODEC_ID_MPEG4,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
904 mkv_write_header,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
905 mkv_write_packet,
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
906 mkv_write_trailer,
4002
65cb6eca2944 matroskaenc: require global header
aurel
parents: 3988
diff changeset
907 .flags = AVFMT_GLOBALHEADER,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3759
diff changeset
908 .codec_tag = (const AVCodecTag* const []){codec_bmp_tags, codec_wav_tags, 0},
2486
5d8e311d7681 Set default subtitle_codec to CODEC_ID_TEXT
conrad
parents: 2485
diff changeset
909 .subtitle_codec = CODEC_ID_TEXT,
2425
8c51e92edd7d Beginning of mkv muxer, only EBML head is written correctly
conrad
parents:
diff changeset
910 };
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
911
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
912 AVOutputFormat matroska_audio_muxer = {
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
913 "matroska",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
914 NULL_IF_CONFIG_SMALL("Matroska file format"),
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
915 "audio/x-matroska",
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
916 "mka",
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
917 sizeof(MatroskaMuxContext),
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
918 CODEC_ID_MP2,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
919 CODEC_ID_NONE,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
920 mkv_write_header,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
921 mkv_write_packet,
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
922 mkv_write_trailer,
4002
65cb6eca2944 matroskaenc: require global header
aurel
parents: 3988
diff changeset
923 .flags = AVFMT_GLOBALHEADER,
3766
f062deeedb8d Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
reimar
parents: 3759
diff changeset
924 .codec_tag = (const AVCodecTag* const []){codec_wav_tags, 0},
2475
365932d29eb8 Add mka muxer
conrad
parents: 2474
diff changeset
925 };