Mercurial > libavcodec.hg
annotate oggvorbis.c @ 2850:c553a407b1b6 libavcodec
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
author | michael |
---|---|
date | Fri, 02 Sep 2005 11:08:49 +0000 |
parents | 040b965f2cd0 |
children | 411601677547 |
rev | line source |
---|---|
1106 | 1 /** |
2 * @file oggvorbis.c | |
3 * Ogg Vorbis codec support via libvorbisenc. | |
4 * @author Mark Hills <mark@pogo.org.uk> | |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
5 */ |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
6 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
7 #include <vorbis/vorbisenc.h> |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
8 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
9 #include "avcodec.h" |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
10 |
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
11 #undef NDEBUG |
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
12 #include <assert.h> |
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
13 |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
14 #define OGGVORBIS_FRAME_SIZE 64 |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
15 |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
16 #define BUFFER_SIZE (1024*64) |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
17 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
18 typedef struct OggVorbisContext { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
19 vorbis_info vi ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
20 vorbis_dsp_state vd ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
21 vorbis_block vb ; |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
22 uint8_t buffer[BUFFER_SIZE]; |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
23 int buffer_index; |
883 | 24 |
25 /* decoder */ | |
26 vorbis_comment vc ; | |
1920
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
27 ogg_packet op; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
28 } OggVorbisContext ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
29 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
30 |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
31 static int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) { |
934
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
32 |
2850
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
33 if(avccontext->flags & CODEC_FLAG_QSCALE) { |
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
34 return vorbis_encode_init_vbr(vi, avccontext->channels, |
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
35 avccontext->sample_rate, |
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
36 avccontext->global_quality / (float)FF_QP2LAMBDA); |
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
37 } |
934
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
38 #ifdef OGGVORBIS_VBR_BY_ESTIMATE |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
39 /* variable bitrate by estimate */ |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
40 |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
41 return (vorbis_encode_setup_managed(vi, avccontext->channels, |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
42 avccontext->sample_rate, -1, avccontext->bit_rate, -1) || |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
43 vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL) || |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
44 vorbis_encode_setup_init(vi)) ; |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
45 #else |
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
46 /* constant bitrate */ |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
47 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
48 return vorbis_encode_init(vi, avccontext->channels, |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
49 avccontext->sample_rate, -1, avccontext->bit_rate, -1) ; |
934
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
50 #endif |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
51 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
52 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
53 static int oggvorbis_encode_init(AVCodecContext *avccontext) { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
54 OggVorbisContext *context = avccontext->priv_data ; |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
55 ogg_packet header, header_comm, header_code; |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
56 uint8_t *p; |
2676 | 57 unsigned int offset, len; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
58 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
59 vorbis_info_init(&context->vi) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
60 if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1106
diff
changeset
|
61 av_log(avccontext, AV_LOG_ERROR, "oggvorbis_encode_init: init_encoder failed") ; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
62 return -1 ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
63 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
64 vorbis_analysis_init(&context->vd, &context->vi) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
65 vorbis_block_init(&context->vd, &context->vb) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
66 |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
67 vorbis_comment_init(&context->vc); |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
68 vorbis_comment_add_tag(&context->vc, "encoder", LIBAVCODEC_IDENT) ; |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
69 |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
70 vorbis_analysis_headerout(&context->vd, &context->vc, &header, |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
71 &header_comm, &header_code); |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
72 |
2676 | 73 len = header.bytes + header_comm.bytes + header_code.bytes; |
74 avccontext->extradata_size= 64 + len + len/255; | |
75 p = avccontext->extradata= av_mallocz(avccontext->extradata_size); | |
76 p[0] = 2; | |
77 offset = 1; | |
78 offset += av_xiphlacing(&p[offset], header.bytes); | |
79 offset += av_xiphlacing(&p[offset], header_comm.bytes); | |
80 memcpy(&p[offset], header.packet, header.bytes); | |
81 offset += header.bytes; | |
82 memcpy(&p[offset], header_comm.packet, header_comm.bytes); | |
83 offset += header_comm.bytes; | |
84 memcpy(&p[offset], header_code.packet, header_code.bytes); | |
85 offset += header_code.bytes; | |
86 avccontext->extradata_size = offset; | |
87 avccontext->extradata= av_realloc(avccontext->extradata, avccontext->extradata_size); | |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
88 |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
89 /* vorbis_block_clear(&context->vb); |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
90 vorbis_dsp_clear(&context->vd); |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
91 vorbis_info_clear(&context->vi);*/ |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
92 vorbis_comment_clear(&context->vc); |
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
93 |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
94 avccontext->frame_size = OGGVORBIS_FRAME_SIZE ; |
2850
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
95 avccontext->time_base.den = avccontext->sample_rate; |
c553a407b1b6
fixed quality / vbr encoding patch by (Justin Ruggles, jruggle, earthlink net)
michael
parents:
2716
diff
changeset
|
96 avccontext->time_base.num = 1; |
925 | 97 |
98 avccontext->coded_frame= avcodec_alloc_frame(); | |
99 avccontext->coded_frame->key_frame= 1; | |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
100 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
101 return 0 ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
102 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
103 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
104 |
883 | 105 static int oggvorbis_encode_frame(AVCodecContext *avccontext, |
106 unsigned char *packets, | |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
107 int buf_size, void *data) |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
108 { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
109 OggVorbisContext *context = avccontext->priv_data ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
110 float **buffer ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
111 ogg_packet op ; |
2393
0433866b1075
fixes transcoding to vorbis with ffmpeg on big endian machines patch by (Sigbj©Ìrn Skj©Áret {sskjer-1 broadpark no})
michael
parents:
2091
diff
changeset
|
112 signed short *audio = data ; |
2091 | 113 int l, samples = data ? OGGVORBIS_FRAME_SIZE : 0; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
114 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
115 buffer = vorbis_analysis_buffer(&context->vd, samples) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
116 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
117 if(context->vi.channels == 1) { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
118 for(l = 0 ; l < samples ; l++) |
2393
0433866b1075
fixes transcoding to vorbis with ffmpeg on big endian machines patch by (Sigbj©Ìrn Skj©Áret {sskjer-1 broadpark no})
michael
parents:
2091
diff
changeset
|
119 buffer[0][l]=audio[l]/32768.f; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
120 } else { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
121 for(l = 0 ; l < samples ; l++){ |
2393
0433866b1075
fixes transcoding to vorbis with ffmpeg on big endian machines patch by (Sigbj©Ìrn Skj©Áret {sskjer-1 broadpark no})
michael
parents:
2091
diff
changeset
|
122 buffer[0][l]=audio[l*2]/32768.f; |
0433866b1075
fixes transcoding to vorbis with ffmpeg on big endian machines patch by (Sigbj©Ìrn Skj©Áret {sskjer-1 broadpark no})
michael
parents:
2091
diff
changeset
|
123 buffer[1][l]=audio[l*2+1]/32768.f; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
124 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
125 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
126 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
127 vorbis_analysis_wrote(&context->vd, samples) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
128 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
129 while(vorbis_analysis_blockout(&context->vd, &context->vb) == 1) { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
130 vorbis_analysis(&context->vb, NULL); |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
131 vorbis_bitrate_addblock(&context->vb) ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
132 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
133 while(vorbis_bitrate_flushpacket(&context->vd, &op)) { |
2091 | 134 if(op.bytes==1) //id love to say this is a hack, bad sadly its not, appearently the end of stream decission is in libogg |
135 continue; | |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
136 memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet)); |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
137 context->buffer_index += sizeof(ogg_packet); |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
138 memcpy(context->buffer + context->buffer_index, op.packet, op.bytes); |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
139 context->buffer_index += op.bytes; |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
140 // av_log(avccontext, AV_LOG_DEBUG, "e%d / %d\n", context->buffer_index, op.bytes); |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
141 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
142 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
143 |
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
144 l=0; |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
145 if(context->buffer_index){ |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
146 ogg_packet *op2= (ogg_packet*)context->buffer; |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
147 op2->packet = context->buffer + sizeof(ogg_packet); |
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
148 |
2091 | 149 l= op2->bytes; |
2637 | 150 avccontext->coded_frame->pts= op2->granulepos; |
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
151 |
2091 | 152 memcpy(packets, op2->packet, l); |
153 context->buffer_index -= l + sizeof(ogg_packet); | |
154 memcpy(context->buffer, context->buffer + l + sizeof(ogg_packet), context->buffer_index); | |
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
155 // av_log(avccontext, AV_LOG_DEBUG, "E%d\n", l); |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
156 } |
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
157 |
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
158 return l; |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
159 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
160 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
161 |
883 | 162 static int oggvorbis_encode_close(AVCodecContext *avccontext) { |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
163 OggVorbisContext *context = avccontext->priv_data ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
164 /* ogg_packet op ; */ |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
165 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
166 vorbis_analysis_wrote(&context->vd, 0) ; /* notify vorbisenc this is EOF */ |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
167 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
168 vorbis_block_clear(&context->vb); |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
169 vorbis_dsp_clear(&context->vd); |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
170 vorbis_info_clear(&context->vi); |
925 | 171 |
172 av_freep(&avccontext->coded_frame); | |
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
173 av_freep(&avccontext->extradata); |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
174 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
175 return 0 ; |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
176 } |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
177 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
178 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
179 AVCodec oggvorbis_encoder = { |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
180 "vorbis", |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
181 CODEC_TYPE_AUDIO, |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
182 CODEC_ID_VORBIS, |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
183 sizeof(OggVorbisContext), |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
184 oggvorbis_encode_init, |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
185 oggvorbis_encode_frame, |
2091 | 186 oggvorbis_encode_close, |
187 .capabilities= CODEC_CAP_DELAY, | |
883 | 188 } ; |
189 | |
190 static int oggvorbis_decode_init(AVCodecContext *avccontext) { | |
191 OggVorbisContext *context = avccontext->priv_data ; | |
1925 | 192 uint8_t *p= avccontext->extradata; |
2676 | 193 int i, hsizes[3]; |
194 unsigned char *headers[3], *extradata = avccontext->extradata; | |
883 | 195 |
196 vorbis_info_init(&context->vi) ; | |
197 vorbis_comment_init(&context->vc) ; | |
1925 | 198 |
2676 | 199 if(! avccontext->extradata_size || ! p) { |
200 av_log(avccontext, AV_LOG_ERROR, "vorbis extradata absent\n"); | |
201 return -1; | |
202 } | |
2716 | 203 |
204 if(p[0] == 0 && p[1] == 30) { | |
205 for(i = 0; i < 3; i++){ | |
206 hsizes[i] = *p++ << 8; | |
207 hsizes[i] += *p++; | |
208 headers[i] = p; | |
209 p += hsizes[i]; | |
210 } | |
211 } else if(*p == 2) { | |
212 unsigned int offset = 1; | |
213 p++; | |
214 for(i=0; i<2; i++) { | |
215 hsizes[i] = 0; | |
216 while((*p == 0xFF) && (offset < avccontext->extradata_size)) { | |
217 hsizes[i] += 0xFF; | |
218 offset++; | |
219 p++; | |
220 } | |
221 if(offset >= avccontext->extradata_size - 1) { | |
222 av_log(avccontext, AV_LOG_ERROR, | |
223 "vorbis header sizes damaged\n"); | |
224 return -1; | |
225 } | |
226 hsizes[i] += *p; | |
227 offset++; | |
228 p++; | |
229 } | |
230 hsizes[2] = avccontext->extradata_size - hsizes[0]-hsizes[1]-offset; | |
231 #if 0 | |
232 av_log(avccontext, AV_LOG_DEBUG, | |
233 "vorbis header sizes: %d, %d, %d, / extradata_len is %d \n", | |
234 hsizes[0], hsizes[1], hsizes[2], avccontext->extradata_size); | |
235 #endif | |
236 headers[0] = extradata + offset; | |
237 headers[1] = extradata + offset + hsizes[0]; | |
238 headers[2] = extradata + offset + hsizes[0] + hsizes[1]; | |
239 } else { | |
2676 | 240 av_log(avccontext, AV_LOG_ERROR, |
241 "vorbis initial header len is wrong: %d\n", *p); | |
242 return -1; | |
243 } | |
244 | |
1925 | 245 for(i=0; i<3; i++){ |
246 context->op.b_o_s= i==0; | |
2676 | 247 context->op.bytes = hsizes[i]; |
248 context->op.packet = headers[i]; | |
249 if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){ | |
1925 | 250 av_log(avccontext, AV_LOG_ERROR, "%d. vorbis header damaged\n", i+1); |
251 return -1; | |
252 } | |
253 } | |
2716 | 254 |
1925 | 255 avccontext->channels = context->vi.channels; |
256 avccontext->sample_rate = context->vi.rate; | |
2637 | 257 avccontext->time_base= (AVRational){1, avccontext->sample_rate}; |
1925 | 258 |
259 vorbis_synthesis_init(&context->vd, &context->vi); | |
260 vorbis_block_init(&context->vd, &context->vb); | |
883 | 261 |
262 return 0 ; | |
263 } | |
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
264 |
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
265 |
883 | 266 static inline int conv(int samples, float **pcm, char *buf, int channels) { |
267 int i, j, val ; | |
268 ogg_int16_t *ptr, *data = (ogg_int16_t*)buf ; | |
269 float *mono ; | |
270 | |
271 for(i = 0 ; i < channels ; i++){ | |
272 ptr = &data[i]; | |
273 mono = pcm[i] ; | |
274 | |
275 for(j = 0 ; j < samples ; j++) { | |
276 | |
277 val = mono[j] * 32767.f; | |
278 | |
279 if(val > 32767) val = 32767 ; | |
280 if(val < -32768) val = -32768 ; | |
281 | |
282 *ptr = val ; | |
283 ptr += channels; | |
284 } | |
285 } | |
286 | |
287 return 0 ; | |
288 } | |
289 | |
290 | |
291 static int oggvorbis_decode_frame(AVCodecContext *avccontext, | |
292 void *data, int *data_size, | |
1064 | 293 uint8_t *buf, int buf_size) |
883 | 294 { |
295 OggVorbisContext *context = avccontext->priv_data ; | |
296 float **pcm ; | |
1920
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
297 ogg_packet *op= &context->op; |
1919 | 298 int samples, total_samples, total_bytes,i; |
883 | 299 |
1919 | 300 if(!buf_size){ |
301 //FIXME flush | |
302 return 0; | |
303 } | |
304 | |
1920
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
305 op->packet = buf; |
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
306 op->bytes = buf_size; |
883 | 307 |
1919 | 308 // av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %lld %lld %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate); |
309 | |
310 /* for(i=0; i<op->bytes; i++) | |
311 av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]); | |
312 av_log(avccontext, AV_LOG_DEBUG, "\n");*/ | |
883 | 313 |
314 if(vorbis_synthesis(&context->vb, op) == 0) | |
315 vorbis_synthesis_blockin(&context->vd, &context->vb) ; | |
316 | |
317 total_samples = 0 ; | |
318 total_bytes = 0 ; | |
319 | |
320 while((samples = vorbis_synthesis_pcmout(&context->vd, &pcm)) > 0) { | |
321 conv(samples, pcm, (char*)data + total_bytes, context->vi.channels) ; | |
322 total_bytes += samples * 2 * context->vi.channels ; | |
323 total_samples += samples ; | |
324 vorbis_synthesis_read(&context->vd, samples) ; | |
325 } | |
326 | |
327 *data_size = total_bytes ; | |
328 return buf_size ; | |
329 } | |
330 | |
331 | |
332 static int oggvorbis_decode_close(AVCodecContext *avccontext) { | |
333 OggVorbisContext *context = avccontext->priv_data ; | |
334 | |
335 vorbis_info_clear(&context->vi) ; | |
336 vorbis_comment_clear(&context->vc) ; | |
337 | |
338 return 0 ; | |
339 } | |
340 | |
341 | |
342 AVCodec oggvorbis_decoder = { | |
343 "vorbis", | |
344 CODEC_TYPE_AUDIO, | |
345 CODEC_ID_VORBIS, | |
346 sizeof(OggVorbisContext), | |
347 oggvorbis_decode_init, | |
348 NULL, | |
349 oggvorbis_decode_close, | |
350 oggvorbis_decode_frame, | |
2091 | 351 .capabilities= CODEC_CAP_DELAY, |
883 | 352 } ; |