Mercurial > libavcodec.hg
annotate wmadec.c @ 5088:8e206208db1f libavcodec
fix skipped blocks
fixes decoding of (http://samples.mplayerhq.hu/game-formats/idroq/bf2introseg.roq)
author | michael |
---|---|
date | Fri, 01 Jun 2007 21:17:05 +0000 |
parents | a10ebd496bd9 |
children | bff60ecc02f9 |
rev | line source |
---|---|
783 | 1 /* |
2 * WMA compatible decoder | |
3 * Copyright (c) 2002 The FFmpeg Project. | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
783 | 8 * modify it under the terms of the GNU Lesser General Public |
9 * 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:
3776
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
783 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3776
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
783 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * 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:
3776
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3022
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
783 | 20 */ |
1106 | 21 |
22 /** | |
23 * @file wmadec.c | |
24 * WMA compatible decoder. | |
1967
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
25 * This decoder handles Microsoft Windows Media Audio data, versions 1 & 2. |
2967 | 26 * WMA v1 is identified by audio format 0x160 in Microsoft media files |
1967
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
27 * (ASF/AVI/WAV). WMA v2 is identified by audio format 0x161. |
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
28 * |
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
29 * To use this decoder, a calling application must supply the extra data |
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
30 * bytes provided with the WMA data. These are the extra, codec-specific |
2967 | 31 * bytes at the end of a WAVEFORMATEX data structure. Transmit these bytes |
32 * to the decoder using the extradata[_size] fields in AVCodecContext. There | |
1967
2b0fc6b25ab8
add the minimal documentation to make this decoder useful
melanson
parents:
1750
diff
changeset
|
33 * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data. |
1106 | 34 */ |
35 | |
783 | 36 #include "avcodec.h" |
4490 | 37 #include "wma.h" |
783 | 38 |
4490 | 39 #undef NDEBUG |
40 #include <assert.h> | |
3113 | 41 |
42 #define EXPVLCBITS 8 | |
43 #define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS) | |
44 | |
45 #define HGAINVLCBITS 9 | |
46 #define HGAINMAX ((13+HGAINVLCBITS-1)/HGAINVLCBITS) | |
3022 | 47 |
4601 | 48 static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len); |
783 | 49 |
1342
f574934c4219
uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents:
1303
diff
changeset
|
50 #ifdef TRACE |
4600 | 51 static void dump_shorts(WMADecodeContext *s, const char *name, const short *tab, int n) |
783 | 52 { |
53 int i; | |
54 | |
4600 | 55 tprintf(s->avctx, "%s[%d]:\n", name, n); |
783 | 56 for(i=0;i<n;i++) { |
57 if ((i & 7) == 0) | |
4600 | 58 tprintf(s->avctx, "%4d: ", i); |
59 tprintf(s->avctx, " %5d.0", tab[i]); | |
783 | 60 if ((i & 7) == 7) |
4600 | 61 tprintf(s->avctx, "\n"); |
783 | 62 } |
63 } | |
64 | |
4600 | 65 static void dump_floats(WMADecodeContext *s, const char *name, int prec, const float *tab, int n) |
783 | 66 { |
67 int i; | |
68 | |
4600 | 69 tprintf(s->avctx, "%s[%d]:\n", name, n); |
783 | 70 for(i=0;i<n;i++) { |
71 if ((i & 7) == 0) | |
4600 | 72 tprintf(s->avctx, "%4d: ", i); |
73 tprintf(s->avctx, " %8.*f", prec, tab[i]); | |
783 | 74 if ((i & 7) == 7) |
4600 | 75 tprintf(s->avctx, "\n"); |
783 | 76 } |
77 if ((i & 7) != 0) | |
4600 | 78 tprintf(s->avctx, "\n"); |
783 | 79 } |
80 #endif | |
81 | |
82 static int wma_decode_init(AVCodecContext * avctx) | |
83 { | |
4601 | 84 WMACodecContext *s = avctx->priv_data; |
783 | 85 int i, flags1, flags2; |
86 uint8_t *extradata; | |
2967 | 87 |
4600 | 88 s->avctx = avctx; |
89 | |
783 | 90 /* extract flag infos */ |
91 flags1 = 0; | |
92 flags2 = 0; | |
93 extradata = avctx->extradata; | |
4490 | 94 if (avctx->codec->id == CODEC_ID_WMAV1 && avctx->extradata_size >= 4) { |
783 | 95 flags1 = extradata[0] | (extradata[1] << 8); |
96 flags2 = extradata[2] | (extradata[3] << 8); | |
4490 | 97 } else if (avctx->codec->id == CODEC_ID_WMAV2 && avctx->extradata_size >= 6) { |
2967 | 98 flags1 = extradata[0] | (extradata[1] << 8) | |
783 | 99 (extradata[2] << 16) | (extradata[3] << 24); |
100 flags2 = extradata[4] | (extradata[5] << 8); | |
101 } | |
4491 | 102 // for(i=0; i<avctx->extradata_size; i++) |
103 // av_log(NULL, AV_LOG_ERROR, "%02X ", extradata[i]); | |
4490 | 104 |
783 | 105 s->use_exp_vlc = flags2 & 0x0001; |
106 s->use_bit_reservoir = flags2 & 0x0002; | |
107 s->use_variable_block_len = flags2 & 0x0004; | |
108 | |
5086
a10ebd496bd9
sanity checks (should prevent hypothetical div by zero issue)
michael
parents:
4785
diff
changeset
|
109 if(ff_wma_init(avctx, flags2)<0) |
a10ebd496bd9
sanity checks (should prevent hypothetical div by zero issue)
michael
parents:
4785
diff
changeset
|
110 return -1; |
783 | 111 |
112 /* init MDCT */ | |
113 for(i = 0; i < s->nb_block_sizes; i++) | |
795
55add0e7eafb
avoid name clash - fixed again block size selection
bellard
parents:
785
diff
changeset
|
114 ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1); |
2967 | 115 |
783 | 116 if (s->use_noise_coding) { |
4490 | 117 init_vlc(&s->hgain_vlc, HGAINVLCBITS, sizeof(ff_wma_hgain_huffbits), |
118 ff_wma_hgain_huffbits, 1, 1, | |
119 ff_wma_hgain_huffcodes, 2, 2, 0); | |
783 | 120 } |
121 | |
122 if (s->use_exp_vlc) { | |
4490 | 123 init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_wma_scale_huffbits), //FIXME move out of context |
124 ff_wma_scale_huffbits, 1, 1, | |
125 ff_wma_scale_huffcodes, 4, 4, 0); | |
783 | 126 } else { |
127 wma_lsp_to_curve_init(s, s->frame_len); | |
128 } | |
129 | |
130 return 0; | |
131 } | |
132 | |
4497 | 133 /** |
134 * compute x^-0.25 with an exponent and mantissa table. We use linear | |
135 * interpolation to reduce the mantissa table size at a small speed | |
136 * expense (linear interpolation approximately doubles the number of | |
137 * bits of precision). | |
138 */ | |
4601 | 139 static inline float pow_m1_4(WMACodecContext *s, float x) |
783 | 140 { |
141 union { | |
142 float f; | |
143 unsigned int v; | |
144 } u, t; | |
145 unsigned int e, m; | |
146 float a, b; | |
147 | |
148 u.f = x; | |
149 e = u.v >> 23; | |
150 m = (u.v >> (23 - LSP_POW_BITS)) & ((1 << LSP_POW_BITS) - 1); | |
151 /* build interpolation scale: 1 <= t < 2. */ | |
152 t.v = ((u.v << LSP_POW_BITS) & ((1 << 23) - 1)) | (127 << 23); | |
153 a = s->lsp_pow_m_table1[m]; | |
154 b = s->lsp_pow_m_table2[m]; | |
155 return s->lsp_pow_e_table[e] * (a + b * t.f); | |
156 } | |
157 | |
4601 | 158 static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len) |
2967 | 159 { |
783 | 160 float wdel, a, b; |
161 int i, e, m; | |
162 | |
163 wdel = M_PI / frame_len; | |
164 for(i=0;i<frame_len;i++) | |
165 s->lsp_cos_table[i] = 2.0f * cos(wdel * i); | |
166 | |
167 /* tables for x^-0.25 computation */ | |
168 for(i=0;i<256;i++) { | |
169 e = i - 126; | |
170 s->lsp_pow_e_table[i] = pow(2.0, e * -0.25); | |
171 } | |
172 | |
173 /* NOTE: these two tables are needed to avoid two operations in | |
174 pow_m1_4 */ | |
175 b = 1.0; | |
176 for(i=(1 << LSP_POW_BITS) - 1;i>=0;i--) { | |
177 m = (1 << LSP_POW_BITS) + i; | |
178 a = (float)m * (0.5 / (1 << LSP_POW_BITS)); | |
179 a = pow(a, -0.25); | |
180 s->lsp_pow_m_table1[i] = 2 * a - b; | |
181 s->lsp_pow_m_table2[i] = b - a; | |
182 b = a; | |
183 } | |
184 #if 0 | |
185 for(i=1;i<20;i++) { | |
186 float v, r1, r2; | |
187 v = 5.0 / i; | |
188 r1 = pow_m1_4(s, v); | |
189 r2 = pow(v,-0.25); | |
190 printf("%f^-0.25=%f e=%f\n", v, r1, r2 - r1); | |
191 } | |
192 #endif | |
193 } | |
194 | |
4497 | 195 /** |
196 * NOTE: We use the same code as Vorbis here | |
197 * @todo optimize it further with SSE/3Dnow | |
198 */ | |
4601 | 199 static void wma_lsp_to_curve(WMACodecContext *s, |
2967 | 200 float *out, float *val_max_ptr, |
783 | 201 int n, float *lsp) |
202 { | |
203 int i, j; | |
204 float p, q, w, v, val_max; | |
205 | |
206 val_max = 0; | |
207 for(i=0;i<n;i++) { | |
208 p = 0.5f; | |
209 q = 0.5f; | |
210 w = s->lsp_cos_table[i]; | |
211 for(j=1;j<NB_LSP_COEFS;j+=2){ | |
212 q *= w - lsp[j - 1]; | |
213 p *= w - lsp[j]; | |
214 } | |
215 p *= p * (2.0f - w); | |
216 q *= q * (2.0f + w); | |
217 v = p + q; | |
218 v = pow_m1_4(s, v); | |
219 if (v > val_max) | |
220 val_max = v; | |
221 out[i] = v; | |
222 } | |
223 *val_max_ptr = val_max; | |
224 } | |
225 | |
4497 | 226 /** |
227 * decode exponents coded with LSP coefficients (same idea as Vorbis) | |
228 */ | |
4601 | 229 static void decode_exp_lsp(WMACodecContext *s, int ch) |
783 | 230 { |
231 float lsp_coefs[NB_LSP_COEFS]; | |
232 int val, i; | |
233 | |
234 for(i = 0; i < NB_LSP_COEFS; i++) { | |
235 if (i == 0 || i >= 8) | |
236 val = get_bits(&s->gb, 3); | |
237 else | |
238 val = get_bits(&s->gb, 4); | |
4490 | 239 lsp_coefs[i] = ff_wma_lsp_codebook[i][val]; |
783 | 240 } |
241 | |
242 wma_lsp_to_curve(s, s->exponents[ch], &s->max_exponent[ch], | |
243 s->block_len, lsp_coefs); | |
244 } | |
245 | |
4497 | 246 /** |
247 * decode exponents coded with VLC codes | |
248 */ | |
4601 | 249 static int decode_exp_vlc(WMACodecContext *s, int ch) |
783 | 250 { |
251 int last_exp, n, code; | |
252 const uint16_t *ptr, *band_ptr; | |
253 float v, *q, max_scale, *q_end; | |
2967 | 254 |
783 | 255 band_ptr = s->exponent_bands[s->frame_len_bits - s->block_len_bits]; |
256 ptr = band_ptr; | |
257 q = s->exponents[ch]; | |
258 q_end = q + s->block_len; | |
259 max_scale = 0; | |
260 if (s->version == 1) { | |
261 last_exp = get_bits(&s->gb, 5) + 10; | |
3235 | 262 /* XXX: use a table */ |
263 v = pow(10, last_exp * (1.0 / 16.0)); | |
783 | 264 max_scale = v; |
265 n = *ptr++; | |
266 do { | |
267 *q++ = v; | |
268 } while (--n); | |
4490 | 269 }else |
270 last_exp = 36; | |
271 | |
783 | 272 while (q < q_end) { |
3113 | 273 code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX); |
783 | 274 if (code < 0) |
275 return -1; | |
276 /* NOTE: this offset is the same as MPEG4 AAC ! */ | |
277 last_exp += code - 60; | |
3235 | 278 /* XXX: use a table */ |
279 v = pow(10, last_exp * (1.0 / 16.0)); | |
783 | 280 if (v > max_scale) |
281 max_scale = v; | |
282 n = *ptr++; | |
283 do { | |
284 *q++ = v; | |
285 } while (--n); | |
286 } | |
287 s->max_exponent[ch] = max_scale; | |
288 return 0; | |
289 } | |
290 | |
4737
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
291 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
292 /** |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
293 * Apply MDCT window and add into output. |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
294 * |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
295 * We ensure that when the windows overlap their squared sum |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
296 * is always 1 (MDCT reconstruction rule). |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
297 */ |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
298 static void wma_window(WMACodecContext *s, float *out) |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
299 { |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
300 float *in = s->output; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
301 int block_len, bsize, n; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
302 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
303 /* left part */ |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
304 if (s->block_len_bits <= s->prev_block_len_bits) { |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
305 block_len = s->block_len; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
306 bsize = s->frame_len_bits - s->block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
307 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
308 s->dsp.vector_fmul_add_add(out, in, s->windows[bsize], |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
309 out, 0, block_len, 1); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
310 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
311 } else { |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
312 block_len = 1 << s->prev_block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
313 n = (s->block_len - block_len) / 2; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
314 bsize = s->frame_len_bits - s->prev_block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
315 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
316 s->dsp.vector_fmul_add_add(out+n, in+n, s->windows[bsize], |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
317 out+n, 0, block_len, 1); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
318 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
319 memcpy(out+n+block_len, in+n+block_len, n*sizeof(float)); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
320 } |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
321 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
322 out += s->block_len; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
323 in += s->block_len; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
324 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
325 /* right part */ |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
326 if (s->block_len_bits <= s->next_block_len_bits) { |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
327 block_len = s->block_len; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
328 bsize = s->frame_len_bits - s->block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
329 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
330 s->dsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
331 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
332 } else { |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
333 block_len = 1 << s->next_block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
334 n = (s->block_len - block_len) / 2; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
335 bsize = s->frame_len_bits - s->next_block_len_bits; |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
336 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
337 memcpy(out, in, n*sizeof(float)); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
338 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
339 s->dsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
340 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
341 memset(out+n+block_len, 0, n*sizeof(float)); |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
342 } |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
343 } |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
344 |
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
345 |
4497 | 346 /** |
347 * @return 0 if OK. 1 if last block of frame. return -1 if | |
348 * unrecorrable error. | |
349 */ | |
4601 | 350 static int wma_decode_block(WMACodecContext *s) |
783 | 351 { |
352 int n, v, a, ch, code, bsize; | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
353 int coef_nb_bits, total_gain; |
783 | 354 int nb_coefs[MAX_CHANNELS]; |
355 float mdct_norm; | |
356 | |
1343 | 357 #ifdef TRACE |
4600 | 358 tprintf(s->avctx, "***decode_block: %d:%d\n", s->frame_count - 1, s->block_num); |
1343 | 359 #endif |
783 | 360 |
361 /* compute current block length */ | |
362 if (s->use_variable_block_len) { | |
363 n = av_log2(s->nb_block_sizes - 1) + 1; | |
2967 | 364 |
783 | 365 if (s->reset_block_lengths) { |
366 s->reset_block_lengths = 0; | |
367 v = get_bits(&s->gb, n); | |
368 if (v >= s->nb_block_sizes) | |
369 return -1; | |
370 s->prev_block_len_bits = s->frame_len_bits - v; | |
371 v = get_bits(&s->gb, n); | |
372 if (v >= s->nb_block_sizes) | |
373 return -1; | |
374 s->block_len_bits = s->frame_len_bits - v; | |
375 } else { | |
376 /* update block lengths */ | |
377 s->prev_block_len_bits = s->block_len_bits; | |
378 s->block_len_bits = s->next_block_len_bits; | |
379 } | |
380 v = get_bits(&s->gb, n); | |
381 if (v >= s->nb_block_sizes) | |
382 return -1; | |
383 s->next_block_len_bits = s->frame_len_bits - v; | |
384 } else { | |
385 /* fixed block len */ | |
386 s->next_block_len_bits = s->frame_len_bits; | |
387 s->prev_block_len_bits = s->frame_len_bits; | |
388 s->block_len_bits = s->frame_len_bits; | |
389 } | |
390 | |
391 /* now check if the block length is coherent with the frame length */ | |
392 s->block_len = 1 << s->block_len_bits; | |
393 if ((s->block_pos + s->block_len) > s->frame_len) | |
394 return -1; | |
395 | |
396 if (s->nb_channels == 2) { | |
397 s->ms_stereo = get_bits(&s->gb, 1); | |
398 } | |
399 v = 0; | |
400 for(ch = 0; ch < s->nb_channels; ch++) { | |
401 a = get_bits(&s->gb, 1); | |
402 s->channel_coded[ch] = a; | |
403 v |= a; | |
404 } | |
405 /* if no channel coded, no need to go further */ | |
406 /* XXX: fix potential framing problems */ | |
407 if (!v) | |
408 goto next; | |
409 | |
410 bsize = s->frame_len_bits - s->block_len_bits; | |
411 | |
412 /* read total gain and extract corresponding number of bits for | |
413 coef escape coding */ | |
414 total_gain = 1; | |
415 for(;;) { | |
416 a = get_bits(&s->gb, 7); | |
417 total_gain += a; | |
418 if (a != 127) | |
419 break; | |
420 } | |
2967 | 421 |
4490 | 422 coef_nb_bits= ff_wma_total_gain_to_bits(total_gain); |
783 | 423 |
424 /* compute number of coefficients */ | |
425 n = s->coefs_end[bsize] - s->coefs_start; | |
426 for(ch = 0; ch < s->nb_channels; ch++) | |
427 nb_coefs[ch] = n; | |
428 | |
429 /* complex coding */ | |
430 if (s->use_noise_coding) { | |
431 | |
432 for(ch = 0; ch < s->nb_channels; ch++) { | |
433 if (s->channel_coded[ch]) { | |
434 int i, n, a; | |
435 n = s->exponent_high_sizes[bsize]; | |
436 for(i=0;i<n;i++) { | |
437 a = get_bits(&s->gb, 1); | |
438 s->high_band_coded[ch][i] = a; | |
439 /* if noise coding, the coefficients are not transmitted */ | |
440 if (a) | |
441 nb_coefs[ch] -= s->exponent_high_bands[bsize][i]; | |
442 } | |
443 } | |
444 } | |
445 for(ch = 0; ch < s->nb_channels; ch++) { | |
446 if (s->channel_coded[ch]) { | |
447 int i, n, val, code; | |
448 | |
449 n = s->exponent_high_sizes[bsize]; | |
450 val = (int)0x80000000; | |
451 for(i=0;i<n;i++) { | |
452 if (s->high_band_coded[ch][i]) { | |
453 if (val == (int)0x80000000) { | |
454 val = get_bits(&s->gb, 7) - 19; | |
455 } else { | |
3113 | 456 code = get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX); |
783 | 457 if (code < 0) |
458 return -1; | |
459 val += code - 18; | |
460 } | |
461 s->high_band_values[ch][i] = val; | |
462 } | |
463 } | |
464 } | |
465 } | |
466 } | |
2967 | 467 |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
468 /* exponents can be reused in short blocks. */ |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
469 if ((s->block_len_bits == s->frame_len_bits) || |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
470 get_bits(&s->gb, 1)) { |
783 | 471 for(ch = 0; ch < s->nb_channels; ch++) { |
472 if (s->channel_coded[ch]) { | |
473 if (s->use_exp_vlc) { | |
474 if (decode_exp_vlc(s, ch) < 0) | |
475 return -1; | |
476 } else { | |
477 decode_exp_lsp(s, ch); | |
478 } | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
479 s->exponents_bsize[ch] = bsize; |
783 | 480 } |
481 } | |
482 } | |
483 | |
484 /* parse spectral coefficients : just RLE encoding */ | |
485 for(ch = 0; ch < s->nb_channels; ch++) { | |
486 if (s->channel_coded[ch]) { | |
487 VLC *coef_vlc; | |
488 int level, run, sign, tindex; | |
489 int16_t *ptr, *eptr; | |
3776 | 490 const uint16_t *level_table, *run_table; |
783 | 491 |
492 /* special VLC tables are used for ms stereo because | |
493 there is potentially less energy there */ | |
494 tindex = (ch == 1 && s->ms_stereo); | |
495 coef_vlc = &s->coef_vlc[tindex]; | |
496 run_table = s->run_table[tindex]; | |
497 level_table = s->level_table[tindex]; | |
498 /* XXX: optimize */ | |
499 ptr = &s->coefs1[ch][0]; | |
500 eptr = ptr + nb_coefs[ch]; | |
501 memset(ptr, 0, s->block_len * sizeof(int16_t)); | |
502 for(;;) { | |
3113 | 503 code = get_vlc2(&s->gb, coef_vlc->table, VLCBITS, VLCMAX); |
783 | 504 if (code < 0) |
505 return -1; | |
506 if (code == 1) { | |
507 /* EOB */ | |
508 break; | |
509 } else if (code == 0) { | |
510 /* escape */ | |
511 level = get_bits(&s->gb, coef_nb_bits); | |
512 /* NOTE: this is rather suboptimal. reading | |
513 block_len_bits would be better */ | |
514 run = get_bits(&s->gb, s->frame_len_bits); | |
515 } else { | |
516 /* normal code */ | |
517 run = run_table[code]; | |
518 level = level_table[code]; | |
519 } | |
520 sign = get_bits(&s->gb, 1); | |
521 if (!sign) | |
522 level = -level; | |
523 ptr += run; | |
524 if (ptr >= eptr) | |
3361 | 525 { |
526 av_log(NULL, AV_LOG_ERROR, "overflow in spectral RLE, ignoring\n"); | |
527 break; | |
528 } | |
783 | 529 *ptr++ = level; |
530 /* NOTE: EOB can be omitted */ | |
531 if (ptr >= eptr) | |
532 break; | |
533 } | |
534 } | |
535 if (s->version == 1 && s->nb_channels >= 2) { | |
536 align_get_bits(&s->gb); | |
537 } | |
538 } | |
2967 | 539 |
783 | 540 /* normalize */ |
541 { | |
542 int n4 = s->block_len / 2; | |
543 mdct_norm = 1.0 / (float)n4; | |
544 if (s->version == 1) { | |
545 mdct_norm *= sqrt(n4); | |
546 } | |
547 } | |
548 | |
549 /* finally compute the MDCT coefficients */ | |
550 for(ch = 0; ch < s->nb_channels; ch++) { | |
551 if (s->channel_coded[ch]) { | |
552 int16_t *coefs1; | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
553 float *coefs, *exponents, mult, mult1, noise; |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
554 int i, j, n, n1, last_high_band, esize; |
783 | 555 float exp_power[HIGH_BAND_MAX_SIZE]; |
556 | |
557 coefs1 = s->coefs1[ch]; | |
558 exponents = s->exponents[ch]; | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
559 esize = s->exponents_bsize[ch]; |
3235 | 560 mult = pow(10, total_gain * 0.05) / s->max_exponent[ch]; |
783 | 561 mult *= mdct_norm; |
562 coefs = s->coefs[ch]; | |
563 if (s->use_noise_coding) { | |
564 mult1 = mult; | |
565 /* very low freqs : noise */ | |
566 for(i = 0;i < s->coefs_start; i++) { | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
567 *coefs++ = s->noise_table[s->noise_index] * |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
568 exponents[i<<bsize>>esize] * mult1; |
783 | 569 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); |
570 } | |
2967 | 571 |
783 | 572 n1 = s->exponent_high_sizes[bsize]; |
573 | |
574 /* compute power of high bands */ | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
575 exponents = s->exponents[ch] + |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
576 (s->high_band_start[bsize]<<bsize); |
783 | 577 last_high_band = 0; /* avoid warning */ |
578 for(j=0;j<n1;j++) { | |
2967 | 579 n = s->exponent_high_bands[s->frame_len_bits - |
783 | 580 s->block_len_bits][j]; |
581 if (s->high_band_coded[ch][j]) { | |
582 float e2, v; | |
583 e2 = 0; | |
584 for(i = 0;i < n; i++) { | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
585 v = exponents[i<<bsize>>esize]; |
783 | 586 e2 += v * v; |
587 } | |
588 exp_power[j] = e2 / n; | |
589 last_high_band = j; | |
4600 | 590 tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); |
783 | 591 } |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
592 exponents += n<<bsize; |
783 | 593 } |
594 | |
595 /* main freqs and high freqs */ | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
596 exponents = s->exponents[ch] + (s->coefs_start<<bsize); |
783 | 597 for(j=-1;j<n1;j++) { |
598 if (j < 0) { | |
2967 | 599 n = s->high_band_start[bsize] - |
783 | 600 s->coefs_start; |
601 } else { | |
2967 | 602 n = s->exponent_high_bands[s->frame_len_bits - |
783 | 603 s->block_len_bits][j]; |
604 } | |
605 if (j >= 0 && s->high_band_coded[ch][j]) { | |
606 /* use noise with specified power */ | |
607 mult1 = sqrt(exp_power[j] / exp_power[last_high_band]); | |
3235 | 608 /* XXX: use a table */ |
609 mult1 = mult1 * pow(10, s->high_band_values[ch][j] * 0.05); | |
783 | 610 mult1 = mult1 / (s->max_exponent[ch] * s->noise_mult); |
611 mult1 *= mdct_norm; | |
612 for(i = 0;i < n; i++) { | |
613 noise = s->noise_table[s->noise_index]; | |
614 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
615 *coefs++ = noise * |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
616 exponents[i<<bsize>>esize] * mult1; |
783 | 617 } |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
618 exponents += n<<bsize; |
783 | 619 } else { |
620 /* coded values + small noise */ | |
621 for(i = 0;i < n; i++) { | |
622 noise = s->noise_table[s->noise_index]; | |
623 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
624 *coefs++ = ((*coefs1++) + noise) * |
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
625 exponents[i<<bsize>>esize] * mult; |
783 | 626 } |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
627 exponents += n<<bsize; |
783 | 628 } |
629 } | |
630 | |
631 /* very high freqs : noise */ | |
632 n = s->block_len - s->coefs_end[bsize]; | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
633 mult1 = mult * exponents[((-1<<bsize))>>esize]; |
783 | 634 for(i = 0; i < n; i++) { |
635 *coefs++ = s->noise_table[s->noise_index] * mult1; | |
636 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1); | |
637 } | |
638 } else { | |
639 /* XXX: optimize more */ | |
640 for(i = 0;i < s->coefs_start; i++) | |
641 *coefs++ = 0.0; | |
642 n = nb_coefs[ch]; | |
643 for(i = 0;i < n; i++) { | |
4785
4ae9ab738aec
WMA decoder improvement, output closer to the dmo binary.
banan
parents:
4737
diff
changeset
|
644 *coefs++ = coefs1[i] * exponents[i<<bsize>>esize] * mult; |
783 | 645 } |
646 n = s->block_len - s->coefs_end[bsize]; | |
647 for(i = 0;i < n; i++) | |
648 *coefs++ = 0.0; | |
649 } | |
650 } | |
651 } | |
652 | |
1342
f574934c4219
uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents:
1303
diff
changeset
|
653 #ifdef TRACE |
783 | 654 for(ch = 0; ch < s->nb_channels; ch++) { |
655 if (s->channel_coded[ch]) { | |
4600 | 656 dump_floats(s, "exponents", 3, s->exponents[ch], s->block_len); |
657 dump_floats(s, "coefs", 1, s->coefs[ch], s->block_len); | |
783 | 658 } |
659 } | |
660 #endif | |
2967 | 661 |
783 | 662 if (s->ms_stereo && s->channel_coded[1]) { |
663 float a, b; | |
664 int i; | |
665 | |
666 /* nominal case for ms stereo: we do it before mdct */ | |
667 /* no need to optimize this case because it should almost | |
668 never happen */ | |
669 if (!s->channel_coded[0]) { | |
4600 | 670 tprintf(s->avctx, "rare ms-stereo case happened\n"); |
783 | 671 memset(s->coefs[0], 0, sizeof(float) * s->block_len); |
672 s->channel_coded[0] = 1; | |
673 } | |
2967 | 674 |
783 | 675 for(i = 0; i < s->block_len; i++) { |
676 a = s->coefs[0][i]; | |
677 b = s->coefs[1][i]; | |
678 s->coefs[0][i] = a + b; | |
679 s->coefs[1][i] = a - b; | |
680 } | |
681 } | |
682 | |
683 for(ch = 0; ch < s->nb_channels; ch++) { | |
684 if (s->channel_coded[ch]) { | |
3592
6a358dccf2ab
SIMD vector optimizations. 3% faster overall decoding.
banan
parents:
3555
diff
changeset
|
685 int n4, index, n; |
783 | 686 |
687 n = s->block_len; | |
688 n4 = s->block_len / 2; | |
3555 | 689 s->mdct_ctx[bsize].fft.imdct_calc(&s->mdct_ctx[bsize], |
4301
b43bd0c56eaa
Bug fix for crashes when SSE is used on unaligned arrays.
banan
parents:
3947
diff
changeset
|
690 s->output, s->coefs[ch], s->mdct_tmp); |
783 | 691 |
3592
6a358dccf2ab
SIMD vector optimizations. 3% faster overall decoding.
banan
parents:
3555
diff
changeset
|
692 /* multiply by the window and add in the frame */ |
783 | 693 index = (s->frame_len / 2) + s->block_pos - n4; |
4737
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
694 wma_window(s, &s->frame_out[ch][index]); |
783 | 695 |
696 /* specific fast case for ms-stereo : add to second | |
697 channel if it is not coded */ | |
698 if (s->ms_stereo && !s->channel_coded[1]) { | |
4737
99d9dd34903b
Optimize by building the mdct window and multipying/adding at the same time.
banan
parents:
4601
diff
changeset
|
699 wma_window(s, &s->frame_out[1][index]); |
783 | 700 } |
701 } | |
702 } | |
703 next: | |
704 /* update block number */ | |
705 s->block_num++; | |
706 s->block_pos += s->block_len; | |
707 if (s->block_pos >= s->frame_len) | |
708 return 1; | |
709 else | |
710 return 0; | |
711 } | |
712 | |
713 /* decode a frame of frame_len samples */ | |
4601 | 714 static int wma_decode_frame(WMACodecContext *s, int16_t *samples) |
783 | 715 { |
716 int ret, i, n, a, ch, incr; | |
717 int16_t *ptr; | |
718 float *iptr; | |
719 | |
1343 | 720 #ifdef TRACE |
4600 | 721 tprintf(s->avctx, "***decode_frame: %d size=%d\n", s->frame_count++, s->frame_len); |
1343 | 722 #endif |
783 | 723 |
724 /* read each block */ | |
725 s->block_num = 0; | |
726 s->block_pos = 0; | |
727 for(;;) { | |
728 ret = wma_decode_block(s); | |
2967 | 729 if (ret < 0) |
783 | 730 return -1; |
731 if (ret) | |
732 break; | |
733 } | |
734 | |
735 /* convert frame to integer */ | |
736 n = s->frame_len; | |
737 incr = s->nb_channels; | |
738 for(ch = 0; ch < s->nb_channels; ch++) { | |
739 ptr = samples + ch; | |
740 iptr = s->frame_out[ch]; | |
741 | |
742 for(i=0;i<n;i++) { | |
797 | 743 a = lrintf(*iptr++); |
783 | 744 if (a > 32767) |
745 a = 32767; | |
746 else if (a < -32768) | |
747 a = -32768; | |
748 *ptr = a; | |
749 ptr += incr; | |
750 } | |
751 /* prepare for next block */ | |
752 memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len], | |
753 s->frame_len * sizeof(float)); | |
754 } | |
755 | |
1342
f574934c4219
uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents:
1303
diff
changeset
|
756 #ifdef TRACE |
4600 | 757 dump_shorts(s, "samples", samples, n * s->nb_channels); |
783 | 758 #endif |
759 return 0; | |
760 } | |
761 | |
2967 | 762 static int wma_decode_superframe(AVCodecContext *avctx, |
783 | 763 void *data, int *data_size, |
1064 | 764 uint8_t *buf, int buf_size) |
783 | 765 { |
4601 | 766 WMACodecContext *s = avctx->priv_data; |
783 | 767 int nb_frames, bit_offset, i, pos, len; |
768 uint8_t *q; | |
769 int16_t *samples; | |
2967 | 770 |
4600 | 771 tprintf(avctx, "***decode_superframe:\n"); |
783 | 772 |
1750 | 773 if(buf_size==0){ |
774 s->last_superframe_len = 0; | |
775 return 0; | |
776 } | |
2967 | 777 |
783 | 778 samples = data; |
779 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
972
diff
changeset
|
780 init_get_bits(&s->gb, buf, buf_size*8); |
2967 | 781 |
783 | 782 if (s->use_bit_reservoir) { |
783 /* read super frame header */ | |
784 get_bits(&s->gb, 4); /* super frame index */ | |
785 nb_frames = get_bits(&s->gb, 4) - 1; | |
786 | |
787 bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3); | |
788 | |
789 if (s->last_superframe_len > 0) { | |
790 // printf("skip=%d\n", s->last_bitoffset); | |
791 /* add bit_offset bits to last frame */ | |
2967 | 792 if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) > |
783 | 793 MAX_CODED_SUPERFRAME_SIZE) |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
794 goto fail; |
783 | 795 q = s->last_superframe + s->last_superframe_len; |
796 len = bit_offset; | |
3362
c43fcf831f7c
Do not read full byte when less than 8 bits are still to be read.
reimar
parents:
3361
diff
changeset
|
797 while (len > 7) { |
783 | 798 *q++ = (get_bits)(&s->gb, 8); |
799 len -= 8; | |
800 } | |
801 if (len > 0) { | |
802 *q++ = (get_bits)(&s->gb, len) << (8 - len); | |
803 } | |
2967 | 804 |
783 | 805 /* XXX: bit_offset bits into last frame */ |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
972
diff
changeset
|
806 init_get_bits(&s->gb, s->last_superframe, MAX_CODED_SUPERFRAME_SIZE*8); |
783 | 807 /* skip unused bits */ |
808 if (s->last_bitoffset > 0) | |
809 skip_bits(&s->gb, s->last_bitoffset); | |
810 /* this frame is stored in the last superframe and in the | |
811 current one */ | |
812 if (wma_decode_frame(s, samples) < 0) | |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
813 goto fail; |
783 | 814 samples += s->nb_channels * s->frame_len; |
815 } | |
816 | |
817 /* read each frame starting from bit_offset */ | |
818 pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3; | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
972
diff
changeset
|
819 init_get_bits(&s->gb, buf + (pos >> 3), (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3))*8); |
783 | 820 len = pos & 7; |
821 if (len > 0) | |
822 skip_bits(&s->gb, len); | |
2967 | 823 |
783 | 824 s->reset_block_lengths = 1; |
825 for(i=0;i<nb_frames;i++) { | |
826 if (wma_decode_frame(s, samples) < 0) | |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
827 goto fail; |
783 | 828 samples += s->nb_channels * s->frame_len; |
829 } | |
830 | |
831 /* we copy the end of the frame in the last frame buffer */ | |
832 pos = get_bits_count(&s->gb) + ((bit_offset + 4 + 4 + s->byte_offset_bits + 3) & ~7); | |
833 s->last_bitoffset = pos & 7; | |
834 pos >>= 3; | |
835 len = buf_size - pos; | |
819 | 836 if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) { |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
837 goto fail; |
783 | 838 } |
839 s->last_superframe_len = len; | |
840 memcpy(s->last_superframe, buf + pos, len); | |
841 } else { | |
842 /* single frame decode */ | |
843 if (wma_decode_frame(s, samples) < 0) | |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
844 goto fail; |
783 | 845 samples += s->nb_channels * s->frame_len; |
846 } | |
4490 | 847 |
848 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d outbytes:%d eaten:%d\n", s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, (int8_t *)samples - (int8_t *)data, s->block_align); | |
849 | |
783 | 850 *data_size = (int8_t *)samples - (int8_t *)data; |
851 return s->block_align; | |
964
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
852 fail: |
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
853 /* when error, we reset the bit reservoir */ |
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
854 s->last_superframe_len = 0; |
6e6773512288
oops : better error resilience - should fix most wma decoding problems
bellard
parents:
819
diff
changeset
|
855 return -1; |
783 | 856 } |
857 | |
858 AVCodec wmav1_decoder = | |
859 { | |
860 "wmav1", | |
861 CODEC_TYPE_AUDIO, | |
862 CODEC_ID_WMAV1, | |
4601 | 863 sizeof(WMACodecContext), |
783 | 864 wma_decode_init, |
865 NULL, | |
4490 | 866 ff_wma_end, |
783 | 867 wma_decode_superframe, |
868 }; | |
869 | |
870 AVCodec wmav2_decoder = | |
871 { | |
872 "wmav2", | |
873 CODEC_TYPE_AUDIO, | |
874 CODEC_ID_WMAV2, | |
4601 | 875 sizeof(WMACodecContext), |
783 | 876 wma_decode_init, |
877 NULL, | |
4490 | 878 ff_wma_end, |
783 | 879 wma_decode_superframe, |
880 }; |