Mercurial > libavcodec.hg
annotate cook.c @ 8680:83453ea78558 libavcodec
ARM: replace jump tables with conditional branches
author | mru |
---|---|
date | Tue, 27 Jan 2009 16:06:47 +0000 |
parents | e49a2e1f0020 |
children | e9d9d946f213 |
rev | line source |
---|---|
2956 | 1 /* |
2 * COOK compatible decoder | |
3 * Copyright (c) 2003 Sascha Sommer | |
4 * Copyright (c) 2005 Benjamin Larsson | |
5 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
6 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
7 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
2956 | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
2956 | 12 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
2956 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3619
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3019
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
2956 | 21 */ |
22 | |
23 /** | |
24 * @file cook.c | |
4845
78bb9129231b
As usual Real actually took something existing and rebranded it.
banan
parents:
4692
diff
changeset
|
25 * Cook compatible decoder. Bastardization of the G.722.1 standard. |
2956 | 26 * This decoder handles RealNetworks, RealAudio G2 data. |
27 * Cook is identified by the codec name cook in RM files. | |
28 * | |
29 * To use this decoder, a calling application must supply the extradata | |
30 * bytes provided from the RM container; 8+ bytes for mono streams and | |
31 * 16+ for stereo streams (maybe more). | |
32 * | |
33 * Codec technicalities (all this assume a buffer length of 1024): | |
34 * Cook works with several different techniques to achieve its compression. | |
35 * In the timedomain the buffer is divided into 8 pieces and quantized. If | |
36 * two neighboring pieces have different quantization index a smooth | |
37 * quantization curve is used to get a smooth overlap between the different | |
38 * pieces. | |
39 * To get to the transformdomain Cook uses a modulated lapped transform. | |
40 * The transform domain has 50 subbands with 20 elements each. This | |
41 * means only a maximum of 50*20=1000 coefficients are used out of the 1024 | |
42 * available. | |
43 */ | |
44 | |
45 #include <math.h> | |
46 #include <stddef.h> | |
47 #include <stdio.h> | |
48 | |
6763 | 49 #include "libavutil/random.h" |
2956 | 50 #include "avcodec.h" |
51 #include "bitstream.h" | |
52 #include "dsputil.h" | |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
53 #include "bytestream.h" |
2956 | 54 |
55 #include "cookdata.h" | |
56 | |
57 /* the different Cook versions */ | |
4425 | 58 #define MONO 0x1000001 |
59 #define STEREO 0x1000002 | |
2956 | 60 #define JOINT_STEREO 0x1000003 |
61 #define MC_COOK 0x2000000 //multichannel Cook, not supported | |
62 | |
63 #define SUBBAND_SIZE 20 | |
64 //#define COOKDEBUG | |
65 | |
66 typedef struct { | |
4639 | 67 int *now; |
68 int *previous; | |
69 } cook_gains; | |
2956 | 70 |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
71 typedef struct cook { |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
72 /* |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
73 * The following 5 functions provide the lowlevel arithmetic on |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
74 * the internal audio buffers. |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
75 */ |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
76 void (* scalar_dequant)(struct cook *q, int index, int quant_index, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
77 int* subband_coef_index, int* subband_coef_sign, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
78 float* mlt_p); |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
79 |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
80 void (* decouple) (struct cook *q, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
81 int subband, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
82 float f1, float f2, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
83 float *decode_buffer, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
84 float *mlt_buffer1, float *mlt_buffer2); |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
85 |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
86 void (* imlt_window) (struct cook *q, float *buffer1, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
87 cook_gains *gains_ptr, float *previous_buffer); |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
88 |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
89 void (* interpolate) (struct cook *q, float* buffer, |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
90 int gain_index, int gain_index_next); |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
91 |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
92 void (* saturate_output) (struct cook *q, int chan, int16_t *out); |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
93 |
2956 | 94 GetBitContext gb; |
95 /* stream data */ | |
96 int nb_channels; | |
97 int joint_stereo; | |
98 int bit_rate; | |
99 int sample_rate; | |
100 int samples_per_channel; | |
101 int samples_per_frame; | |
102 int subbands; | |
3090 | 103 int log2_numvector_size; |
104 int numvector_size; //1 << log2_numvector_size; | |
2956 | 105 int js_subband_start; |
106 int total_subbands; | |
107 int num_vectors; | |
108 int bits_per_subpacket; | |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
109 int cookversion; |
2956 | 110 /* states */ |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
111 AVRandomState random_state; |
2956 | 112 |
113 /* transform data */ | |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
114 MDCTContext mdct_ctx; |
2956 | 115 float* mlt_window; |
116 | |
117 /* gain buffers */ | |
4639 | 118 cook_gains gains1; |
119 cook_gains gains2; | |
120 int gain_1[9]; | |
121 int gain_2[9]; | |
122 int gain_3[9]; | |
123 int gain_4[9]; | |
2956 | 124 |
125 /* VLC data */ | |
126 int js_vlc_bits; | |
127 VLC envelope_quant_index[13]; | |
128 VLC sqvh[7]; //scalar quantization | |
129 VLC ccpl; //channel coupling | |
130 | |
131 /* generatable tables and related variables */ | |
132 int gain_size_factor; | |
133 float gain_table[23]; | |
134 | |
135 /* data buffers */ | |
136 | |
137 uint8_t* decoded_bytes_buffer; | |
4542 | 138 DECLARE_ALIGNED_16(float,mono_mdct_output[2048]); |
2956 | 139 float mono_previous_buffer1[1024]; |
140 float mono_previous_buffer2[1024]; | |
141 float decode_buffer_1[1024]; | |
142 float decode_buffer_2[1024]; | |
5342
887509b42d3f
moving automatic allocation of joint_decode/decode_buffer
mhoffman
parents:
5341
diff
changeset
|
143 float decode_buffer_0[1060]; /* static allocation for joint decode */ |
5347
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
144 |
6197
2ca0a91b0b24
add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type
bcoudurier
parents:
5523
diff
changeset
|
145 const float *cplscales[5]; |
2956 | 146 } COOKContext; |
147 | |
6861 | 148 static float pow2tab[127]; |
149 static float rootpow2tab[127]; | |
150 | |
2956 | 151 /* debug functions */ |
152 | |
153 #ifdef COOKDEBUG | |
154 static void dump_float_table(float* table, int size, int delimiter) { | |
155 int i=0; | |
156 av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i); | |
157 for (i=0 ; i<size ; i++) { | |
158 av_log(NULL, AV_LOG_ERROR, "%5.1f, ", table[i]); | |
159 if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1); | |
160 } | |
161 } | |
162 | |
163 static void dump_int_table(int* table, int size, int delimiter) { | |
164 int i=0; | |
165 av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i); | |
166 for (i=0 ; i<size ; i++) { | |
167 av_log(NULL, AV_LOG_ERROR, "%d, ", table[i]); | |
168 if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1); | |
169 } | |
170 } | |
171 | |
172 static void dump_short_table(short* table, int size, int delimiter) { | |
173 int i=0; | |
174 av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i); | |
175 for (i=0 ; i<size ; i++) { | |
176 av_log(NULL, AV_LOG_ERROR, "%d, ", table[i]); | |
177 if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1); | |
178 } | |
179 } | |
180 | |
181 #endif | |
182 | |
183 /*************** init functions ***************/ | |
184 | |
185 /* table generator */ | |
6861 | 186 static void init_pow2table(void){ |
2956 | 187 int i; |
6860 | 188 for (i=-63 ; i<64 ; i++){ |
6861 | 189 pow2tab[63+i]= pow(2, i); |
190 rootpow2tab[63+i]=sqrt(pow(2, i)); | |
2956 | 191 } |
192 } | |
193 | |
194 /* table generator */ | |
195 static void init_gain_table(COOKContext *q) { | |
196 int i; | |
197 q->gain_size_factor = q->samples_per_channel/8; | |
198 for (i=0 ; i<23 ; i++) { | |
6861 | 199 q->gain_table[i] = pow(pow2tab[i+52] , |
2956 | 200 (1.0/(double)q->gain_size_factor)); |
201 } | |
202 } | |
203 | |
204 | |
205 static int init_cook_vlc_tables(COOKContext *q) { | |
206 int i, result; | |
207 | |
208 result = 0; | |
209 for (i=0 ; i<13 ; i++) { | |
4951 | 210 result |= init_vlc (&q->envelope_quant_index[i], 9, 24, |
2956 | 211 envelope_quant_index_huffbits[i], 1, 1, |
212 envelope_quant_index_huffcodes[i], 2, 2, 0); | |
213 } | |
214 av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n"); | |
215 for (i=0 ; i<7 ; i++) { | |
4951 | 216 result |= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i], |
2956 | 217 cvh_huffbits[i], 1, 1, |
218 cvh_huffcodes[i], 2, 2, 0); | |
219 } | |
220 | |
221 if (q->nb_channels==2 && q->joint_stereo==1){ | |
4951 | 222 result |= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, |
2956 | 223 ccpl_huffbits[q->js_vlc_bits-2], 1, 1, |
224 ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); | |
225 av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); | |
226 } | |
227 | |
228 av_log(NULL,AV_LOG_DEBUG,"VLC tables initialized.\n"); | |
229 return result; | |
230 } | |
231 | |
232 static int init_cook_mlt(COOKContext *q) { | |
233 int j; | |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
234 int mlt_size = q->samples_per_channel; |
2956 | 235 |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
236 if ((q->mlt_window = av_malloc(sizeof(float)*mlt_size)) == 0) |
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
237 return -1; |
2956 | 238 |
239 /* Initialize the MLT window: simple sine window. */ | |
7094
b0820b8bd4dd
Add generic ff_sine_window_init function and implement in codecs appropriately
superdump
parents:
7040
diff
changeset
|
240 ff_sine_window_init(q->mlt_window, mlt_size); |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
241 for(j=0 ; j<mlt_size ; j++) |
7094
b0820b8bd4dd
Add generic ff_sine_window_init function and implement in codecs appropriately
superdump
parents:
7040
diff
changeset
|
242 q->mlt_window[j] *= sqrt(2.0 / q->samples_per_channel); |
2956 | 243 |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
244 /* Initialize the MDCT. */ |
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
245 if (ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size)+1, 1)) { |
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
246 av_free(q->mlt_window); |
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
247 return -1; |
2956 | 248 } |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
249 av_log(NULL,AV_LOG_DEBUG,"MDCT initialized, order = %d.\n", |
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
250 av_log2(mlt_size)+1); |
2956 | 251 |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
252 return 0; |
2956 | 253 } |
254 | |
6197
2ca0a91b0b24
add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type
bcoudurier
parents:
5523
diff
changeset
|
255 static const float *maybe_reformat_buffer32 (COOKContext *q, const float *ptr, int n) |
5347
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
256 { |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
257 if (1) |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
258 return ptr; |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
259 } |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
260 |
5507 | 261 static void init_cplscales_table (COOKContext *q) { |
5347
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
262 int i; |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
263 for (i=0;i<5;i++) |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
264 q->cplscales[i] = maybe_reformat_buffer32 (q, cplscales[i], (1<<(i+2))-1); |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
265 } |
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
266 |
2956 | 267 /*************** init functions end ***********/ |
268 | |
269 /** | |
270 * Cook indata decoding, every 32 bits are XORed with 0x37c511f2. | |
271 * Why? No idea, some checksum/error detection method maybe. | |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
272 * |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
273 * Out buffer size: extra bytes are needed to cope with |
5408 | 274 * padding/misalignment. |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
275 * Subpackets passed to the decoder can contain two, consecutive |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
276 * half-subpackets, of identical but arbitrary size. |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
277 * 1234 1234 1234 1234 extraA extraB |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
278 * Case 1: AAAA BBBB 0 0 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
279 * Case 2: AAAA ABBB BB-- 3 3 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
280 * Case 3: AAAA AABB BBBB 2 2 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
281 * Case 4: AAAA AAAB BBBB BB-- 1 5 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
282 * |
2956 | 283 * Nice way to waste CPU cycles. |
284 * | |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
285 * @param inbuffer pointer to byte array of indata |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
286 * @param out pointer to byte array of outdata |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
287 * @param bytes number of bytes |
2956 | 288 */ |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
289 #define DECODE_BYTES_PAD1(bytes) (3 - ((bytes)+3) % 4) |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
290 #define DECODE_BYTES_PAD2(bytes) ((bytes) % 4 + DECODE_BYTES_PAD1(2 * (bytes))) |
2956 | 291 |
6232 | 292 static inline int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){ |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
293 int i, off; |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
294 uint32_t c; |
6232 | 295 const uint32_t* buf; |
2956 | 296 uint32_t* obuf = (uint32_t*) out; |
297 /* FIXME: 64 bit platforms would be able to do 64 bits at a time. | |
298 * I'm too lazy though, should be something like | |
299 * for(i=0 ; i<bitamount/64 ; i++) | |
300 * (int64_t)out[i] = 0x37c511f237c511f2^be2me_64(int64_t)in[i]); | |
301 * Buffer alignment needs to be checked. */ | |
302 | |
4429 | 303 off = (int)((long)inbuffer & 3); |
6232 | 304 buf = (const uint32_t*) (inbuffer - off); |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
305 c = be2me_32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8)))); |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
306 bytes += 3 + off; |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
307 for (i = 0; i < bytes/4; i++) |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
308 obuf[i] = c ^ buf[i]; |
2956 | 309 |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
310 return off; |
2956 | 311 } |
312 | |
313 /** | |
314 * Cook uninit | |
315 */ | |
316 | |
317 static int cook_decode_close(AVCodecContext *avctx) | |
318 { | |
319 int i; | |
320 COOKContext *q = avctx->priv_data; | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
321 av_log(avctx,AV_LOG_DEBUG, "Deallocating memory.\n"); |
2956 | 322 |
323 /* Free allocated memory buffers. */ | |
324 av_free(q->mlt_window); | |
325 av_free(q->decoded_bytes_buffer); | |
326 | |
327 /* Free the transform. */ | |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
328 ff_mdct_end(&q->mdct_ctx); |
2956 | 329 |
330 /* Free the VLC tables. */ | |
331 for (i=0 ; i<13 ; i++) { | |
332 free_vlc(&q->envelope_quant_index[i]); | |
333 } | |
334 for (i=0 ; i<7 ; i++) { | |
335 free_vlc(&q->sqvh[i]); | |
336 } | |
337 if(q->nb_channels==2 && q->joint_stereo==1 ){ | |
338 free_vlc(&q->ccpl); | |
339 } | |
340 | |
341 av_log(NULL,AV_LOG_DEBUG,"Memory deallocated.\n"); | |
342 | |
343 return 0; | |
344 } | |
345 | |
346 /** | |
4639 | 347 * Fill the gain array for the timedomain quantization. |
2956 | 348 * |
349 * @param q pointer to the COOKContext | |
6903 | 350 * @param gaininfo[9] array of gain indexes |
2956 | 351 */ |
352 | |
4639 | 353 static void decode_gain_info(GetBitContext *gb, int *gaininfo) |
354 { | |
355 int i, n; | |
2956 | 356 |
357 while (get_bits1(gb)) {} | |
4639 | 358 n = get_bits_count(gb) - 1; //amount of elements*2 to update |
2956 | 359 |
4639 | 360 i = 0; |
361 while (n--) { | |
362 int index = get_bits(gb, 3); | |
363 int gain = get_bits1(gb) ? get_bits(gb, 4) - 7 : -1; | |
364 | |
365 while (i <= index) gaininfo[i++] = gain; | |
2956 | 366 } |
4639 | 367 while (i <= 8) gaininfo[i++] = 0; |
2956 | 368 } |
369 | |
370 /** | |
371 * Create the quant index table needed for the envelope. | |
372 * | |
373 * @param q pointer to the COOKContext | |
374 * @param quant_index_table pointer to the array | |
375 */ | |
376 | |
377 static void decode_envelope(COOKContext *q, int* quant_index_table) { | |
378 int i,j, vlc_index; | |
379 | |
380 quant_index_table[0]= get_bits(&q->gb,6) - 6; //This is used later in categorize | |
381 | |
382 for (i=1 ; i < q->total_subbands ; i++){ | |
383 vlc_index=i; | |
384 if (i >= q->js_subband_start * 2) { | |
385 vlc_index-=q->js_subband_start; | |
386 } else { | |
387 vlc_index/=2; | |
388 if(vlc_index < 1) vlc_index = 1; | |
389 } | |
390 if (vlc_index>13) vlc_index = 13; //the VLC tables >13 are identical to No. 13 | |
391 | |
392 j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index-1].table, | |
393 q->envelope_quant_index[vlc_index-1].bits,2); | |
394 quant_index_table[i] = quant_index_table[i-1] + j - 12; //differential encoding | |
395 } | |
396 } | |
397 | |
398 /** | |
399 * Calculate the category and category_index vector. | |
400 * | |
401 * @param q pointer to the COOKContext | |
402 * @param quant_index_table pointer to the array | |
403 * @param category pointer to the category array | |
404 * @param category_index pointer to the category_index array | |
405 */ | |
406 | |
407 static void categorize(COOKContext *q, int* quant_index_table, | |
408 int* category, int* category_index){ | |
4952
1900e2eaecda
Add another tmpbias variable, as bias' value will be used later
ramiro
parents:
4951
diff
changeset
|
409 int exp_idx, bias, tmpbias1, tmpbias2, bits_left, num_bits, index, v, i, j; |
2956 | 410 int exp_index2[102]; |
411 int exp_index1[102]; | |
412 | |
4955
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
413 int tmp_categorize_array[128*2]; |
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
414 int tmp_categorize_array1_idx=q->numvector_size; |
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
415 int tmp_categorize_array2_idx=q->numvector_size; |
2956 | 416 |
417 bits_left = q->bits_per_subpacket - get_bits_count(&q->gb); | |
418 | |
419 if(bits_left > q->samples_per_channel) { | |
420 bits_left = q->samples_per_channel + | |
421 ((bits_left - q->samples_per_channel)*5)/8; | |
422 //av_log(NULL, AV_LOG_ERROR, "bits_left = %d\n",bits_left); | |
423 } | |
424 | |
425 memset(&exp_index1,0,102*sizeof(int)); | |
426 memset(&exp_index2,0,102*sizeof(int)); | |
4955
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
427 memset(&tmp_categorize_array,0,128*2*sizeof(int)); |
2956 | 428 |
429 bias=-32; | |
430 | |
431 /* Estimate bias. */ | |
432 for (i=32 ; i>0 ; i=i/2){ | |
433 num_bits = 0; | |
434 index = 0; | |
435 for (j=q->total_subbands ; j>0 ; j--){ | |
4863 | 436 exp_idx = av_clip((i - quant_index_table[index] + bias) / 2, 0, 7); |
2956 | 437 index++; |
438 num_bits+=expbits_tab[exp_idx]; | |
439 } | |
440 if(num_bits >= bits_left - 32){ | |
441 bias+=i; | |
442 } | |
443 } | |
444 | |
445 /* Calculate total number of bits. */ | |
446 num_bits=0; | |
447 for (i=0 ; i<q->total_subbands ; i++) { | |
4863 | 448 exp_idx = av_clip((bias - quant_index_table[i]) / 2, 0, 7); |
2956 | 449 num_bits += expbits_tab[exp_idx]; |
450 exp_index1[i] = exp_idx; | |
451 exp_index2[i] = exp_idx; | |
452 } | |
4952
1900e2eaecda
Add another tmpbias variable, as bias' value will be used later
ramiro
parents:
4951
diff
changeset
|
453 tmpbias1 = tmpbias2 = num_bits; |
2956 | 454 |
455 for (j = 1 ; j < q->numvector_size ; j++) { | |
4952
1900e2eaecda
Add another tmpbias variable, as bias' value will be used later
ramiro
parents:
4951
diff
changeset
|
456 if (tmpbias1 + tmpbias2 > 2*bits_left) { /* ---> */ |
2956 | 457 int max = -999999; |
458 index=-1; | |
459 for (i=0 ; i<q->total_subbands ; i++){ | |
460 if (exp_index1[i] < 7) { | |
4954
1fd90978db25
Add bias instead of -32 or 0, as is done in g.722.1
ramiro
parents:
4953
diff
changeset
|
461 v = (-2*exp_index1[i]) - quant_index_table[i] + bias; |
2956 | 462 if ( v >= max) { |
463 max = v; | |
464 index = i; | |
465 } | |
466 } | |
467 } | |
468 if(index==-1)break; | |
4955
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
469 tmp_categorize_array[tmp_categorize_array1_idx++] = index; |
4952
1900e2eaecda
Add another tmpbias variable, as bias' value will be used later
ramiro
parents:
4951
diff
changeset
|
470 tmpbias1 -= expbits_tab[exp_index1[index]] - |
4953 | 471 expbits_tab[exp_index1[index]+1]; |
2956 | 472 ++exp_index1[index]; |
473 } else { /* <--- */ | |
474 int min = 999999; | |
475 index=-1; | |
476 for (i=0 ; i<q->total_subbands ; i++){ | |
477 if(exp_index2[i] > 0){ | |
4954
1fd90978db25
Add bias instead of -32 or 0, as is done in g.722.1
ramiro
parents:
4953
diff
changeset
|
478 v = (-2*exp_index2[i])-quant_index_table[i]+bias; |
2956 | 479 if ( v < min) { |
480 min = v; | |
481 index = i; | |
482 } | |
483 } | |
484 } | |
485 if(index == -1)break; | |
4955
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
486 tmp_categorize_array[--tmp_categorize_array2_idx] = index; |
4952
1900e2eaecda
Add another tmpbias variable, as bias' value will be used later
ramiro
parents:
4951
diff
changeset
|
487 tmpbias2 -= expbits_tab[exp_index2[index]] - |
4953 | 488 expbits_tab[exp_index2[index]-1]; |
2956 | 489 --exp_index2[index]; |
490 } | |
491 } | |
492 | |
493 for(i=0 ; i<q->total_subbands ; i++) | |
494 category[i] = exp_index2[i]; | |
495 | |
4955
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
496 for(i=0 ; i<q->numvector_size-1 ; i++) |
bbe763044678
Use 1 array with double the size instead of 2 arrays with normal size
ramiro
parents:
4954
diff
changeset
|
497 category_index[i] = tmp_categorize_array[tmp_categorize_array2_idx++]; |
2956 | 498 |
499 } | |
500 | |
501 | |
502 /** | |
503 * Expand the category vector. | |
504 * | |
505 * @param q pointer to the COOKContext | |
506 * @param category pointer to the category array | |
507 * @param category_index pointer to the category_index array | |
508 */ | |
509 | |
4908
777f250df232
Fix multiple "¡Æinline/static¡Ç is not at beginning of declaration" warnings.
diego
parents:
4863
diff
changeset
|
510 static inline void expand_category(COOKContext *q, int* category, |
2956 | 511 int* category_index){ |
512 int i; | |
513 for(i=0 ; i<q->num_vectors ; i++){ | |
514 ++category[category_index[i]]; | |
515 } | |
516 } | |
517 | |
518 /** | |
519 * The real requantization of the mltcoefs | |
520 * | |
521 * @param q pointer to the COOKContext | |
522 * @param index index | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
523 * @param quant_index quantisation index |
2956 | 524 * @param subband_coef_index array of indexes to quant_centroid_tab |
4674 | 525 * @param subband_coef_sign signs of coefficients |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
526 * @param mlt_p pointer into the mlt buffer |
2956 | 527 */ |
528 | |
5353
7e4703e16bbd
fixpoint: renaming all lowlevel arithmetic routines to xxx_float
mhoffman
parents:
5350
diff
changeset
|
529 static void scalar_dequant_float(COOKContext *q, int index, int quant_index, |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
530 int* subband_coef_index, int* subband_coef_sign, |
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
531 float* mlt_p){ |
2956 | 532 int i; |
533 float f1; | |
534 | |
535 for(i=0 ; i<SUBBAND_SIZE ; i++) { | |
536 if (subband_coef_index[i]) { | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
537 f1 = quant_centroid_tab[index][subband_coef_index[i]]; |
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
538 if (subband_coef_sign[i]) f1 = -f1; |
2956 | 539 } else { |
4674 | 540 /* noise coding if subband_coef_index[i] == 0 */ |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
541 f1 = dither_tab[index]; |
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
542 if (av_random(&q->random_state) < 0x80000000) f1 = -f1; |
2956 | 543 } |
6861 | 544 mlt_p[i] = f1 * rootpow2tab[quant_index+63]; |
2956 | 545 } |
546 } | |
547 /** | |
4674 | 548 * Unpack the subband_coef_index and subband_coef_sign vectors. |
2956 | 549 * |
550 * @param q pointer to the COOKContext | |
551 * @param category pointer to the category array | |
552 * @param subband_coef_index array of indexes to quant_centroid_tab | |
4674 | 553 * @param subband_coef_sign signs of coefficients |
2956 | 554 */ |
555 | |
556 static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index, | |
4674 | 557 int* subband_coef_sign) { |
2956 | 558 int i,j; |
559 int vlc, vd ,tmp, result; | |
560 | |
561 vd = vd_tab[category]; | |
562 result = 0; | |
563 for(i=0 ; i<vpr_tab[category] ; i++){ | |
564 vlc = get_vlc2(&q->gb, q->sqvh[category].table, q->sqvh[category].bits, 3); | |
565 if (q->bits_per_subpacket < get_bits_count(&q->gb)){ | |
566 vlc = 0; | |
567 result = 1; | |
568 } | |
569 for(j=vd-1 ; j>=0 ; j--){ | |
570 tmp = (vlc * invradix_tab[category])/0x100000; | |
571 subband_coef_index[vd*i+j] = vlc - tmp * (kmax_tab[category]+1); | |
572 vlc = tmp; | |
573 } | |
574 for(j=0 ; j<vd ; j++){ | |
575 if (subband_coef_index[i*vd + j]) { | |
576 if(get_bits_count(&q->gb) < q->bits_per_subpacket){ | |
4674 | 577 subband_coef_sign[i*vd+j] = get_bits1(&q->gb); |
2956 | 578 } else { |
579 result=1; | |
4674 | 580 subband_coef_sign[i*vd+j]=0; |
2956 | 581 } |
582 } else { | |
4674 | 583 subband_coef_sign[i*vd+j]=0; |
2956 | 584 } |
585 } | |
586 } | |
587 return result; | |
588 } | |
589 | |
590 | |
591 /** | |
592 * Fill the mlt_buffer with mlt coefficients. | |
593 * | |
594 * @param q pointer to the COOKContext | |
595 * @param category pointer to the category array | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
596 * @param quant_index_table pointer to the array |
2956 | 597 * @param mlt_buffer pointer to mlt coefficients |
598 */ | |
599 | |
600 | |
601 static void decode_vectors(COOKContext* q, int* category, | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
602 int *quant_index_table, float* mlt_buffer){ |
2956 | 603 /* A zero in this table means that the subband coefficient is |
604 random noise coded. */ | |
4674 | 605 int subband_coef_index[SUBBAND_SIZE]; |
2956 | 606 /* A zero in this table means that the subband coefficient is a |
607 positive multiplicator. */ | |
4674 | 608 int subband_coef_sign[SUBBAND_SIZE]; |
2956 | 609 int band, j; |
610 int index=0; | |
611 | |
612 for(band=0 ; band<q->total_subbands ; band++){ | |
613 index = category[band]; | |
614 if(category[band] < 7){ | |
4674 | 615 if(unpack_SQVH(q, category[band], subband_coef_index, subband_coef_sign)){ |
2956 | 616 index=7; |
617 for(j=0 ; j<q->total_subbands ; j++) category[band+j]=7; | |
618 } | |
619 } | |
620 if(index==7) { | |
621 memset(subband_coef_index, 0, sizeof(subband_coef_index)); | |
4674 | 622 memset(subband_coef_sign, 0, sizeof(subband_coef_sign)); |
2956 | 623 } |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
624 q->scalar_dequant(q, index, quant_index_table[band], |
5350
503498b93901
cosmetics: adding some white space to align the arguments of a couple of functions
mhoffman
parents:
5348
diff
changeset
|
625 subband_coef_index, subband_coef_sign, |
503498b93901
cosmetics: adding some white space to align the arguments of a couple of functions
mhoffman
parents:
5348
diff
changeset
|
626 &mlt_buffer[band * SUBBAND_SIZE]); |
2956 | 627 } |
628 | |
629 if(q->total_subbands*SUBBAND_SIZE >= q->samples_per_channel){ | |
630 return; | |
4674 | 631 } /* FIXME: should this be removed, or moved into loop above? */ |
2956 | 632 } |
633 | |
634 | |
635 /** | |
636 * function for decoding mono data | |
637 * | |
638 * @param q pointer to the COOKContext | |
4860 | 639 * @param mlt_buffer pointer to mlt coefficients |
2956 | 640 */ |
641 | |
642 static void mono_decode(COOKContext *q, float* mlt_buffer) { | |
643 | |
644 int category_index[128]; | |
645 int quant_index_table[102]; | |
646 int category[128]; | |
647 | |
648 memset(&category, 0, 128*sizeof(int)); | |
649 memset(&category_index, 0, 128*sizeof(int)); | |
650 | |
651 decode_envelope(q, quant_index_table); | |
3090 | 652 q->num_vectors = get_bits(&q->gb,q->log2_numvector_size); |
2956 | 653 categorize(q, quant_index_table, category, category_index); |
654 expand_category(q, category, category_index); | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
655 decode_vectors(q, category, quant_index_table, mlt_buffer); |
2956 | 656 } |
657 | |
658 | |
659 /** | |
660 * the actual requantization of the timedomain samples | |
661 * | |
662 * @param q pointer to the COOKContext | |
663 * @param buffer pointer to the timedomain buffer | |
664 * @param gain_index index for the block multiplier | |
665 * @param gain_index_next index for the next block multiplier | |
666 */ | |
667 | |
5353
7e4703e16bbd
fixpoint: renaming all lowlevel arithmetic routines to xxx_float
mhoffman
parents:
5350
diff
changeset
|
668 static void interpolate_float(COOKContext *q, float* buffer, |
2956 | 669 int gain_index, int gain_index_next){ |
670 int i; | |
671 float fc1, fc2; | |
6861 | 672 fc1 = pow2tab[gain_index+63]; |
2956 | 673 |
674 if(gain_index == gain_index_next){ //static gain | |
675 for(i=0 ; i<q->gain_size_factor ; i++){ | |
676 buffer[i]*=fc1; | |
677 } | |
678 return; | |
679 } else { //smooth gain | |
680 fc2 = q->gain_table[11 + (gain_index_next-gain_index)]; | |
681 for(i=0 ; i<q->gain_size_factor ; i++){ | |
682 buffer[i]*=fc1; | |
683 fc1*=fc2; | |
684 } | |
685 return; | |
686 } | |
687 } | |
688 | |
5345
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
689 /** |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
690 * Apply transform window, overlap buffers. |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
691 * |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
692 * @param q pointer to the COOKContext |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
693 * @param inbuffer pointer to the mltcoefficients |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
694 * @param gains_ptr current and previous gains |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
695 * @param previous_buffer pointer to the previous buffer to be used for overlapping |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
696 */ |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
697 |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
698 static void imlt_window_float (COOKContext *q, float *buffer1, |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
699 cook_gains *gains_ptr, float *previous_buffer) |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
700 { |
6861 | 701 const float fc = pow2tab[gains_ptr->previous[0] + 63]; |
5345
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
702 int i; |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
703 /* The weird thing here, is that the two halves of the time domain |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
704 * buffer are swapped. Also, the newest data, that we save away for |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
705 * next frame, has the wrong sign. Hence the subtraction below. |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
706 * Almost sounds like a complex conjugate/reverse data/FFT effect. |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
707 */ |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
708 |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
709 /* Apply window and overlap */ |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
710 for(i = 0; i < q->samples_per_channel; i++){ |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
711 buffer1[i] = buffer1[i] * fc * q->mlt_window[i] - |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
712 previous_buffer[i] * q->mlt_window[q->samples_per_channel - 1 - i]; |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
713 } |
af1c85da8982
fixpoint: separate windowing arithmetic imlt_window_float
mhoffman
parents:
5344
diff
changeset
|
714 } |
2956 | 715 |
716 /** | |
4653 | 717 * The modulated lapped transform, this takes transform coefficients |
718 * and transforms them into timedomain samples. | |
719 * Apply transform window, overlap buffers, apply gain profile | |
720 * and buffer management. | |
2956 | 721 * |
722 * @param q pointer to the COOKContext | |
4653 | 723 * @param inbuffer pointer to the mltcoefficients |
4639 | 724 * @param gains_ptr current and previous gains |
2956 | 725 * @param previous_buffer pointer to the previous buffer to be used for overlapping |
726 */ | |
727 | |
4653 | 728 static void imlt_gain(COOKContext *q, float *inbuffer, |
729 cook_gains *gains_ptr, float* previous_buffer) | |
4639 | 730 { |
4653 | 731 float *buffer0 = q->mono_mdct_output; |
732 float *buffer1 = q->mono_mdct_output + q->samples_per_channel; | |
2956 | 733 int i; |
4639 | 734 |
4653 | 735 /* Inverse modified discrete cosine transform */ |
7547 | 736 ff_imdct_calc(&q->mdct_ctx, q->mono_mdct_output, inbuffer); |
4653 | 737 |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
738 q->imlt_window (q, buffer1, gains_ptr, previous_buffer); |
2956 | 739 |
4639 | 740 /* Apply gain profile */ |
741 for (i = 0; i < 8; i++) { | |
742 if (gains_ptr->now[i] || gains_ptr->now[i + 1]) | |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
743 q->interpolate(q, &buffer1[q->gain_size_factor * i], |
5350
503498b93901
cosmetics: adding some white space to align the arguments of a couple of functions
mhoffman
parents:
5348
diff
changeset
|
744 gains_ptr->now[i], gains_ptr->now[i + 1]); |
4639 | 745 } |
2956 | 746 |
747 /* Save away the current to be previous block. */ | |
4653 | 748 memcpy(previous_buffer, buffer0, sizeof(float)*q->samples_per_channel); |
2956 | 749 } |
750 | |
751 | |
752 /** | |
753 * function for getting the jointstereo coupling information | |
754 * | |
755 * @param q pointer to the COOKContext | |
756 * @param decouple_tab decoupling array | |
757 * | |
758 */ | |
759 | |
760 static void decouple_info(COOKContext *q, int* decouple_tab){ | |
761 int length, i; | |
762 | |
763 if(get_bits1(&q->gb)) { | |
764 if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return; | |
765 | |
766 length = cplband[q->subbands-1] - cplband[q->js_subband_start] + 1; | |
767 for (i=0 ; i<length ; i++) { | |
768 decouple_tab[cplband[q->js_subband_start] + i] = get_vlc2(&q->gb, q->ccpl.table, q->ccpl.bits, 2); | |
769 } | |
770 return; | |
771 } | |
772 | |
773 if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return; | |
774 | |
775 length = cplband[q->subbands-1] - cplband[q->js_subband_start] + 1; | |
776 for (i=0 ; i<length ; i++) { | |
777 decouple_tab[cplband[q->js_subband_start] + i] = get_bits(&q->gb, q->js_vlc_bits); | |
778 } | |
779 return; | |
780 } | |
781 | |
5344
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
782 /* |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
783 * function decouples a pair of signals from a single signal via multiplication. |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
784 * |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
785 * @param q pointer to the COOKContext |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
786 * @param subband index of the current subband |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
787 * @param f1 multiplier for channel 1 extraction |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
788 * @param f2 multiplier for channel 2 extraction |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
789 * @param decode_buffer input buffer |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
790 * @param mlt_buffer1 pointer to left channel mlt coefficients |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
791 * @param mlt_buffer2 pointer to right channel mlt coefficients |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
792 */ |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
793 static void decouple_float (COOKContext *q, |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
794 int subband, |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
795 float f1, float f2, |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
796 float *decode_buffer, |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
797 float *mlt_buffer1, float *mlt_buffer2) |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
798 { |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
799 int j, tmp_idx; |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
800 for (j=0 ; j<SUBBAND_SIZE ; j++) { |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
801 tmp_idx = ((q->js_subband_start + subband)*SUBBAND_SIZE)+j; |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
802 mlt_buffer1[SUBBAND_SIZE*subband + j] = f1 * decode_buffer[tmp_idx]; |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
803 mlt_buffer2[SUBBAND_SIZE*subband + j] = f2 * decode_buffer[tmp_idx]; |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
804 } |
b0d49997bd92
separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
mhoffman
parents:
5343
diff
changeset
|
805 } |
2956 | 806 |
807 /** | |
808 * function for decoding joint stereo data | |
809 * | |
810 * @param q pointer to the COOKContext | |
811 * @param mlt_buffer1 pointer to left channel mlt coefficients | |
812 * @param mlt_buffer2 pointer to right channel mlt coefficients | |
813 */ | |
814 | |
815 static void joint_decode(COOKContext *q, float* mlt_buffer1, | |
816 float* mlt_buffer2) { | |
817 int i,j; | |
818 int decouple_tab[SUBBAND_SIZE]; | |
5342
887509b42d3f
moving automatic allocation of joint_decode/decode_buffer
mhoffman
parents:
5341
diff
changeset
|
819 float *decode_buffer = q->decode_buffer_0; |
5448 | 820 int idx, cpl_tmp; |
2956 | 821 float f1,f2; |
6197
2ca0a91b0b24
add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type
bcoudurier
parents:
5523
diff
changeset
|
822 const float* cplscale; |
2956 | 823 |
824 memset(decouple_tab, 0, sizeof(decouple_tab)); | |
825 memset(decode_buffer, 0, sizeof(decode_buffer)); | |
826 | |
827 /* Make sure the buffers are zeroed out. */ | |
828 memset(mlt_buffer1,0, 1024*sizeof(float)); | |
829 memset(mlt_buffer2,0, 1024*sizeof(float)); | |
830 decouple_info(q, decouple_tab); | |
831 mono_decode(q, decode_buffer); | |
832 | |
833 /* The two channels are stored interleaved in decode_buffer. */ | |
834 for (i=0 ; i<q->js_subband_start ; i++) { | |
835 for (j=0 ; j<SUBBAND_SIZE ; j++) { | |
836 mlt_buffer1[i*20+j] = decode_buffer[i*40+j]; | |
837 mlt_buffer2[i*20+j] = decode_buffer[i*40+20+j]; | |
838 } | |
839 } | |
840 | |
841 /* When we reach js_subband_start (the higher frequencies) | |
842 the coefficients are stored in a coupling scheme. */ | |
843 idx = (1 << q->js_vlc_bits) - 1; | |
3009
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
844 for (i=q->js_subband_start ; i<q->subbands ; i++) { |
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
845 cpl_tmp = cplband[i]; |
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
846 idx -=decouple_tab[cpl_tmp]; |
5347
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
847 cplscale = q->cplscales[q->js_vlc_bits-2]; //choose decoupler table |
3009
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
848 f1 = cplscale[decouple_tab[cpl_tmp]]; |
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
849 f2 = cplscale[idx-1]; |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
850 q->decouple (q, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2); |
3009
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
851 idx = (1 << q->js_vlc_bits) - 1; |
2956 | 852 } |
853 } | |
854 | |
855 /** | |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
856 * First part of subpacket decoding: |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
857 * decode raw stream bytes and read gain info. |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
858 * |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
859 * @param q pointer to the COOKContext |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
860 * @param inbuffer pointer to raw stream data |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
861 * @param gain_ptr array of current/prev gain pointers |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
862 */ |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
863 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
864 static inline void |
6232 | 865 decode_bytes_and_gain(COOKContext *q, const uint8_t *inbuffer, |
4639 | 866 cook_gains *gains_ptr) |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
867 { |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
868 int offset; |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
869 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
870 offset = decode_bytes(inbuffer, q->decoded_bytes_buffer, |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
871 q->bits_per_subpacket/8); |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
872 init_get_bits(&q->gb, q->decoded_bytes_buffer + offset, |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
873 q->bits_per_subpacket); |
4639 | 874 decode_gain_info(&q->gb, gains_ptr->now); |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
875 |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
876 /* Swap current and previous gains */ |
4639 | 877 FFSWAP(int *, gains_ptr->now, gains_ptr->previous); |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
878 } |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
879 |
5343
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
880 /** |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
881 * Saturate the output signal to signed 16bit integers. |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
882 * |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
883 * @param q pointer to the COOKContext |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
884 * @param chan channel to saturate |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
885 * @param out pointer to the output vector |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
886 */ |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
887 static void |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
888 saturate_output_float (COOKContext *q, int chan, int16_t *out) |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
889 { |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
890 int j; |
5348 | 891 float *output = q->mono_mdct_output + q->samples_per_channel; |
5343
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
892 /* Clip and convert floats to 16 bits. |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
893 */ |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
894 for (j = 0; j < q->samples_per_channel; j++) { |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
895 out[chan + q->nb_channels * j] = |
5523 | 896 av_clip_int16(lrintf(output[j])); |
5343
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
897 } |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
898 } |
1aa26b974dc3
separating saturation codes so that we can support other data formats
mhoffman
parents:
5342
diff
changeset
|
899 |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
900 /** |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
901 * Final part of subpacket decoding: |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
902 * Apply modulated lapped transform, gain compensation, |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
903 * clip and convert to integer. |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
904 * |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
905 * @param q pointer to the COOKContext |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
906 * @param decode_buffer pointer to the mlt coefficients |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
907 * @param gain_ptr array of current/prev gain pointers |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
908 * @param previous_buffer pointer to the previous buffer to be used for overlapping |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
909 * @param out pointer to the output buffer |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
910 * @param chan 0: left or single channel, 1: right channel |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
911 */ |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
912 |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
913 static inline void |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
914 mlt_compensate_output(COOKContext *q, float *decode_buffer, |
4639 | 915 cook_gains *gains, float *previous_buffer, |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
916 int16_t *out, int chan) |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
917 { |
4653 | 918 imlt_gain(q, decode_buffer, gains, previous_buffer); |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
919 q->saturate_output (q, chan, out); |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
920 } |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
921 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
922 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
923 /** |
2956 | 924 * Cook subpacket decoding. This function returns one decoded subpacket, |
925 * usually 1024 samples per channel. | |
926 * | |
927 * @param q pointer to the COOKContext | |
928 * @param inbuffer pointer to the inbuffer | |
929 * @param sub_packet_size subpacket size | |
930 * @param outbuffer pointer to the outbuffer | |
931 */ | |
932 | |
933 | |
6232 | 934 static int decode_subpacket(COOKContext *q, const uint8_t *inbuffer, |
2956 | 935 int sub_packet_size, int16_t *outbuffer) { |
936 /* packet dump */ | |
937 // for (i=0 ; i<sub_packet_size ; i++) { | |
938 // av_log(NULL, AV_LOG_ERROR, "%02x", inbuffer[i]); | |
939 // } | |
940 // av_log(NULL, AV_LOG_ERROR, "\n"); | |
941 | |
4639 | 942 decode_bytes_and_gain(q, inbuffer, &q->gains1); |
2956 | 943 |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
944 if (q->joint_stereo) { |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
945 joint_decode(q, q->decode_buffer_1, q->decode_buffer_2); |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
946 } else { |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
947 mono_decode(q, q->decode_buffer_1); |
2956 | 948 |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
949 if (q->nb_channels == 2) { |
4639 | 950 decode_bytes_and_gain(q, inbuffer + sub_packet_size/2, &q->gains2); |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
951 mono_decode(q, q->decode_buffer_2); |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
952 } |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
953 } |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
954 |
4639 | 955 mlt_compensate_output(q, q->decode_buffer_1, &q->gains1, |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
956 q->mono_previous_buffer1, outbuffer, 0); |
2956 | 957 |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
958 if (q->nb_channels == 2) { |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
959 if (q->joint_stereo) { |
4639 | 960 mlt_compensate_output(q, q->decode_buffer_2, &q->gains1, |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
961 q->mono_previous_buffer2, outbuffer, 1); |
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
962 } else { |
4639 | 963 mlt_compensate_output(q, q->decode_buffer_2, &q->gains2, |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
964 q->mono_previous_buffer2, outbuffer, 1); |
2956 | 965 } |
966 } | |
2959
24805f4d1b84
This patch adds some support for non-joint stereo streams. It also
rtognimp
parents:
2956
diff
changeset
|
967 return q->samples_per_frame * sizeof(int16_t); |
2956 | 968 } |
969 | |
970 | |
971 /** | |
972 * Cook frame decoding | |
973 * | |
974 * @param avctx pointer to the AVCodecContext | |
975 */ | |
976 | |
977 static int cook_decode_frame(AVCodecContext *avctx, | |
978 void *data, int *data_size, | |
6232 | 979 const uint8_t *buf, int buf_size) { |
2956 | 980 COOKContext *q = avctx->priv_data; |
981 | |
982 if (buf_size < avctx->block_align) | |
983 return buf_size; | |
984 | |
985 *data_size = decode_subpacket(q, buf, avctx->block_align, data); | |
986 | |
4638
9f74306d4ac7
Don't output the first two frames, since they don't contain valid audio.
banan
parents:
4594
diff
changeset
|
987 /* Discard the first two frames: no valid audio. */ |
9f74306d4ac7
Don't output the first two frames, since they don't contain valid audio.
banan
parents:
4594
diff
changeset
|
988 if (avctx->frame_number < 2) *data_size = 0; |
9f74306d4ac7
Don't output the first two frames, since they don't contain valid audio.
banan
parents:
4594
diff
changeset
|
989 |
2956 | 990 return avctx->block_align; |
991 } | |
3090 | 992 |
2956 | 993 #ifdef COOKDEBUG |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
994 static void dump_cook_context(COOKContext *q) |
2956 | 995 { |
996 //int i=0; | |
997 #define PRINT(a,b) av_log(NULL,AV_LOG_ERROR," %s = %d\n", a, b); | |
998 av_log(NULL,AV_LOG_ERROR,"COOKextradata\n"); | |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
999 av_log(NULL,AV_LOG_ERROR,"cookversion=%x\n",q->cookversion); |
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1000 if (q->cookversion > STEREO) { |
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1001 PRINT("js_subband_start",q->js_subband_start); |
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1002 PRINT("js_vlc_bits",q->js_vlc_bits); |
2956 | 1003 } |
1004 av_log(NULL,AV_LOG_ERROR,"COOKContext\n"); | |
1005 PRINT("nb_channels",q->nb_channels); | |
1006 PRINT("bit_rate",q->bit_rate); | |
1007 PRINT("sample_rate",q->sample_rate); | |
1008 PRINT("samples_per_channel",q->samples_per_channel); | |
1009 PRINT("samples_per_frame",q->samples_per_frame); | |
1010 PRINT("subbands",q->subbands); | |
1011 PRINT("random_state",q->random_state); | |
1012 PRINT("js_subband_start",q->js_subband_start); | |
3090 | 1013 PRINT("log2_numvector_size",q->log2_numvector_size); |
2956 | 1014 PRINT("numvector_size",q->numvector_size); |
1015 PRINT("total_subbands",q->total_subbands); | |
1016 } | |
1017 #endif | |
3090 | 1018 |
2956 | 1019 /** |
1020 * Cook initialization | |
1021 * | |
1022 * @param avctx pointer to the AVCodecContext | |
1023 */ | |
1024 | |
1025 static int cook_decode_init(AVCodecContext *avctx) | |
1026 { | |
1027 COOKContext *q = avctx->priv_data; | |
6232 | 1028 const uint8_t *edata_ptr = avctx->extradata; |
2956 | 1029 |
1030 /* Take care of the codec specific extradata. */ | |
1031 if (avctx->extradata_size <= 0) { | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1032 av_log(avctx,AV_LOG_ERROR,"Necessary extradata missing!\n"); |
2956 | 1033 return -1; |
1034 } else { | |
1035 /* 8 for mono, 16 for stereo, ? for multichannel | |
1036 Swap to right endianness so we don't need to care later on. */ | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1037 av_log(avctx,AV_LOG_DEBUG,"codecdata_length=%d\n",avctx->extradata_size); |
2956 | 1038 if (avctx->extradata_size >= 8){ |
4542 | 1039 q->cookversion = bytestream_get_be32(&edata_ptr); |
1040 q->samples_per_frame = bytestream_get_be16(&edata_ptr); | |
1041 q->subbands = bytestream_get_be16(&edata_ptr); | |
2956 | 1042 } |
1043 if (avctx->extradata_size >= 16){ | |
4542 | 1044 bytestream_get_be32(&edata_ptr); //Unknown unused |
1045 q->js_subband_start = bytestream_get_be16(&edata_ptr); | |
1046 q->js_vlc_bits = bytestream_get_be16(&edata_ptr); | |
2956 | 1047 } |
1048 } | |
1049 | |
1050 /* Take data from the AVCodecContext (RM container). */ | |
1051 q->sample_rate = avctx->sample_rate; | |
1052 q->nb_channels = avctx->channels; | |
1053 q->bit_rate = avctx->bit_rate; | |
1054 | |
4692
3318e3f6470f
Small simplifications to subband coefficient handling and use av_random().
banan
parents:
4674
diff
changeset
|
1055 /* Initialize RNG. */ |
8628
e49a2e1f0020
Replace calls to the deprecated function av_init_random() with
stefano
parents:
8153
diff
changeset
|
1056 av_random_init(&q->random_state, 1); |
2956 | 1057 |
1058 /* Initialize extradata related variables. */ | |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1059 q->samples_per_channel = q->samples_per_frame / q->nb_channels; |
2956 | 1060 q->bits_per_subpacket = avctx->block_align * 8; |
1061 | |
1062 /* Initialize default data states. */ | |
3090 | 1063 q->log2_numvector_size = 5; |
2956 | 1064 q->total_subbands = q->subbands; |
1065 | |
1066 /* Initialize version-dependent variables */ | |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1067 av_log(NULL,AV_LOG_DEBUG,"q->cookversion=%x\n",q->cookversion); |
4428
eeb16216b454
decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
banan
parents:
4425
diff
changeset
|
1068 q->joint_stereo = 0; |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1069 switch (q->cookversion) { |
4425 | 1070 case MONO: |
2956 | 1071 if (q->nb_channels != 1) { |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1072 av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n"); |
2956 | 1073 return -1; |
1074 } | |
4425 | 1075 av_log(avctx,AV_LOG_DEBUG,"MONO\n"); |
2956 | 1076 break; |
4425 | 1077 case STEREO: |
2956 | 1078 if (q->nb_channels != 1) { |
2959
24805f4d1b84
This patch adds some support for non-joint stereo streams. It also
rtognimp
parents:
2956
diff
changeset
|
1079 q->bits_per_subpacket = q->bits_per_subpacket/2; |
2956 | 1080 } |
4425 | 1081 av_log(avctx,AV_LOG_DEBUG,"STEREO\n"); |
2956 | 1082 break; |
1083 case JOINT_STEREO: | |
1084 if (q->nb_channels != 2) { | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1085 av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n"); |
2956 | 1086 return -1; |
1087 } | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1088 av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n"); |
2956 | 1089 if (avctx->extradata_size >= 16){ |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1090 q->total_subbands = q->subbands + q->js_subband_start; |
2956 | 1091 q->joint_stereo = 1; |
1092 } | |
1093 if (q->samples_per_channel > 256) { | |
3091
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1094 q->log2_numvector_size = 6; |
2956 | 1095 } |
1096 if (q->samples_per_channel > 512) { | |
3091
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1097 q->log2_numvector_size = 7; |
2956 | 1098 } |
1099 break; | |
1100 case MC_COOK: | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1101 av_log(avctx,AV_LOG_ERROR,"MC_COOK not supported!\n"); |
2956 | 1102 return -1; |
1103 break; | |
1104 default: | |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1105 av_log(avctx,AV_LOG_ERROR,"Unknown Cook version, report sample!\n"); |
2956 | 1106 return -1; |
1107 break; | |
1108 } | |
1109 | |
1110 /* Initialize variable relations */ | |
3090 | 1111 q->numvector_size = (1 << q->log2_numvector_size); |
2956 | 1112 |
1113 /* Generate tables */ | |
6861 | 1114 init_pow2table(); |
2956 | 1115 init_gain_table(q); |
5347
59ec490fe985
fixpoint: move cplscales to context structure and provide hook for data format conversion
mhoffman
parents:
5346
diff
changeset
|
1116 init_cplscales_table(q); |
2956 | 1117 |
1118 if (init_cook_vlc_tables(q) != 0) | |
1119 return -1; | |
1120 | |
3303
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3106
diff
changeset
|
1121 |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3106
diff
changeset
|
1122 if(avctx->block_align >= UINT_MAX/2) |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3106
diff
changeset
|
1123 return -1; |
68721b62a528
sanity checks, some might have been exploitable ...
michael
parents:
3106
diff
changeset
|
1124 |
4424
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1125 /* Pad the databuffer with: |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1126 DECODE_BYTES_PAD1 or DECODE_BYTES_PAD2 for decode_bytes(), |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1127 FF_INPUT_BUFFER_PADDING_SIZE, for the bitstreamreader. */ |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1128 if (q->nb_channels==2 && q->joint_stereo==0) { |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1129 q->decoded_bytes_buffer = |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1130 av_mallocz(avctx->block_align/2 |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1131 + DECODE_BYTES_PAD2(avctx->block_align/2) |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1132 + FF_INPUT_BUFFER_PADDING_SIZE); |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1133 } else { |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1134 q->decoded_bytes_buffer = |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1135 av_mallocz(avctx->block_align |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1136 + DECODE_BYTES_PAD1(avctx->block_align) |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1137 + FF_INPUT_BUFFER_PADDING_SIZE); |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1138 } |
8c830bde8006
Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
banan
parents:
4423
diff
changeset
|
1139 if (q->decoded_bytes_buffer == NULL) |
2956 | 1140 return -1; |
1141 | |
4639 | 1142 q->gains1.now = q->gain_1; |
1143 q->gains1.previous = q->gain_2; | |
1144 q->gains2.now = q->gain_3; | |
1145 q->gains2.previous = q->gain_4; | |
2956 | 1146 |
1147 /* Initialize transform. */ | |
4650
31bf54d9353d
Replace custom modified discrete cosine transform with ffmpeg's own.
banan
parents:
4639
diff
changeset
|
1148 if ( init_cook_mlt(q) != 0 ) |
2956 | 1149 return -1; |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1150 |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1151 /* Initialize COOK signal arithmetic handling */ |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1152 if (1) { |
5353
7e4703e16bbd
fixpoint: renaming all lowlevel arithmetic routines to xxx_float
mhoffman
parents:
5350
diff
changeset
|
1153 q->scalar_dequant = scalar_dequant_float; |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1154 q->decouple = decouple_float; |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1155 q->imlt_window = imlt_window_float; |
5353
7e4703e16bbd
fixpoint: renaming all lowlevel arithmetic routines to xxx_float
mhoffman
parents:
5350
diff
changeset
|
1156 q->interpolate = interpolate_float; |
5346
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1157 q->saturate_output = saturate_output_float; |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1158 } |
b41036edcf2e
fixpoint: lowlevel functional abstraction for all buffer arithmetics
mhoffman
parents:
5345
diff
changeset
|
1159 |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1160 /* Try to catch some obviously faulty streams, othervise it might be exploitable */ |
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1161 if (q->total_subbands > 53) { |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1162 av_log(avctx,AV_LOG_ERROR,"total_subbands > 53, report sample!\n"); |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1163 return -1; |
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1164 } |
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1165 if (q->subbands > 50) { |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1166 av_log(avctx,AV_LOG_ERROR,"subbands > 50, report sample!\n"); |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1167 return -1; |
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1168 } |
3091
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1169 if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512) || (q->samples_per_channel == 1024)) { |
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1170 } else { |
4302
a0f83004d485
av_log(NULL,... -> av_log(avctx,.. where appropriate.
banan
parents:
3947
diff
changeset
|
1171 av_log(avctx,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel); |
3091
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1172 return -1; |
0284d5b34916
Fix broken cosmetics commit and add a check for valid headers.
banan
parents:
3090
diff
changeset
|
1173 } |
4431
85ac154efd99
Check that js_vlc_bits from the extradata is in a valid range.
banan
parents:
4430
diff
changeset
|
1174 if ((q->js_vlc_bits > 6) || (q->js_vlc_bits < 0)) { |
85ac154efd99
Check that js_vlc_bits from the extradata is in a valid range.
banan
parents:
4430
diff
changeset
|
1175 av_log(avctx,AV_LOG_ERROR,"q->js_vlc_bits = %d, only >= 0 and <= 6 allowed!\n",q->js_vlc_bits); |
85ac154efd99
Check that js_vlc_bits from the extradata is in a valid range.
banan
parents:
4430
diff
changeset
|
1176 return -1; |
85ac154efd99
Check that js_vlc_bits from the extradata is in a valid range.
banan
parents:
4430
diff
changeset
|
1177 } |
3014
959b8ad880dc
Dual mono stereo strems sound ok now, added sanity checks and removed
rtognimp
parents:
3009
diff
changeset
|
1178 |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7095
diff
changeset
|
1179 avctx->sample_fmt = SAMPLE_FMT_S16; |
8153 | 1180 avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7095
diff
changeset
|
1181 |
3009
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
1182 #ifdef COOKDEBUG |
4430
407e7fd9b4f4
Get rid of the COOKextradata struct. And use valid C to parse the extradata.
banan
parents:
4429
diff
changeset
|
1183 dump_cook_context(q); |
3009
f5898b9b8a8a
Fix an out of array access and some minor cleanup of the code.
diego
parents:
2959
diff
changeset
|
1184 #endif |
2956 | 1185 return 0; |
1186 } | |
1187 | |
1188 | |
1189 AVCodec cook_decoder = | |
1190 { | |
1191 .name = "cook", | |
1192 .type = CODEC_TYPE_AUDIO, | |
1193 .id = CODEC_ID_COOK, | |
1194 .priv_data_size = sizeof(COOKContext), | |
1195 .init = cook_decode_init, | |
1196 .close = cook_decode_close, | |
1197 .decode = cook_decode_frame, | |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6903
diff
changeset
|
1198 .long_name = NULL_IF_CONFIG_SMALL("COOK"), |
2956 | 1199 }; |