# HG changeset patch # User vitor # Date 1263613457 0 # Node ID 36587d8c1201a7a7d222d287d0612eea861faee6 # Parent de32bff741ea217c54a46a325259040972f58afd Allow a SIPR table to be used by the upcoming SIPR16k decoder diff -r de32bff741ea -r 36587d8c1201 sipr.c --- a/sipr.c Sat Jan 16 03:40:25 2010 +0000 +++ b/sipr.c Sat Jan 16 03:44:17 2010 +0000 @@ -110,6 +110,13 @@ } }; +const float ff_pow_0_5[] = { + 1.0/(1 << 1), 1.0/(1 << 2), 1.0/(1 << 3), 1.0/(1 << 4), + 1.0/(1 << 5), 1.0/(1 << 6), 1.0/(1 << 7), 1.0/(1 << 8), + 1.0/(1 << 9), 1.0/(1 << 10), 1.0/(1 << 11), 1.0/(1 << 12), + 1.0/(1 << 13), 1.0/(1 << 14), 1.0/(1 << 15), 1.0/(1 << 16) +}; + static void dequant(float *out, const int *idx, const float *cbs[]) { int i; @@ -273,7 +280,7 @@ for (i = 0; i < LP_FILTER_ORDER; i++) { lpc_d[i] = lpc[i] * ff_pow_0_75[i]; - lpc_n[i] = lpc[i] * pow_0_5 [i]; + lpc_n[i] = lpc[i] * ff_pow_0_5 [i]; }; memcpy(pole_out - LP_FILTER_ORDER, ctx->postfilter_mem, diff -r de32bff741ea -r 36587d8c1201 siprdata.h --- a/siprdata.h Sat Jan 16 03:40:25 2010 +0000 +++ b/siprdata.h Sat Jan 16 03:44:17 2010 +0000 @@ -24,13 +24,6 @@ #ifndef AVCODEC_SIPRDATA_H #define AVCODEC_SIPRDATA_H -static const float pow_0_5[] = { - 1.0/(1 << 1), 1.0/(1 << 2), 1.0/(1 << 3), 1.0/(1 << 4), - 1.0/(1 << 5), 1.0/(1 << 6), 1.0/(1 << 7), 1.0/(1 << 8), - 1.0/(1 << 9), 1.0/(1 << 10), 1.0/(1 << 11), 1.0/(1 << 12), - 1.0/(1 << 13), 1.0/(1 << 14), 1.0/(1 << 15), 1.0/(1 << 16) -}; - static const float mean_lsf[10] = { 0.297151, 0.452308, 0.765443, 1.134803, 1.421125, 1.773822, 2.049173, 2.375914, 2.585097, 0.075756