Commit 1dfe54c0 authored by michael's avatar michael

Fix apparent 10l typos introduced in r8627.

These typos moved the exponent pointer too far ahead.
Fixes issue1055.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20756 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c0ed9ca6
...@@ -630,7 +630,7 @@ static int wma_decode_block(WMACodecContext *s) ...@@ -630,7 +630,7 @@ static int wma_decode_block(WMACodecContext *s)
/* compute power of high bands */ /* compute power of high bands */
exponents = s->exponents[ch] + exponents = s->exponents[ch] +
(s->high_band_start[bsize]<<bsize); (s->high_band_start[bsize]<<bsize>>esize);
last_high_band = 0; /* avoid warning */ last_high_band = 0; /* avoid warning */
for(j=0;j<n1;j++) { for(j=0;j<n1;j++) {
n = s->exponent_high_bands[s->frame_len_bits - n = s->exponent_high_bands[s->frame_len_bits -
...@@ -646,11 +646,11 @@ static int wma_decode_block(WMACodecContext *s) ...@@ -646,11 +646,11 @@ static int wma_decode_block(WMACodecContext *s)
last_high_band = j; last_high_band = j;
tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n); tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n);
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} }
/* main freqs and high freqs */ /* main freqs and high freqs */
exponents = s->exponents[ch] + (s->coefs_start<<bsize); exponents = s->exponents[ch] + (s->coefs_start<<bsize>>esize);
for(j=-1;j<n1;j++) { for(j=-1;j<n1;j++) {
if (j < 0) { if (j < 0) {
n = s->high_band_start[bsize] - n = s->high_band_start[bsize] -
...@@ -672,7 +672,7 @@ static int wma_decode_block(WMACodecContext *s) ...@@ -672,7 +672,7 @@ static int wma_decode_block(WMACodecContext *s)
*coefs++ = noise * *coefs++ = noise *
exponents[i<<bsize>>esize] * mult1; exponents[i<<bsize>>esize] * mult1;
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} else { } else {
/* coded values + small noise */ /* coded values + small noise */
for(i = 0;i < n; i++) { for(i = 0;i < n; i++) {
...@@ -681,7 +681,7 @@ static int wma_decode_block(WMACodecContext *s) ...@@ -681,7 +681,7 @@ static int wma_decode_block(WMACodecContext *s)
*coefs++ = ((*coefs1++) + noise) * *coefs++ = ((*coefs1++) + noise) *
exponents[i<<bsize>>esize] * mult; exponents[i<<bsize>>esize] * mult;
} }
exponents += n<<bsize; exponents += n<<bsize>>esize;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment