diff options
| -rw-r--r-- | libavcodec/ra144.c | 2 | ||||
| -rw-r--r-- | libavcodec/ra144.h | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 3f37c6b16e..0a272642e7 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -358,7 +358,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, eval_coefs(ractx->lpc_coef, lpc_refl); ractx->lpc_refl_rms = rms(lpc_refl); - energy = energy_tab[get_bits(&gb, 5) << 1]; // Useless table entries? + energy = energy_tab[get_bits(&gb, 5)]; refl_rms[0] = interp(ractx, block_coefs[0], 0, 0, ractx->old_energy); refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy, diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index f2865dfe03..20d421ab11 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -1485,15 +1485,11 @@ static const uint16_t cb2_base[128]={ 12053, 13204, 13227, 13170, 13832, 13879, 13380, 12174, }; -static const int16_t energy_tab[63]={ - 0, 6, 16, 18, 20, 23, 25, 29, - 32, 36, 41, 46, 51, 57, 65, 73, - 81, 91, 103, 115, 129, 145, 163, 183, - 205, 230, 259, 290, 326, 365, 410, 460, - 516, 579, 650, 730, 819, 919, 1031, 1157, - 1298, 1456, 1634, 1833, 2057, 2308, 2590, 2906, - 3261, 3659, 4105, 4606, 5168, 5799, 6507, 7301, - 8192, 9191, 10313, 11571, 12983, 14567, 16345 +static const int16_t energy_tab[32]={ + 0, 16, 20, 25, 32, 41, 51, 65, + 81, 103, 129, 163, 205, 259, 326, 410, + 516, 650, 819, 1031, 1298, 1634, 2057, 2590, + 3261, 4105, 5168, 6507, 8192, 10313, 12983, 16345 }; static const int16_t lpc_refl_cb1[127]={ |