annotate oggenc.c @ 5760:8ba33938e06f libavformat

Add some missing #includes
author mru
date Sat, 06 Mar 2010 22:36:36 +0000
parents 0e84f356ca5f
children d88fc4640994
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
1 /*
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
2 * Ogg muxer
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
3 * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at free dot fr>
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
4 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
5 * This file is part of FFmpeg.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
6 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
11 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
15 * Lesser General Public License for more details.
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
16 *
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
20 */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
21
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
22 #include "libavutil/crc.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
23 #include "libavcodec/xiph.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3188
diff changeset
24 #include "libavcodec/bytestream.h"
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
25 #include "libavcodec/flac.h"
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
26 #include "avformat.h"
4418
d5119d75439d Move declaration of ff_interleave_add_packet to internal.h.
bcoudurier
parents: 4311
diff changeset
27 #include "internal.h"
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
28
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
29 typedef struct {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
30 int64_t duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
31 unsigned page_counter;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
32 uint8_t *header[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
33 int header_len[3];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
34 /** for theora granule */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
35 int kfgshift;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
36 int64_t last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
37 int vrev;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
38 int eos;
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
39 unsigned packet_count; ///< number of packet buffered
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
40 } OGGStreamContext;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
41
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
42 static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset)
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
43 {
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
44 int64_t pos = url_ftell(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
45 uint32_t checksum = get_checksum(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
46 url_fseek(s->pb, crc_offset, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
47 put_be32(s->pb, checksum);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
48 url_fseek(s->pb, pos, SEEK_SET);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
49 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
50
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
51 static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
52 int64_t granule, int stream_index, int flags)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
53 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
54 OGGStreamContext *oggstream = s->streams[stream_index]->priv_data;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3593
diff changeset
55 int64_t crc_offset;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
56 int page_segments, i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
57
3020
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
58 if (size >= 255*255) {
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
59 granule = -1;
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
60 size = 255*255;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
61 } else if (oggstream->eos)
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
62 flags |= 4;
3020
38777f77320e it seems ogg requires granule to be -1 on unfinished packets
bcoudurier
parents: 2771
diff changeset
63
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
64 page_segments = FFMIN((size/255)+!!size, 255);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
65
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
66 init_checksum(s->pb, ff_crc04C11DB7_update, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
67 put_tag(s->pb, "OggS");
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
68 put_byte(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
69 put_byte(s->pb, flags);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
70 put_le64(s->pb, granule);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
71 put_le32(s->pb, stream_index);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
72 put_le32(s->pb, oggstream->page_counter++);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
73 crc_offset = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
74 put_le32(s->pb, 0); // crc
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
75 put_byte(s->pb, page_segments);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
76 for (i = 0; i < page_segments-1; i++)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
77 put_byte(s->pb, 255);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
78 if (size) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
79 put_byte(s->pb, size - (page_segments-1)*255);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
80 put_buffer(s->pb, data, size);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
81 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
82 ogg_update_checksum(s, crc_offset);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2731
diff changeset
83 put_flush_packet(s->pb);
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
84 return size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
85 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
86
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
87 static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact,
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
88 int *header_len)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
89 {
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
90 const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
91 int size;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
92 uint8_t *p, *p0;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
93
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
94 size = offset + 4 + strlen(vendor) + 4;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
95 p = av_mallocz(size);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
96 if (!p)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
97 return NULL;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
98 p0 = p;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
99
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
100 p += offset;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
101 bytestream_put_le32(&p, strlen(vendor));
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
102 bytestream_put_buffer(&p, vendor, strlen(vendor));
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
103 bytestream_put_le32(&p, 0); // user comment list length
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
104
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
105 *header_len = size;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
106 return p0;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
107 }
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
108
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
109 static int ogg_build_flac_headers(AVCodecContext *avctx,
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
110 OGGStreamContext *oggstream, int bitexact)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
111 {
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
112 enum FLACExtradataFormat format;
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
113 uint8_t *streaminfo;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
114 uint8_t *p;
5054
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
115
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
116 if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo))
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
117 return -1;
5054
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
118
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
119 // first packet: STREAMINFO
3188
87119f0c4736 fix Ogg/FLAC header size
jbr
parents: 3021
diff changeset
120 oggstream->header_len[0] = 51;
87119f0c4736 fix Ogg/FLAC header size
jbr
parents: 3021
diff changeset
121 oggstream->header[0] = av_mallocz(51); // per ogg flac specs
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
122 p = oggstream->header[0];
5053
037f1082ecd6 oggenc: check for failed av_mallocz()
jbr
parents: 4578
diff changeset
123 if (!p)
037f1082ecd6 oggenc: check for failed av_mallocz()
jbr
parents: 4578
diff changeset
124 return AVERROR_NOMEM;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
125 bytestream_put_byte(&p, 0x7F);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
126 bytestream_put_buffer(&p, "FLAC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
127 bytestream_put_byte(&p, 1); // major version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
128 bytestream_put_byte(&p, 0); // minor version
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
129 bytestream_put_be16(&p, 1); // headers packets without this one
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
130 bytestream_put_buffer(&p, "fLaC", 4);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
131 bytestream_put_byte(&p, 0x00); // streaminfo
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
132 bytestream_put_be24(&p, 34);
4578
c05d167a4fe2 Use a shared function to validate FLAC extradata.
jbr
parents: 4418
diff changeset
133 bytestream_put_buffer(&p, streaminfo, FLAC_STREAMINFO_SIZE);
5054
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
134
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
135 // second packet: VorbisComment
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
136 p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1]);
5053
037f1082ecd6 oggenc: check for failed av_mallocz()
jbr
parents: 4578
diff changeset
137 if (!p)
037f1082ecd6 oggenc: check for failed av_mallocz()
jbr
parents: 4578
diff changeset
138 return AVERROR_NOMEM;
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
139 oggstream->header[1] = p;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
140 bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
141 bytestream_put_be24(&p, oggstream->header_len[1] - 4);
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
142
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
143 return 0;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
144 }
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
145
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
146 #define SPEEX_HEADER_SIZE 80
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
147
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
148 static int ogg_build_speex_headers(AVCodecContext *avctx,
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
149 OGGStreamContext *oggstream, int bitexact)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
150 {
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
151 uint8_t *p;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
152
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
153 if (avctx->extradata_size < SPEEX_HEADER_SIZE)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
154 return -1;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
155
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
156 // first packet: Speex header
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
157 p = av_mallocz(SPEEX_HEADER_SIZE);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
158 if (!p)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
159 return AVERROR_NOMEM;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
160 oggstream->header[0] = p;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
161 oggstream->header_len[0] = SPEEX_HEADER_SIZE;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
162 bytestream_put_buffer(&p, avctx->extradata, SPEEX_HEADER_SIZE);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
163 AV_WL32(&oggstream->header[0][68], 0); // set extra_headers to 0
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
164
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
165 // second packet: VorbisComment
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
166 p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1]);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
167 if (!p)
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
168 return AVERROR_NOMEM;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
169 oggstream->header[1] = p;
5054
6c7d0a04ae96 cosmetics: spacing and comments
jbr
parents: 5053
diff changeset
170
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
171 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
172 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
173
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
174 static int ogg_write_header(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
175 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
176 OGGStreamContext *oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
177 int i, j;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
178 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
179 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
180 if (st->codec->codec_type == CODEC_TYPE_AUDIO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
181 av_set_pts_info(st, 64, 1, st->codec->sample_rate);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
182 else if (st->codec->codec_type == CODEC_TYPE_VIDEO)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
183 av_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
184 if (st->codec->codec_id != CODEC_ID_VORBIS &&
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
185 st->codec->codec_id != CODEC_ID_THEORA &&
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
186 st->codec->codec_id != CODEC_ID_SPEEX &&
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
187 st->codec->codec_id != CODEC_ID_FLAC) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
188 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
189 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
190 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
191
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
192 if (!st->codec->extradata || !st->codec->extradata_size) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
193 av_log(s, AV_LOG_ERROR, "No extradata present\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
194 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
195 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
196 oggstream = av_mallocz(sizeof(*oggstream));
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
197 st->priv_data = oggstream;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
198 if (st->codec->codec_id == CODEC_ID_FLAC) {
5055
5a6bbdd352fb oggenc: return error value from ogg_build_flac_headers()
jbr
parents: 5054
diff changeset
199 int err = ogg_build_flac_headers(st->codec, oggstream,
5a6bbdd352fb oggenc: return error value from ogg_build_flac_headers()
jbr
parents: 5054
diff changeset
200 st->codec->flags & CODEC_FLAG_BITEXACT);
5a6bbdd352fb oggenc: return error value from ogg_build_flac_headers()
jbr
parents: 5054
diff changeset
201 if (err) {
5056
f67fad61077e oggenc: Change error log text. An error here does not necessarily mean
jbr
parents: 5055
diff changeset
202 av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n");
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
203 av_freep(&st->priv_data);
5055
5a6bbdd352fb oggenc: return error value from ogg_build_flac_headers()
jbr
parents: 5054
diff changeset
204 return err;
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
205 }
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
206 } else if (st->codec->codec_id == CODEC_ID_SPEEX) {
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
207 int err = ogg_build_speex_headers(st->codec, oggstream,
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
208 st->codec->flags & CODEC_FLAG_BITEXACT);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
209 if (err) {
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
210 av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n");
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
211 av_freep(&st->priv_data);
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
212 return err;
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
213 }
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
214 } else {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
215 if (ff_split_xiph_headers(st->codec->extradata, st->codec->extradata_size,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
216 st->codec->codec_id == CODEC_ID_VORBIS ? 30 : 42,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
217 oggstream->header, oggstream->header_len) < 0) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
218 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
219 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
220 return -1;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
221 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
222 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
223 /** KFGSHIFT is the width of the less significant section of the granule position
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
224 The less significant section is the frame count since the last keyframe */
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
225 oggstream->kfgshift = ((oggstream->header[0][40]&3)<<3)|(oggstream->header[0][41]>>5);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
226 oggstream->vrev = oggstream->header[0][9];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
227 av_log(s, AV_LOG_DEBUG, "theora kfgshift %d, vrev %d\n",
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
228 oggstream->kfgshift, oggstream->vrev);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
229 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
230 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
231 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
232 for (i = 0; i < 3; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
233 for (j = 0; j < s->nb_streams; j++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
234 AVStream *st = s->streams[j];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
235 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
236 if (oggstream && oggstream->header_len[i]) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
237 ogg_write_page(s, oggstream->header[i], oggstream->header_len[i],
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
238 0, st->index, i ? 0 : 2); // bos
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
239 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
240 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
241 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
242 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
243 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
244
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
245 static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
246 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
247 AVStream *st = s->streams[pkt->stream_index];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
248 OGGStreamContext *oggstream = st->priv_data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
249 uint8_t *ptr = pkt->data;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
250 int ret, size = pkt->size;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
251 int64_t granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
252
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
253 if (st->codec->codec_id == CODEC_ID_THEORA) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
254 int64_t pts = oggstream->vrev < 1 ? pkt->pts : pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
255 int pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
256 if (pkt->flags & PKT_FLAG_KEY)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
257 oggstream->last_kf_pts = pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
258 pframe_count = pts - oggstream->last_kf_pts;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
259 // prevent frame count from overflow if key frame flag is not set
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
260 if (pframe_count >= (1<<oggstream->kfgshift)) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
261 oggstream->last_kf_pts += pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
262 pframe_count = 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
263 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
264 granule = (oggstream->last_kf_pts<<oggstream->kfgshift) | pframe_count;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
265 } else
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
266 granule = pkt->pts + pkt->duration;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
267 oggstream->duration = granule;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
268 do {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
269 ret = ogg_write_page(s, ptr, size, granule, pkt->stream_index, ptr != pkt->data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
270 ptr += ret; size -= ret;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
271 } while (size > 0 || ret == 255*255); // need to output a last nil page
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
272
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
273 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
274 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
275
4310
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
276 static int ogg_compare_granule(AVFormatContext *s, AVPacket *next, AVPacket *pkt)
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
277 {
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
278 AVStream *st2 = s->streams[next->stream_index];
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
279 AVStream *st = s->streams[pkt ->stream_index];
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
280
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
281 int64_t next_granule = av_rescale_q(next->pts + next->duration,
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
282 st2->time_base, AV_TIME_BASE_Q);
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
283 int64_t cur_granule = av_rescale_q(pkt ->pts + pkt ->duration,
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
284 st ->time_base, AV_TIME_BASE_Q);
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
285 return next_granule > cur_granule;
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
286 }
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
287
4311
03065a598506 function is static
bcoudurier
parents: 4310
diff changeset
288 static int ogg_interleave_per_granule(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
289 {
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
290 OGGStreamContext *ogg;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
291 int i, stream_count = 0;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
292 int interleaved = 0;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
293
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
294 if (pkt) {
4310
92117125e17c use new ff_interleave_add_packet
bcoudurier
parents: 3973
diff changeset
295 ff_interleave_add_packet(s, pkt, ogg_compare_granule);
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
296 ogg = s->streams[pkt->stream_index]->priv_data;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
297 ogg->packet_count++;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
298 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
299
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
300 for (i = 0; i < s->nb_streams; i++) {
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
301 ogg = s->streams[i]->priv_data;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
302 stream_count += !!ogg->packet_count;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
303 interleaved += ogg->packet_count > 1;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
304 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
305
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
306 if ((s->nb_streams == stream_count && interleaved == stream_count) ||
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
307 (flush && stream_count)) {
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
308 AVPacketList *pktl= s->packet_buffer;
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
309 *out= pktl->pkt;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
310 s->packet_buffer = pktl->next;
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
311
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
312 ogg = s->streams[out->stream_index]->priv_data;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
313 if (flush && ogg->packet_count == 1)
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
314 ogg->eos = 1;
5602
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
315 ogg->packet_count--;
0e84f356ca5f Remove MAX_STREAMS usage in ogg and mxf muxers
bcoudurier
parents: 5280
diff changeset
316
5210
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
317 if(!s->packet_buffer)
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
318 s->packet_buffer_end= NULL;
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
319
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
320 if(s->streams[out->stream_index]->last_in_packet_buffer == pktl)
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
321 s->streams[out->stream_index]->last_in_packet_buffer= NULL;
36d130853c9b Improve amortized worst case speed of the muxers packet interleaving code
michael
parents: 5056
diff changeset
322
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
323 av_freep(&pktl);
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
324 return 1;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
325 } else {
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
326 av_init_packet(out);
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
327 return 0;
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
328 }
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
329 }
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
330
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
331 static int ogg_write_trailer(AVFormatContext *s)
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
332 {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
333 int i;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
334 for (i = 0; i < s->nb_streams; i++) {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
335 AVStream *st = s->streams[i];
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
336 OGGStreamContext *oggstream = st->priv_data;
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
337 if (st->codec->codec_id == CODEC_ID_FLAC ||
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
338 st->codec->codec_id == CODEC_ID_SPEEX) {
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
339 av_free(oggstream->header[0]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
340 av_free(oggstream->header[1]);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
341 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
342 av_freep(&st->priv_data);
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
343 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
344 return 0;
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
345 }
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
346
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
347 AVOutputFormat ogg_muxer = {
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
348 "ogg",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
349 NULL_IF_CONFIG_SMALL("Ogg"),
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
350 "application/ogg",
5280
4292c6f121dc Add Speex support to the Ogg muxer.
jbr
parents: 5210
diff changeset
351 "ogg,ogv,spx",
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
352 0,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
353 CODEC_ID_FLAC,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
354 CODEC_ID_THEORA,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
355 ogg_write_header,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
356 ogg_write_packet,
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
357 ogg_write_trailer,
3021
6f393e79e896 Fix issue 338:
bcoudurier
parents: 3020
diff changeset
358 .interleave_packet = ogg_interleave_per_granule,
2731
6b43751d7264 ogg muxer
bcoudurier
parents:
diff changeset
359 };