annotate ogg.c @ 1874:3328f652d741 libavformat

Move aviobuf.c comments to avio.h. By moving the aviobuf.c comments to avio.h, these comments can be extracted by Doxygen by only accessing the installed headers.
author takis
date Mon, 05 Mar 2007 13:55:45 +0000
parents 6dd0da50623a
children da41753f1220
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * Ogg bitstream support
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Mark Hills <mark@pogo.org.uk>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * Uses libogg, but requires libvorbisenc to construct correct headers
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * when containing Vorbis stream -- currently the only format supported
1306
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
7 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
8 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
9 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
10 * FFmpeg is free software; you can redistribute it and/or
1306
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
11 * modify it under the terms of the GNU Lesser General Public
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
12 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
13 * version 2.1 of the License, or (at your option) any later version.
1306
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
14 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
15 * FFmpeg is distributed in the hope that it will be useful,
1306
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
18 * Lesser General Public License for more details.
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
19 *
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
20 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1306
diff changeset
21 * License along with FFmpeg; if not, write to the Free Software
1306
8bf9be9bb107 Add official LGPL license headers to the files that were missing them.
diego
parents: 1169
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 #include <stdio.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #include <ogg/ogg.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
31 #undef NDEBUG
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
32 #include <assert.h>
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
33
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
34 #define DECODER_BUFFER_SIZE 4096
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
35
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 typedef struct OggContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 /* output */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 ogg_stream_state os ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 int header_handled ;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
41 ogg_packet op;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 /* input */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 ogg_sync_state oy ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45 } OggContext ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 857
diff changeset
48 #ifdef CONFIG_MUXERS
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
49 static int ogg_write_header(AVFormatContext *avfcontext)
35
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
50 {
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
51 OggContext *context = avfcontext->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
52 ogg_packet *op= &context->op;
857
26aaf3eed638 fix unused variable warnings
aurel
parents: 843
diff changeset
53 int n;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
54
404
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 327
diff changeset
55 ogg_stream_init(&context->os, 31415);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
56
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 for(n = 0 ; n < avfcontext->nb_streams ; n++) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 726
diff changeset
58 AVCodecContext *codec = avfcontext->streams[n]->codec;
843
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
59 uint8_t *headers = codec->extradata;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
60 int headers_len = codec->extradata_size;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
61 uint8_t *header_start[3];
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
62 int header_len[3];
857
26aaf3eed638 fix unused variable warnings
aurel
parents: 843
diff changeset
63 int i, j;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
64
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 454
diff changeset
65 av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 454
diff changeset
66
843
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
67 for(j=1,i=0;i<2;++i, ++j) {
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
68 header_len[i]=0;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
69 while(j<headers_len && headers[j]==0xff) {
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
70 header_len[i]+=0xff;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
71 ++j;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
72 }
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
73 header_len[i]+=headers[j];
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
74 }
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
75 header_len[2]=headers_len-header_len[0]-header_len[1]-j;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
76 headers+=j;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
77 header_start[0] = headers;
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
78 header_start[1] = header_start[0] + header_len[0];
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
79 header_start[2] = header_start[1] + header_len[1];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80
843
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
81 for(i=0; i < 3; ++i){
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
82 op->bytes = header_len[i];
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
83
dcf6e35ddb72 Make ogg `muxer' expect new vorbis extradata format.
al
parents: 820
diff changeset
84 op->packet= header_start[i];
407
b9d16c18ee18 remove function call from muxer->encoder and cleanly pass global headers
michael
parents: 406
diff changeset
85 op->b_o_s= op->packetno==0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86
407
b9d16c18ee18 remove function call from muxer->encoder and cleanly pass global headers
michael
parents: 406
diff changeset
87 ogg_stream_packetin(&context->os, op);
b9d16c18ee18 remove function call from muxer->encoder and cleanly pass global headers
michael
parents: 406
diff changeset
88
b9d16c18ee18 remove function call from muxer->encoder and cleanly pass global headers
michael
parents: 406
diff changeset
89 op->packetno++; //FIXME multiple streams
b9d16c18ee18 remove function call from muxer->encoder and cleanly pass global headers
michael
parents: 406
diff changeset
90 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
92 context->header_handled = 0 ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
94
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
98 static int ogg_write_packet(AVFormatContext *avfcontext, AVPacket *pkt)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
100 OggContext *context = avfcontext->priv_data ;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 726
diff changeset
101 AVCodecContext *avctx= avfcontext->streams[pkt->stream_index]->codec;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
102 ogg_packet *op= &context->op;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 ogg_page og ;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
104 int64_t pts;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
105
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
106 pts= av_rescale(pkt->pts, avctx->sample_rate, AV_TIME_BASE);
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
107
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
108 // av_log(avfcontext, AV_LOG_DEBUG, "M%d\n", size);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
109
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 /* flush header packets so audio starts on a new page */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 if(!context->header_handled) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
113 while(ogg_stream_flush(&context->os, &og)) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
114 put_buffer(&avfcontext->pb, og.header, og.header_len) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
115 put_buffer(&avfcontext->pb, og.body, og.body_len) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
116 put_flush_packet(&avfcontext->pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
117 }
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
118 context->header_handled = 1 ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
121 op->packet = (uint8_t*) pkt->data;
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
122 op->bytes = pkt->size;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
123 op->b_o_s = op->packetno == 0;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
124 op->granulepos= pts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
126 /* correct the fields in the packet -- essential for streaming */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
127
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
128 ogg_stream_packetin(&context->os, op);
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
129
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
130 while(ogg_stream_pageout(&context->os, &og)) {
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
131 put_buffer(&avfcontext->pb, og.header, og.header_len);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
132 put_buffer(&avfcontext->pb, og.body, og.body_len);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
133 put_flush_packet(&avfcontext->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
134 }
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
135 op->packetno++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 static int ogg_write_trailer(AVFormatContext *avfcontext) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 while(ogg_stream_flush(&context->os, &og)) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
146 put_buffer(&avfcontext->pb, og.header, og.header_len) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
147 put_buffer(&avfcontext->pb, og.body, og.body_len) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
148 put_flush_packet(&avfcontext->pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 ogg_stream_clear(&context->os) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
153 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
154
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
156 AVOutputFormat ogg_muxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 "ogg",
1788
6dd0da50623a Ogg is not Vorbis.
diego
parents: 1443
diff changeset
158 "Ogg format",
6dd0da50623a Ogg is not Vorbis.
diego
parents: 1443
diff changeset
159 "application/ogg",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 sizeof(OggContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 CODEC_ID_VORBIS,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 ogg_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 ogg_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 ogg_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 } ;
858
66cc656ea404 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
diego
parents: 857
diff changeset
168 #endif //CONFIG_MUXERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents: 639
diff changeset
170 #if 0
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174 char *buf ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176 while(ogg_stream_packetout(&context->os, op) != 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
178 /* while no pages are available, read in more data to the sync */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
179 while(ogg_sync_pageout(&context->oy, &og) != 1) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
180 buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
181 if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
182 return 1 ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
183 ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
184 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
185
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
186 /* got a page. Feed it into the stream and get the packet */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
187 if(ogg_stream_pagein(&context->os, &og) != 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
188 return 1 ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
192 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
193
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
194
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
196 {
35
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
197 OggContext *context = avfcontext->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
198 ogg_packet op ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 char *buf ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
200 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
201 AVStream *ast ;
408
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
202 AVCodecContext *codec;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
203 uint8_t *p;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
204 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
205
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 ogg_sync_init(&context->oy) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
210 return AVERROR_IO ;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
211
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
212 ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 ogg_sync_pageout(&context->oy, &og) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 ogg_stream_init(&context->os, ogg_page_serialno(&og)) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 ogg_stream_pagein(&context->os, &og) ;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
216
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 /* currently only one vorbis stream supported */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219 ast = av_new_stream(avfcontext, 0) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 if(!ast)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
221 return AVERROR_NOMEM ;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 454
diff changeset
222 av_set_pts_info(ast, 60, 1, AV_TIME_BASE);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223
408
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
224 codec= &ast->codec;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
225 codec->codec_type = CODEC_TYPE_AUDIO;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
226 codec->codec_id = CODEC_ID_VORBIS;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
227 for(i=0; i<3; i++){
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
228 if(next_packet(avfcontext, &op)){
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
229 return -1;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
230 }
639
0b52743104ac integer overflows, heap corruption
michael
parents: 587
diff changeset
231 if(op.bytes >= (1<<16) || op.bytes < 0)
0b52743104ac integer overflows, heap corruption
michael
parents: 587
diff changeset
232 return -1;
408
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
233 codec->extradata_size+= 2 + op.bytes;
587
fe24632a577b allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
michael
parents: 486
diff changeset
234 codec->extradata= av_realloc(codec->extradata, codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
884
2ece9c9dd94c malloc padding to avoid reading past the malloc()ed area.
henry
parents: 858
diff changeset
235 memset(codec->extradata + codec->extradata_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
408
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
236 p= codec->extradata + codec->extradata_size - 2 - op.bytes;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
237 *(p++)= op.bytes>>8;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
238 *(p++)= op.bytes&0xFF;
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
239 memcpy(p, op.packet, op.bytes);
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
240 }
237eeeb50fb8 fix global header passing from demuxer to decoder
michael
parents: 407
diff changeset
241
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 ogg_packet op ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 884
diff changeset
249 if(next_packet(avfcontext, &op))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
250 return AVERROR_IO ;
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
251 if(av_new_packet(pkt, op.bytes) < 0)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
252 return AVERROR_IO ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 pkt->stream_index = 0 ;
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
254 memcpy(pkt->data, op.packet, op.bytes);
454
7fa377b2f533 export pts if available
michael
parents: 409
diff changeset
255 if(avfcontext->streams[0]->codec.sample_rate && op.granulepos!=-1)
7fa377b2f533 export pts if available
michael
parents: 409
diff changeset
256 pkt->pts= av_rescale(op.granulepos, AV_TIME_BASE, avfcontext->streams[0]->codec.sample_rate);
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1358
diff changeset
257 // printf("%"PRId64" %d %d\n", pkt->pts, (int)op.granulepos, avfcontext->streams[0]->codec.sample_rate);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
259 return op.bytes;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 static int ogg_read_close(AVFormatContext *avfcontext) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 ogg_stream_clear(&context->os) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 ogg_sync_clear(&context->oy) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
270 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
273 static AVInputFormat ogg_iformat = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 "Ogg Vorbis",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 sizeof(OggContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 ogg_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 ogg_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280 ogg_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 .extensions = "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 } ;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents: 639
diff changeset
283 #endif