Mercurial > libavcodec.hg
annotate wavpack.c @ 6134:6d0c5a68d559 libavcodec
Fix a bug causing the generated stream to be corrupt if the buffer
contains NAL units previous to the IDR where the SPS/PPS was inserted.
Ok:ed by Benoit on irc.
author | andoma |
---|---|
date | Wed, 09 Jan 2008 08:38:28 +0000 |
parents | d030978bcd93 |
children | 67e4586d3c1b |
rev | line source |
---|---|
3764 | 1 /* |
2 * WavPack lossless audio decoder | |
3 * Copyright (c) 2006 Konstantin Shishkov | |
4 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3782
diff
changeset
|
5 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3782
diff
changeset
|
6 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3782
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
3764 | 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:
3782
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
3764 | 11 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3782
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
3764 | 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:
3782
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
3764 | 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
20 */ | |
21 #define ALT_BITSTREAM_READER_LE | |
22 #include "avcodec.h" | |
23 #include "bitstream.h" | |
5605 | 24 #include "unary.h" |
3764 | 25 |
26 /** | |
27 * @file wavpack.c | |
28 * WavPack lossless audio decoder | |
29 */ | |
30 | |
5538 | 31 #define WV_JOINT_STEREO 0x00000010 |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
32 #define WV_FALSE_STEREO 0x40000000 |
3764 | 33 |
34 enum WP_ID_Flags{ | |
35 WP_IDF_MASK = 0x1F, | |
36 WP_IDF_IGNORE = 0x20, | |
37 WP_IDF_ODD = 0x40, | |
38 WP_IDF_LONG = 0x80 | |
39 }; | |
40 | |
41 enum WP_ID{ | |
42 WP_ID_DUMMY = 0, | |
43 WP_ID_ENCINFO, | |
44 WP_ID_DECTERMS, | |
45 WP_ID_DECWEIGHTS, | |
46 WP_ID_DECSAMPLES, | |
47 WP_ID_ENTROPY, | |
48 WP_ID_HYBRID, | |
49 WP_ID_SHAPING, | |
50 WP_ID_FLOATINFO, | |
51 WP_ID_INT32INFO, | |
52 WP_ID_DATA, | |
53 WP_ID_CORR, | |
54 WP_ID_FLT, | |
55 WP_ID_CHANINFO | |
56 }; | |
57 | |
58 #define MAX_TERMS 16 | |
59 | |
60 typedef struct Decorr { | |
61 int delta; | |
62 int value; | |
63 int weightA; | |
64 int weightB; | |
65 int samplesA[8]; | |
66 int samplesB[8]; | |
67 } Decorr; | |
68 | |
69 typedef struct WavpackContext { | |
70 AVCodecContext *avctx; | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
71 int stereo, stereo_in; |
3764 | 72 int joint; |
73 uint32_t CRC; | |
74 GetBitContext gb; | |
75 int data_size; // in bits | |
76 int samples; | |
77 int median[6]; | |
78 int terms; | |
79 Decorr decorr[MAX_TERMS]; | |
80 int zero, one, zeroes; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
81 int and, or, shift; |
3764 | 82 } WavpackContext; |
83 | |
84 // exponent table copied from WavPack source | |
85 static const uint8_t wp_exp2_table [256] = { | |
86 0x00, 0x01, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x0b, | |
87 0x0b, 0x0c, 0x0d, 0x0e, 0x0e, 0x0f, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x14, 0x15, 0x16, 0x16, | |
88 0x17, 0x18, 0x19, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1f, 0x20, 0x20, 0x21, 0x22, 0x23, | |
89 0x24, 0x24, 0x25, 0x26, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, | |
90 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3a, 0x3b, 0x3c, 0x3d, | |
91 0x3e, 0x3f, 0x40, 0x41, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x48, 0x49, 0x4a, 0x4b, | |
92 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, | |
93 0x5b, 0x5c, 0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | |
94 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, | |
95 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x87, 0x88, 0x89, 0x8a, | |
96 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, | |
97 0x9c, 0x9d, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, | |
98 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, | |
99 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc8, 0xc9, 0xca, 0xcb, 0xcd, 0xce, 0xcf, 0xd0, 0xd2, 0xd3, 0xd4, | |
100 0xd6, 0xd7, 0xd8, 0xd9, 0xdb, 0xdc, 0xdd, 0xde, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe8, 0xe9, | |
101 0xea, 0xec, 0xed, 0xee, 0xf0, 0xf1, 0xf2, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfc, 0xfd, 0xff | |
102 }; | |
103 | |
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4021
diff
changeset
|
104 static av_always_inline int wp_exp2(int16_t val) |
3764 | 105 { |
106 int res, neg = 0; | |
107 | |
108 if(val < 0){ | |
109 val = -val; | |
110 neg = 1; | |
111 } | |
112 | |
113 res = wp_exp2_table[val & 0xFF] | 0x100; | |
114 val >>= 8; | |
115 res = (val > 9) ? (res << (val - 9)) : (res >> (9 - val)); | |
116 return neg ? -res : res; | |
117 } | |
118 | |
119 // macros for manipulating median values | |
120 #define GET_MED(n) ((median[n] >> 4) + 1) | |
121 #define DEC_MED(n) median[n] -= ((median[n] + (128>>n) - 2) / (128>>n)) * 2 | |
122 #define INC_MED(n) median[n] += ((median[n] + (128>>n)) / (128>>n)) * 5 | |
123 | |
124 // macros for applying weight | |
125 #define UPDATE_WEIGHT_CLIP(weight, delta, samples, in) \ | |
126 if(samples && in){ \ | |
127 if((samples ^ in) < 0){ \ | |
128 weight -= delta; \ | |
129 if(weight < -1024) weight = -1024; \ | |
130 }else{ \ | |
131 weight += delta; \ | |
132 if(weight > 1024) weight = 1024; \ | |
133 } \ | |
134 } | |
135 | |
136 | |
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4021
diff
changeset
|
137 static av_always_inline int get_tail(GetBitContext *gb, int k) |
3764 | 138 { |
139 int p, e, res; | |
140 | |
4421 | 141 if(k<1)return 0; |
142 p = av_log2(k); | |
3764 | 143 e = (1 << (p + 1)) - k - 1; |
3782 | 144 res = p ? get_bits(gb, p) : 0; |
3764 | 145 if(res >= e){ |
146 res = (res<<1) - e + get_bits1(gb); | |
147 } | |
148 return res; | |
149 } | |
150 | |
151 static int wv_get_value(WavpackContext *ctx, GetBitContext *gb, int *median, int *last) | |
152 { | |
153 int t, t2; | |
154 int sign, base, add, ret; | |
155 | |
156 *last = 0; | |
157 | |
158 if((ctx->median[0] < 2U) && (ctx->median[3] < 2U) && !ctx->zero && !ctx->one){ | |
159 if(ctx->zeroes){ | |
160 ctx->zeroes--; | |
161 if(ctx->zeroes) | |
162 return 0; | |
163 }else{ | |
5607 | 164 t = get_unary_0_33(gb); |
3764 | 165 if(t >= 2) t = get_bits(gb, t - 1) | (1 << (t-1)); |
166 ctx->zeroes = t; | |
167 if(ctx->zeroes){ | |
168 memset(ctx->median, 0, sizeof(ctx->median)); | |
169 return 0; | |
170 } | |
171 } | |
172 } | |
173 | |
174 if(get_bits_count(gb) >= ctx->data_size){ | |
175 *last = 1; | |
176 return 0; | |
177 } | |
178 | |
179 if(ctx->zero){ | |
180 t = 0; | |
181 ctx->zero = 0; | |
182 }else{ | |
5607 | 183 t = get_unary_0_33(gb); |
3764 | 184 if(get_bits_count(gb) >= ctx->data_size){ |
185 *last = 1; | |
186 return 0; | |
187 } | |
188 if(t == 16) { | |
5607 | 189 t2 = get_unary_0_33(gb); |
3764 | 190 if(t2 < 2) t += t2; |
191 else t += get_bits(gb, t2 - 1) | (1 << (t2 - 1)); | |
192 } | |
193 | |
194 if(ctx->one){ | |
195 ctx->one = t&1; | |
196 t = (t>>1) + 1; | |
197 }else{ | |
198 ctx->one = t&1; | |
199 t >>= 1; | |
200 } | |
201 ctx->zero = !ctx->one; | |
202 } | |
203 | |
204 if(!t){ | |
205 base = 0; | |
206 add = GET_MED(0) - 1; | |
207 DEC_MED(0); | |
208 }else if(t == 1){ | |
209 base = GET_MED(0); | |
210 add = GET_MED(1) - 1; | |
211 INC_MED(0); | |
212 DEC_MED(1); | |
213 }else if(t == 2){ | |
214 base = GET_MED(0) + GET_MED(1); | |
215 add = GET_MED(2) - 1; | |
216 INC_MED(0); | |
217 INC_MED(1); | |
218 DEC_MED(2); | |
219 }else{ | |
220 base = GET_MED(0) + GET_MED(1) + GET_MED(2) * (t - 2); | |
221 add = GET_MED(2) - 1; | |
222 INC_MED(0); | |
223 INC_MED(1); | |
224 INC_MED(2); | |
225 } | |
226 ret = base + get_tail(gb, add); | |
227 sign = get_bits1(gb); | |
228 return sign ? ~ret : ret; | |
229 } | |
230 | |
231 static int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, int16_t *dst) | |
232 { | |
233 int i, j, count = 0; | |
234 int last, t; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
235 int A, B, L, L2, R, R2, bit; |
3764 | 236 int pos = 0; |
237 uint32_t crc = 0xFFFFFFFF; | |
238 | |
239 s->one = s->zero = s->zeroes = 0; | |
240 do{ | |
241 L = wv_get_value(s, gb, s->median, &last); | |
242 if(last) break; | |
243 R = wv_get_value(s, gb, s->median + 3, &last); | |
244 if(last) break; | |
245 for(i = 0; i < s->terms; i++){ | |
246 t = s->decorr[i].value; | |
247 j = 0; | |
248 if(t > 0){ | |
249 if(t > 8){ | |
250 if(t & 1){ | |
251 A = 2 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]; | |
252 B = 2 * s->decorr[i].samplesB[0] - s->decorr[i].samplesB[1]; | |
253 }else{ | |
254 A = (3 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]) >> 1; | |
255 B = (3 * s->decorr[i].samplesB[0] - s->decorr[i].samplesB[1]) >> 1; | |
256 } | |
257 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0]; | |
258 s->decorr[i].samplesB[1] = s->decorr[i].samplesB[0]; | |
259 j = 0; | |
260 }else{ | |
261 A = s->decorr[i].samplesA[pos]; | |
262 B = s->decorr[i].samplesB[pos]; | |
263 j = (pos + t) & 7; | |
264 } | |
265 L2 = L + ((s->decorr[i].weightA * A + 512) >> 10); | |
266 R2 = R + ((s->decorr[i].weightB * B + 512) >> 10); | |
267 if(A && L) s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta; | |
268 if(B && R) s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta; | |
269 s->decorr[i].samplesA[j] = L = L2; | |
270 s->decorr[i].samplesB[j] = R = R2; | |
271 }else if(t == -1){ | |
272 L2 = L + ((s->decorr[i].weightA * s->decorr[i].samplesA[0] + 512) >> 10); | |
273 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, s->decorr[i].samplesA[0], L); | |
274 L = L2; | |
275 R2 = R + ((s->decorr[i].weightB * L2 + 512) >> 10); | |
276 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R); | |
277 R = R2; | |
278 s->decorr[i].samplesA[0] = R; | |
279 }else{ | |
280 R2 = R + ((s->decorr[i].weightB * s->decorr[i].samplesB[0] + 512) >> 10); | |
281 UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, s->decorr[i].samplesB[0], R); | |
282 R = R2; | |
283 | |
284 if(t == -3){ | |
285 R2 = s->decorr[i].samplesA[0]; | |
286 s->decorr[i].samplesA[0] = R; | |
287 } | |
288 | |
289 L2 = L + ((s->decorr[i].weightA * R2 + 512) >> 10); | |
290 UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, R2, L); | |
291 L = L2; | |
292 s->decorr[i].samplesB[0] = L; | |
293 } | |
294 } | |
295 pos = (pos + 1) & 7; | |
296 if(s->joint) | |
297 L += (R -= (L >> 1)); | |
298 crc = (crc * 3 + L) * 3 + R; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
299 bit = (L & s->and) | s->or; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
300 *dst++ = ((L + bit) << s->shift) - bit; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
301 bit = (R & s->and) | s->or; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
302 *dst++ = ((R + bit) << s->shift) - bit; |
3764 | 303 count++; |
304 }while(!last && count < s->samples); | |
305 | |
306 if(crc != s->CRC){ | |
307 av_log(s->avctx, AV_LOG_ERROR, "CRC error\n"); | |
308 return -1; | |
309 } | |
310 return count * 2; | |
311 } | |
312 | |
313 static int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, int16_t *dst) | |
314 { | |
315 int i, j, count = 0; | |
316 int last, t; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
317 int A, S, T, bit; |
3764 | 318 int pos = 0; |
319 uint32_t crc = 0xFFFFFFFF; | |
320 | |
321 s->one = s->zero = s->zeroes = 0; | |
322 do{ | |
323 T = wv_get_value(s, gb, s->median, &last); | |
324 S = 0; | |
325 if(last) break; | |
326 for(i = 0; i < s->terms; i++){ | |
327 t = s->decorr[i].value; | |
328 if(t > 8){ | |
329 if(t & 1) | |
330 A = 2 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]; | |
331 else | |
332 A = (3 * s->decorr[i].samplesA[0] - s->decorr[i].samplesA[1]) >> 1; | |
333 s->decorr[i].samplesA[1] = s->decorr[i].samplesA[0]; | |
334 j = 0; | |
335 }else{ | |
336 A = s->decorr[i].samplesA[pos]; | |
337 j = (pos + t) & 7; | |
338 } | |
339 S = T + ((s->decorr[i].weightA * A + 512) >> 10); | |
340 if(A && T) s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta; | |
341 s->decorr[i].samplesA[j] = T = S; | |
342 } | |
343 pos = (pos + 1) & 7; | |
344 crc = crc * 3 + S; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
345 bit = (S & s->and) | s->or; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
346 *dst++ = ((S + bit) << s->shift) - bit; |
3764 | 347 count++; |
348 }while(!last && count < s->samples); | |
349 | |
350 if(crc != s->CRC){ | |
351 av_log(s->avctx, AV_LOG_ERROR, "CRC error\n"); | |
352 return -1; | |
353 } | |
354 return count; | |
355 } | |
356 | |
357 static int wavpack_decode_init(AVCodecContext *avctx) | |
358 { | |
359 WavpackContext *s = avctx->priv_data; | |
360 | |
361 s->avctx = avctx; | |
362 s->stereo = (avctx->channels == 2); | |
363 | |
364 return 0; | |
365 } | |
366 | |
367 static int wavpack_decode_frame(AVCodecContext *avctx, | |
368 void *data, int *data_size, | |
369 uint8_t *buf, int buf_size) | |
370 { | |
371 WavpackContext *s = avctx->priv_data; | |
372 int16_t *samples = data; | |
373 int samplecount; | |
374 int got_terms = 0, got_weights = 0, got_samples = 0, got_entropy = 0, got_bs = 0; | |
375 uint8_t* buf_end = buf + buf_size; | |
376 int i, j, id, size, ssize, weights, t; | |
377 | |
4690 | 378 if (buf_size == 0){ |
379 *data_size = 0; | |
380 return 0; | |
381 } | |
3764 | 382 |
383 memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr)); | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
384 memset(s->median, 0, sizeof(s->median)); |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
385 s->and = s->or = s->shift = 0; |
3764 | 386 |
4364 | 387 s->samples = AV_RL32(buf); buf += 4; |
4690 | 388 if(!s->samples){ |
389 *data_size = 0; | |
390 return buf_size; | |
391 } | |
4017 | 392 /* should not happen but who knows */ |
4690 | 393 if(s->samples * 2 * avctx->channels > *data_size){ |
4017 | 394 av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n"); |
395 return -1; | |
396 } | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
397 s->stereo_in = (AV_RL32(buf) & WV_FALSE_STEREO) ? 0 : s->stereo; |
5538 | 398 s->joint = AV_RL32(buf) & WV_JOINT_STEREO; buf += 4; |
4364 | 399 s->CRC = AV_RL32(buf); buf += 4; |
3764 | 400 // parse metadata blocks |
401 while(buf < buf_end){ | |
402 id = *buf++; | |
403 size = *buf++; | |
404 if(id & WP_IDF_LONG) { | |
405 size |= (*buf++) << 8; | |
406 size |= (*buf++) << 16; | |
407 } | |
408 size <<= 1; // size is specified in words | |
409 ssize = size; | |
410 if(id & WP_IDF_ODD) size--; | |
411 if(size < 0){ | |
412 av_log(avctx, AV_LOG_ERROR, "Got incorrect block %02X with size %i\n", id, size); | |
413 break; | |
414 } | |
415 if(buf + ssize > buf_end){ | |
416 av_log(avctx, AV_LOG_ERROR, "Block size %i is out of bounds\n", size); | |
417 break; | |
418 } | |
419 if(id & WP_IDF_IGNORE){ | |
420 buf += ssize; | |
421 continue; | |
422 } | |
423 switch(id & WP_IDF_MASK){ | |
424 case WP_ID_DECTERMS: | |
425 s->terms = size; | |
426 if(s->terms > MAX_TERMS){ | |
427 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n"); | |
428 buf += ssize; | |
429 continue; | |
430 } | |
431 for(i = 0; i < s->terms; i++) { | |
432 s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5; | |
433 s->decorr[s->terms - i - 1].delta = *buf >> 5; | |
434 buf++; | |
435 } | |
436 got_terms = 1; | |
437 break; | |
438 case WP_ID_DECWEIGHTS: | |
439 if(!got_terms){ | |
440 av_log(avctx, AV_LOG_ERROR, "No decorrelation terms met\n"); | |
441 continue; | |
442 } | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
443 weights = size >> s->stereo_in; |
3764 | 444 if(weights > MAX_TERMS || weights > s->terms){ |
445 av_log(avctx, AV_LOG_ERROR, "Too many decorrelation weights\n"); | |
446 buf += ssize; | |
447 continue; | |
448 } | |
449 for(i = 0; i < weights; i++) { | |
450 t = (int8_t)(*buf++); | |
451 s->decorr[s->terms - i - 1].weightA = t << 3; | |
452 if(s->decorr[s->terms - i - 1].weightA > 0) | |
453 s->decorr[s->terms - i - 1].weightA += (s->decorr[s->terms - i - 1].weightA + 64) >> 7; | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
454 if(s->stereo_in){ |
3764 | 455 t = (int8_t)(*buf++); |
456 s->decorr[s->terms - i - 1].weightB = t << 3; | |
457 if(s->decorr[s->terms - i - 1].weightB > 0) | |
458 s->decorr[s->terms - i - 1].weightB += (s->decorr[s->terms - i - 1].weightB + 64) >> 7; | |
459 } | |
460 } | |
461 got_weights = 1; | |
462 break; | |
463 case WP_ID_DECSAMPLES: | |
464 if(!got_terms){ | |
465 av_log(avctx, AV_LOG_ERROR, "No decorrelation terms met\n"); | |
466 continue; | |
467 } | |
468 t = 0; | |
469 for(i = s->terms - 1; (i >= 0) && (t < size); i--) { | |
470 if(s->decorr[i].value > 8){ | |
4364 | 471 s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2; |
472 s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf)); buf += 2; | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
473 if(s->stereo_in){ |
4364 | 474 s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2; |
475 s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf)); buf += 2; | |
3764 | 476 t += 4; |
477 } | |
478 t += 4; | |
479 }else if(s->decorr[i].value < 0){ | |
4364 | 480 s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2; |
481 s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2; | |
3764 | 482 t += 4; |
483 }else{ | |
484 for(j = 0; j < s->decorr[i].value; j++){ | |
4364 | 485 s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf)); buf += 2; |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
486 if(s->stereo_in){ |
4364 | 487 s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf)); buf += 2; |
3764 | 488 } |
489 } | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
490 t += s->decorr[i].value * 2 * (s->stereo_in + 1); |
3764 | 491 } |
492 } | |
493 got_samples = 1; | |
494 break; | |
495 case WP_ID_ENTROPY: | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
496 if(size != 6 * (s->stereo_in + 1)){ |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
497 av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, got %i", 6 * (s->stereo_in + 1), size); |
3764 | 498 buf += ssize; |
499 continue; | |
500 } | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
501 for(i = 0; i < 3 * (s->stereo_in + 1); i++){ |
4364 | 502 s->median[i] = wp_exp2(AV_RL16(buf)); |
3764 | 503 buf += 2; |
504 } | |
505 got_entropy = 1; | |
506 break; | |
5482
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
507 case WP_ID_INT32INFO: |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
508 if(size != 4 || *buf){ |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
509 av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf); |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
510 buf += ssize; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
511 continue; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
512 } |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
513 if(buf[1]) |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
514 s->shift = buf[1]; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
515 else if(buf[2]){ |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
516 s->and = s->or = 1; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
517 s->shift = buf[2]; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
518 }else if(buf[3]){ |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
519 s->and = 1; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
520 s->shift = buf[3]; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
521 } |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
522 buf += 4; |
bba203d5c5e7
Add the handling of the INT32INFO block to the WavPack decoder.
kostya
parents:
4690
diff
changeset
|
523 break; |
3764 | 524 case WP_ID_DATA: |
525 init_get_bits(&s->gb, buf, size * 8); | |
526 s->data_size = size * 8; | |
527 buf += size; | |
528 got_bs = 1; | |
529 break; | |
530 default: | |
531 buf += size; | |
532 } | |
533 if(id & WP_IDF_ODD) buf++; | |
534 } | |
535 if(!got_terms){ | |
536 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n"); | |
537 return -1; | |
538 } | |
539 if(!got_weights){ | |
540 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n"); | |
541 return -1; | |
542 } | |
543 if(!got_samples){ | |
544 av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n"); | |
545 return -1; | |
546 } | |
547 if(!got_entropy){ | |
548 av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n"); | |
549 return -1; | |
550 } | |
551 if(!got_bs){ | |
552 av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n"); | |
553 return -1; | |
554 } | |
555 | |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
556 if(s->stereo_in) |
3764 | 557 samplecount = wv_unpack_stereo(s, &s->gb, samples); |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
558 else{ |
3764 | 559 samplecount = wv_unpack_mono(s, &s->gb, samples); |
5539
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
560 if(s->stereo){ |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
561 int16_t *dst = samples + samplecount * 2; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
562 int16_t *src = samples + samplecount; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
563 int cnt = samplecount; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
564 while(cnt--){ |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
565 *--dst = *--src; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
566 *--dst = *src; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
567 } |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
568 samplecount *= 2; |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
569 } |
1c67999f81c8
Support for WavPack version 0x410 (false stereo chunks)
kostya
parents:
5538
diff
changeset
|
570 } |
3764 | 571 *data_size = samplecount * 2; |
572 | |
573 return buf_size; | |
574 } | |
575 | |
576 AVCodec wavpack_decoder = { | |
577 "wavpack", | |
578 CODEC_TYPE_AUDIO, | |
579 CODEC_ID_WAVPACK, | |
580 sizeof(WavpackContext), | |
581 wavpack_decode_init, | |
582 NULL, | |
5941 | 583 NULL, |
3764 | 584 wavpack_decode_frame, |
585 }; |