annotate matroskaenc.c @ 6199:fa244b4fe683 libavformat

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