virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Merge commit '81f769fa129edc51c28285649c2df6da717e718f'

Browse Source 
* commit '81f769fa129edc51c28285649c2df6da717e718f':
  gsm: Move requant_tab table to the gsm tables file

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-29 11:48:53 +02:00
commit daedfa7254
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/gsmdec_data.c
View File

@ -26,6 +26,13 @@ const uint16_t ff_gsm_long_term_gain_tab[4] = {
3277, 11469, 21299, 32767
};
const uint8_t ff_gsm_requant_tab[4][8] = {
{ 0 },
{ 0, 7 },
{ 0, 2, 5, 7 },
{ 0, 1, 2, 3, 4, 5, 6, 7 }
};
const int16_t ff_gsm_dequant_tab[64][8] = {
{ -28, -20, -12, -4, 4, 12, 20, 28},
{ -56, -40, -24, -8, 8, 24, 40, 56},

1
libavcodec/gsmdec_data.h
View File

@ -38,6 +38,7 @@ typedef struct GSMContext {
} GSMContext;
extern const uint16_t ff_gsm_long_term_gain_tab[4];
extern const uint8_t ff_gsm_requant_tab[4][8];
extern const int16_t ff_gsm_dequant_tab[64][8];
extern const int* const ff_gsm_apcm_bits[][4];

9
libavcodec/gsmdec_template.c
View File

@ -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]];
}
}