annotate ogg.c @ 406:ea22a438ca79 libavformat

fix obnoxious ogg_packet passing from encoder to muxer
author michael
date Sun, 04 Apr 2004 14:39:20 +0000
parents 04d7dda7ccd5
children b9d16c18ee18
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
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 #include <stdio.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 #include <ogg/ogg.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 #include <vorbis/vorbisenc.h>
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 #include "oggvorbis.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
17 #undef NDEBUG
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
18 #include <assert.h>
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
19
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 #define DECODER_BUFFER_SIZE 4096
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23 typedef struct OggContext {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
24 /* output */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25 ogg_stream_state os ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 int header_handled ;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
27 ogg_packet op;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 /* input */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
30 ogg_sync_state oy ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31 } OggContext ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
32
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
33
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 68
diff changeset
34 #ifdef CONFIG_ENCODERS
35
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
35 static int ogg_write_header(AVFormatContext *avfcontext)
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
36 {
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
37 OggContext *context = avfcontext->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 AVCodecContext *avccontext ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 vorbis_info vi ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 vorbis_dsp_state vd ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41 vorbis_comment vc ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 vorbis_block vb ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
43 ogg_packet header, header_comm, header_code ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
44 int n ;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
45
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
46 av_set_pts_info(avfcontext, 60, 1, AV_TIME_BASE);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
47
404
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 327
diff changeset
48 ogg_stream_init(&context->os, 31415);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 for(n = 0 ; n < avfcontext->nb_streams ; n++) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 avccontext = &avfcontext->streams[n]->codec ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 /* begin vorbis specific code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 vorbis_info_init(&vi) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 /* code copied from libavcodec/oggvorbis.c */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 if(oggvorbis_init_encoder(&vi, avccontext) < 0) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 fprintf(stderr, "ogg_write_header: init_encoder failed") ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 return -1 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 vorbis_analysis_init(&vd, &vi) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 vorbis_block_init(&vd, &vb) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 vorbis_comment_init(&vc) ;
327
741c56c608bb using LIBAVFORMAT_IDENT
alex
parents: 290
diff changeset
68 vorbis_comment_add_tag(&vc, "encoder", LIBAVFORMAT_IDENT) ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 if(*avfcontext->title)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 vorbis_comment_add_tag(&vc, "title", avfcontext->title) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 vorbis_analysis_headerout(&vd, &vc, &header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73 &header_comm, &header_code) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
74 ogg_stream_packetin(&context->os, &header) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
75 ogg_stream_packetin(&context->os, &header_comm) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
76 ogg_stream_packetin(&context->os, &header_code) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
77
68
1e2f55eced38 ogg deallocate patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 35
diff changeset
78 vorbis_block_clear(&vb) ;
1e2f55eced38 ogg deallocate patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 35
diff changeset
79 vorbis_dsp_clear(&vd) ;
1e2f55eced38 ogg deallocate patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 35
diff changeset
80 vorbis_info_clear(&vi) ;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
81 vorbis_comment_clear(&vc) ;
68
1e2f55eced38 ogg deallocate patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents: 35
diff changeset
82
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 /* end of vorbis specific code */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 context->header_handled = 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92 static int ogg_write_packet(AVFormatContext *avfcontext,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
93 int stream_index,
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
94 const uint8_t *buf, int size, int64_t pts)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 OggContext *context = avfcontext->priv_data ;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
97 AVCodecContext *avctx= &avfcontext->streams[stream_index]->codec;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
98 ogg_packet *op= &context->op;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 ogg_page og ;
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
100
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
101 pts= av_rescale(pts, avctx->sample_rate, AV_TIME_BASE);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
102
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
103 if(!size){
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
104 // av_log(avfcontext, AV_LOG_DEBUG, "zero packet\n");
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
105 return 0;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
106 }
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
107 // 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
108
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 /* flush header packets so audio starts on a new page */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 if(!context->header_handled) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 while(ogg_stream_flush(&context->os, &og)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 put_buffer(&avfcontext->pb, og.header, og.header_len) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 put_buffer(&avfcontext->pb, og.body, og.body_len) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 put_flush_packet(&avfcontext->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 context->header_handled = 1 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
120 op->packet = (uint8_t*) buf;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
121 op->bytes = size;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
122 op->b_o_s = op->packetno == 0;
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
123 op->granulepos= pts;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124
406
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
125 /* correct the fields in the packet -- essential for streaming */
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
126
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
127 ogg_stream_packetin(&context->os, op);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
128
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
129 while(ogg_stream_pageout(&context->os, &og)) {
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
130 put_buffer(&avfcontext->pb, og.header, og.header_len);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
131 put_buffer(&avfcontext->pb, og.body, og.body_len);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
132 put_flush_packet(&avfcontext->pb);
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
133 }
ea22a438ca79 fix obnoxious ogg_packet passing from encoder to muxer
michael
parents: 405
diff changeset
134 op->packetno++;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
135
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
136 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
137 }
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 static int ogg_write_trailer(AVFormatContext *avfcontext) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 while(ogg_stream_flush(&context->os, &og)) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 put_buffer(&avfcontext->pb, og.header, og.header_len) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 put_buffer(&avfcontext->pb, og.body, og.body_len) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 put_flush_packet(&avfcontext->pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
148 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 ogg_stream_clear(&context->os) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
151 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
152 }
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 static AVOutputFormat ogg_oformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 "Ogg Vorbis",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 "audio/x-vorbis",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 sizeof(OggContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 CODEC_ID_VORBIS,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 0,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
163 ogg_write_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
164 ogg_write_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 ogg_write_trailer,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 } ;
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 68
diff changeset
167 #endif //CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
169
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
170 static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
171 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
172 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
173 char *buf ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
174
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
175 while(ogg_stream_packetout(&context->os, op) != 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
176
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
177 /* while no pages are available, read in more data to the sync */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
178 while(ogg_sync_pageout(&context->oy, &og) != 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
179 buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
180 if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
181 return 1 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
182 ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
183 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
184
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
185 /* got a page. Feed it into the stream and get the packet */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
186 if(ogg_stream_pagein(&context->os, &og) != 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
187 return 1 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
188 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
189
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
190 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
191 }
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 static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
195 {
35
a16ccdf4a87c removed unneeded mallocs
bellard
parents: 0
diff changeset
196 OggContext *context = avfcontext->priv_data;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
197 char *buf ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
198 ogg_page og ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
199 AVStream *ast ;
404
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 327
diff changeset
200
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 327
diff changeset
201 avfcontext->ctx_flags |= AVFMTCTX_NOHEADER;
6579fe3ade40 remove spyware from ogg*.c
michael
parents: 327
diff changeset
202
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
203 ogg_sync_init(&context->oy) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
204 buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
205
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
206 if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
207 return -EIO ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
208
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
209 ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
210 ogg_sync_pageout(&context->oy, &og) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
211 ogg_stream_init(&context->os, ogg_page_serialno(&og)) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 ogg_stream_pagein(&context->os, &og) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 /* currently only one vorbis stream supported */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
216 ast = av_new_stream(avfcontext, 0) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
217 if(!ast)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
218 return AVERROR_NOMEM ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
219
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 ast->codec.codec_type = CODEC_TYPE_AUDIO ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
221 ast->codec.codec_id = CODEC_ID_VORBIS ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
222
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
224 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
225
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
226
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228 ogg_packet op ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 if(next_packet(avfcontext, &op))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 return -EIO ;
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
232 if(av_new_packet(pkt, op.bytes) < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 return -EIO ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 pkt->stream_index = 0 ;
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
235 memcpy(pkt->data, op.packet, op.bytes);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236
405
04d7dda7ccd5 kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents: 404
diff changeset
237 return op.bytes;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241 static int ogg_read_close(AVFormatContext *avfcontext) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 OggContext *context = avfcontext->priv_data ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 ogg_stream_clear(&context->os) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 ogg_sync_clear(&context->oy) ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 static AVInputFormat ogg_iformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 "ogg",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 "Ogg Vorbis",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 sizeof(OggContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 NULL,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 ogg_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 ogg_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 ogg_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 .extensions = "ogg",
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 int ogg_init(void) {
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 68
diff changeset
264 #ifdef CONFIG_ENCODERS
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 av_register_output_format(&ogg_oformat) ;
277
a313e1080322 disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 68
diff changeset
266 #endif
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 av_register_input_format(&ogg_iformat);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
268 return 0 ;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
269 }