Mercurial > libavcodec.hg
annotate oggvorbis.c @ 2091:02a4fd7c606c libavcodec
flush audio encoder buffers at the end
fix vorbis in nut again
| author | michael |
|---|---|
| date | Tue, 22 Jun 2004 21:14:01 +0000 |
| parents | 141a9539e270 |
| children | 0433866b1075 |
| 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 |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
33 #ifdef OGGVORBIS_VBR_BY_ESTIMATE |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
34 /* variable bitrate by estimate */ |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
35 |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
36 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
|
37 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
|
38 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
|
39 vorbis_encode_setup_init(vi)) ; |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
40 #else |
|
159333d9297e
fixes crash patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
925
diff
changeset
|
41 /* constant bitrate */ |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
42 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
43 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
|
44 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
|
45 #endif |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
46 } |
|
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 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
|
49 OggVorbisContext *context = avccontext->priv_data ; |
|
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
50 ogg_packet header, header_comm, header_code; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
51 uint8_t *p; |
|
636
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 vorbis_info_init(&context->vi) ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
54 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
|
55 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
|
56 return -1 ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
57 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
58 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
|
59 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
|
60 |
|
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
61 vorbis_comment_init(&context->vc); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
62 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
|
63 |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
64 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
|
65 &header_comm, &header_code); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
66 |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
67 avccontext->extradata_size= 3*2 + header.bytes + header_comm.bytes + header_code.bytes; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
68 p= avccontext->extradata= av_mallocz(avccontext->extradata_size); |
|
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 *(p++) = header.bytes>>8; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
71 *(p++) = header.bytes&0xFF; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
72 memcpy(p, header.packet, header.bytes); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
73 p += header.bytes; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
74 |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
75 *(p++) = header_comm.bytes>>8; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
76 *(p++) = header_comm.bytes&0xFF; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
77 memcpy(p, header_comm.packet, header_comm.bytes); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
78 p += header_comm.bytes; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
79 |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
80 *(p++) = header_code.bytes>>8; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
81 *(p++) = header_code.bytes&0xFF; |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
82 memcpy(p, header_code.packet, header_code.bytes); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
83 |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
84 /* vorbis_block_clear(&context->vb); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
85 vorbis_dsp_clear(&context->vd); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
86 vorbis_info_clear(&context->vi);*/ |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
87 vorbis_comment_clear(&context->vc); |
|
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
88 |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
89 avccontext->frame_size = OGGVORBIS_FRAME_SIZE ; |
| 925 | 90 |
| 91 avccontext->coded_frame= avcodec_alloc_frame(); | |
| 92 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
|
93 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
94 return 0 ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
95 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
96 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
97 |
| 883 | 98 static int oggvorbis_encode_frame(AVCodecContext *avccontext, |
| 99 unsigned char *packets, | |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
100 int buf_size, void *data) |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
101 { |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
102 OggVorbisContext *context = avccontext->priv_data ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
103 float **buffer ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
104 ogg_packet op ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
105 signed char *audio = data ; |
| 2091 | 106 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
|
107 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
108 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
|
109 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
110 if(context->vi.channels == 1) { |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
111 for(l = 0 ; l < samples ; l++) |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
112 buffer[0][l]=((audio[l*2+1]<<8)|(0x00ff&(int)audio[l*2]))/32768.f; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
113 } else { |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
114 for(l = 0 ; l < samples ; l++){ |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
115 buffer[0][l]=((audio[l*4+1]<<8)|(0x00ff&(int)audio[l*4]))/32768.f; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
116 buffer[1][l]=((audio[l*4+3]<<8)|(0x00ff&(int)audio[l*4+2]))/32768.f; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
117 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
118 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
119 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
120 vorbis_analysis_wrote(&context->vd, samples) ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
121 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
122 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
|
123 vorbis_analysis(&context->vb, NULL); |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
124 vorbis_bitrate_addblock(&context->vb) ; |
|
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 while(vorbis_bitrate_flushpacket(&context->vd, &op)) { |
| 2091 | 127 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 |
| 128 continue; | |
|
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
129 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
|
130 context->buffer_index += sizeof(ogg_packet); |
|
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
131 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
|
132 context->buffer_index += op.bytes; |
|
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
133 // 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
|
134 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
135 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
136 |
|
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
137 l=0; |
|
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
138 if(context->buffer_index){ |
|
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
139 ogg_packet *op2= (ogg_packet*)context->buffer; |
|
1922
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
140 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
|
141 |
| 2091 | 142 l= op2->bytes; |
| 143 avccontext->coded_frame->pts= av_rescale(op2->granulepos, AV_TIME_BASE, avccontext->sample_rate); | |
|
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
144 |
| 2091 | 145 memcpy(packets, op2->packet, l); |
| 146 context->buffer_index -= l + sizeof(ogg_packet); | |
| 147 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
|
148 // 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
|
149 } |
|
0ed2d7ecd1e9
fix obnoxious ogg_packet passing from encoder to muxer
michael
parents:
1920
diff
changeset
|
150 |
|
1924
d9f751c0f488
pts hack (correct solution would be to pass the pts from the encoder to the muxer)
michael
parents:
1923
diff
changeset
|
151 return l; |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
152 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
153 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
154 |
| 883 | 155 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
|
156 OggVorbisContext *context = avccontext->priv_data ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
157 /* ogg_packet op ; */ |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
158 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
159 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
|
160 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
161 vorbis_block_clear(&context->vb); |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
162 vorbis_dsp_clear(&context->vd); |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
163 vorbis_info_clear(&context->vi); |
| 925 | 164 |
| 165 av_freep(&avccontext->coded_frame); | |
|
1923
04f93474b3bb
remove function call from muxer->encoder and cleanly pass global headers
michael
parents:
1922
diff
changeset
|
166 av_freep(&avccontext->extradata); |
|
636
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 return 0 ; |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
169 } |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
170 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
171 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
172 AVCodec oggvorbis_encoder = { |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
173 "vorbis", |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
174 CODEC_TYPE_AUDIO, |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
175 CODEC_ID_VORBIS, |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
176 sizeof(OggVorbisContext), |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
177 oggvorbis_encode_init, |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
178 oggvorbis_encode_frame, |
| 2091 | 179 oggvorbis_encode_close, |
| 180 .capabilities= CODEC_CAP_DELAY, | |
| 883 | 181 } ; |
| 182 | |
| 183 | |
| 184 static int oggvorbis_decode_init(AVCodecContext *avccontext) { | |
| 185 OggVorbisContext *context = avccontext->priv_data ; | |
| 1925 | 186 uint8_t *p= avccontext->extradata; |
| 187 int i; | |
| 883 | 188 |
| 189 vorbis_info_init(&context->vi) ; | |
| 190 vorbis_comment_init(&context->vc) ; | |
| 1925 | 191 |
| 192 for(i=0; i<3; i++){ | |
| 193 context->op.b_o_s= i==0; | |
| 194 context->op.bytes= *(p++)<<8; | |
| 195 context->op.bytes+=*(p++); | |
| 196 context->op.packet= p; | |
| 197 p += context->op.bytes; | |
| 198 | |
| 199 if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){ | |
| 200 av_log(avccontext, AV_LOG_ERROR, "%d. vorbis header damaged\n", i+1); | |
| 201 return -1; | |
| 202 } | |
| 203 } | |
| 204 avccontext->channels = context->vi.channels; | |
| 205 avccontext->sample_rate = context->vi.rate; | |
| 206 | |
| 207 vorbis_synthesis_init(&context->vd, &context->vi); | |
| 208 vorbis_block_init(&context->vd, &context->vb); | |
| 883 | 209 |
| 210 return 0 ; | |
| 211 } | |
|
636
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
212 |
|
57b9a37546a0
oggvorbis support patch by (Mark Hills <mark at pogo dot org dot uk>)
michaelni
parents:
diff
changeset
|
213 |
| 883 | 214 static inline int conv(int samples, float **pcm, char *buf, int channels) { |
| 215 int i, j, val ; | |
| 216 ogg_int16_t *ptr, *data = (ogg_int16_t*)buf ; | |
| 217 float *mono ; | |
| 218 | |
| 219 for(i = 0 ; i < channels ; i++){ | |
| 220 ptr = &data[i]; | |
| 221 mono = pcm[i] ; | |
| 222 | |
| 223 for(j = 0 ; j < samples ; j++) { | |
| 224 | |
| 225 val = mono[j] * 32767.f; | |
| 226 | |
| 227 if(val > 32767) val = 32767 ; | |
| 228 if(val < -32768) val = -32768 ; | |
| 229 | |
| 230 *ptr = val ; | |
| 231 ptr += channels; | |
| 232 } | |
| 233 } | |
| 234 | |
| 235 return 0 ; | |
| 236 } | |
| 237 | |
| 238 | |
| 239 static int oggvorbis_decode_frame(AVCodecContext *avccontext, | |
| 240 void *data, int *data_size, | |
| 1064 | 241 uint8_t *buf, int buf_size) |
| 883 | 242 { |
| 243 OggVorbisContext *context = avccontext->priv_data ; | |
| 244 float **pcm ; | |
|
1920
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
245 ogg_packet *op= &context->op; |
| 1919 | 246 int samples, total_samples, total_bytes,i; |
| 883 | 247 |
| 1919 | 248 if(!buf_size){ |
| 249 //FIXME flush | |
| 250 return 0; | |
| 251 } | |
| 252 | |
|
1920
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
253 op->packet = buf; |
|
9b87ed973dda
kill obnoxious ogg_packet passing from demuxer to decoder
michael
parents:
1919
diff
changeset
|
254 op->bytes = buf_size; |
| 883 | 255 |
| 1919 | 256 // 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); |
| 257 | |
| 258 /* for(i=0; i<op->bytes; i++) | |
| 259 av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]); | |
| 260 av_log(avccontext, AV_LOG_DEBUG, "\n");*/ | |
| 883 | 261 |
| 262 if(vorbis_synthesis(&context->vb, op) == 0) | |
| 263 vorbis_synthesis_blockin(&context->vd, &context->vb) ; | |
| 264 | |
| 265 total_samples = 0 ; | |
| 266 total_bytes = 0 ; | |
| 267 | |
| 268 while((samples = vorbis_synthesis_pcmout(&context->vd, &pcm)) > 0) { | |
| 269 conv(samples, pcm, (char*)data + total_bytes, context->vi.channels) ; | |
| 270 total_bytes += samples * 2 * context->vi.channels ; | |
| 271 total_samples += samples ; | |
| 272 vorbis_synthesis_read(&context->vd, samples) ; | |
| 273 } | |
| 274 | |
| 275 *data_size = total_bytes ; | |
| 276 return buf_size ; | |
| 277 } | |
| 278 | |
| 279 | |
| 280 static int oggvorbis_decode_close(AVCodecContext *avccontext) { | |
| 281 OggVorbisContext *context = avccontext->priv_data ; | |
| 282 | |
| 283 vorbis_info_clear(&context->vi) ; | |
| 284 vorbis_comment_clear(&context->vc) ; | |
| 285 | |
| 286 return 0 ; | |
| 287 } | |
| 288 | |
| 289 | |
| 290 AVCodec oggvorbis_decoder = { | |
| 291 "vorbis", | |
| 292 CODEC_TYPE_AUDIO, | |
| 293 CODEC_ID_VORBIS, | |
| 294 sizeof(OggVorbisContext), | |
| 295 oggvorbis_decode_init, | |
| 296 NULL, | |
| 297 oggvorbis_decode_close, | |
| 298 oggvorbis_decode_frame, | |
| 2091 | 299 .capabilities= CODEC_CAP_DELAY, |
| 883 | 300 } ; |
