Commit 20f75707 authored by Michael Niedermayer's avatar Michael Niedermayer

table[index][ch] -> table[ch][index] (might be faster ...)

Originally committed as revision 8651 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8845202e
...@@ -1312,7 +1312,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -1312,7 +1312,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
case CODEC_ID_ADPCM_THP: case CODEC_ID_ADPCM_THP:
{ {
GetBitContext gb; GetBitContext gb;
int table[16][2]; int table[2][16];
unsigned int samplecnt; unsigned int samplecnt;
int prev1[2], prev2[2]; int prev1[2], prev2[2];
int ch; int ch;
...@@ -1330,7 +1330,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -1330,7 +1330,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
for (ch = 0; ch < 2; ch++) for (ch = 0; ch < 2; ch++)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
table[i][ch] = get_sbits(&gb, 16); table[ch][i] = get_sbits(&gb, 16);
/* Initialize the previous sample. */ /* Initialize the previous sample. */
for (ch = 0; ch < 2; ch++) { for (ch = 0; ch < 2; ch++) {
...@@ -1350,8 +1350,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, ...@@ -1350,8 +1350,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
for (i = 0; i < samplecnt / 14; i++) { for (i = 0; i < samplecnt / 14; i++) {
uint8_t index = get_bits (&gb, 4) & 7; uint8_t index = get_bits (&gb, 4) & 7;
unsigned int exp = get_bits (&gb, 4); unsigned int exp = get_bits (&gb, 4);
int factor1 = table[index * 2][ch]; int factor1 = table[ch][index * 2];
int factor2 = table[index * 2 + 1][ch]; int factor2 = table[ch][index * 2 + 1];
/* Decode 14 samples. */ /* Decode 14 samples. */
for (n = 0; n < 14; n++) { for (n = 0; n < 14; n++) {
......
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