summaryrefslogtreecommitdiff
path: root/libavcodec/gsmdec_template.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-06-04 16:53:54 +0200
committerDiego Biurrun <diego@biurrun.de>2016-06-07 13:22:22 +0200
commit81f769fa129edc51c28285649c2df6da717e718f (patch)
tree07c0e4d4d0826b9cd82f1daf3ae7de5a3da0c851 /libavcodec/gsmdec_template.c
parent42dc214323637464759354912e18b2bee1884dd1 (diff)
downloadffmpeg-81f769fa129edc51c28285649c2df6da717e718f.tar.gz
gsm: Move requant_tab table to the gsm tables file
This avoids duplicating the table in the gsm template file. Also adjust the table type to uint8_t to save space.
Diffstat (limited to 'libavcodec/gsmdec_template.c')
-rw-r--r--libavcodec/gsmdec_template.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/gsmdec_template.c b/libavcodec/gsmdec_template.c
index 0b54dc54ce..2794bd1132 100644
--- a/libavcodec/gsmdec_template.c
+++ b/libavcodec/gsmdec_template.c
@@ -28,13 +28,6 @@
#include "gsm.h"
#include "gsmdec_data.h"
-static const int requant_tab[4][8] = {
- { 0 },
- { 0, 7 },
- { 0, 2, 5, 7 },
- { 0, 1, 2, 3, 4, 5, 6, 7 }
-};
-
static void apcm_dequant_add(GetBitContext *gb, int16_t *dst, const int *frame_bits)
{
int i, val;
@@ -42,7 +35,7 @@ static void apcm_dequant_add(GetBitContext *gb, int16_t *dst, const int *frame_b
const int16_t *tab = ff_gsm_dequant_tab[maxidx];
for (i = 0; i < 13; i++) {
val = get_bits(gb, frame_bits[i]);
- dst[3*i] += tab[requant_tab[frame_bits[i]][val]];
+ dst[3 * i] += tab[ff_gsm_requant_tab[frame_bits[i]][val]];
}
}