diff options
| author | Brad Midgley <bmidgley@xmission.com> | 2008-01-26 19:45:54 +0000 |
|---|---|---|
| committer | Brad Midgley <bmidgley@xmission.com> | 2008-01-26 19:45:54 +0000 |
| commit | c9b510105937825c04c729b4bb02b87596b795fb (patch) | |
| tree | 3d122d7f7c73d2a7f2ec564aefe7969919f31c5c /sbc/sbc_math.h | |
| parent | dae52eacbae42da81c3a569c28c4f09755f4f93b (diff) | |
shorten the encoder tables to 16 bits, take out mula32/mul32 for now for simplicity
Diffstat (limited to 'sbc/sbc_math.h')
| -rw-r--r-- | sbc/sbc_math.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sbc/sbc_math.h b/sbc/sbc_math.h index f5879fbf..5aeddac1 100644 --- a/sbc/sbc_math.h +++ b/sbc/sbc_math.h @@ -31,20 +31,20 @@ #define ASR_64(val, bits) ((-2 >> 1 == -1) ? \ ((long long)(val)) >> (bits) : ((long long) (val)) / (1 << (bits))) -#define SCALE_PROTO4_TBL 15 +#define SCALE_PROTO4_TBL 16 #define SCALE_ANA4_TBL 16 -#define SCALE_PROTO8_TBL 15 +#define SCALE_PROTO8_TBL 16 #define SCALE_ANA8_TBL 16 #define SCALE_SPROTO4_TBL 16 #define SCALE_SPROTO8_TBL 16 #define SCALE_NPROTO4_TBL 10 #define SCALE_NPROTO8_TBL 12 #define SCALE_SAMPLES 14 -#define SCALE4_STAGE1_BITS 10 +#define SCALE4_STAGE1_BITS 9 #define SCALE4_STAGE2_BITS 21 #define SCALE4_STAGED1_BITS 18 #define SCALE4_STAGED2_BITS 23 -#define SCALE8_STAGE1_BITS 8 +#define SCALE8_STAGE1_BITS 7 #define SCALE8_STAGE2_BITS 24 #define SCALE8_STAGED1_BITS 18 #define SCALE8_STAGED2_BITS 23 @@ -64,8 +64,6 @@ typedef long long sbc_extended_t; #define SBC_FIXED_0(val) { val = 0; } #define ADD(dst, src) { dst += src; } #define SUB(dst, src) { dst -= src; } -#define MUL32(dst, a, b) { dst = (sbc_fixed_t) (a) * (b); } -#define MULA32(dst, a, b) { dst += (sbc_fixed_t) (a) * (b); } #define MUL(dst, a, b) { dst = (sbc_extended_t) (a) * (b); } #define MULA(dst, a, b) { dst += (sbc_extended_t) (a) * (b); } #define DIV2(dst, src) { dst = ASR(src, 1); } |