Mercurial > libavcodec.hg
changeset 407:c3aebacf546e libavcodec
fixed incorrect global gain - slightly increased precision of n^(4/3) table
| author | glantau |
|---|---|
| date | Tue, 21 May 2002 21:07:47 +0000 |
| parents | 62b311619b44 |
| children | e5a0daeb3b58 |
| files | mpegaudiodec.c |
| diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudiodec.c Tue May 21 19:42:43 2002 +0000 +++ b/mpegaudiodec.c Tue May 21 21:07:47 2002 +0000 @@ -279,12 +279,17 @@ a = a << 1; eq--; } + /* now POW_FRAC_ONE <= a < 2 * POW_FRAC_ONE */ +#if (POW_FRAC_BITS - 1) > FRAC_BITS + a = (a + (1 << (POW_FRAC_BITS - FRAC_BITS - 1))) >> (POW_FRAC_BITS - FRAC_BITS); + /* correct overflow */ + if (a >= 2 * (1 << FRAC_BITS)) { + a = a >> 1; + eq++; + } +#endif *exp_ptr = eq; -#if POW_FRAC_BITS == FRAC_BITS return a; -#else - return (a + (1 << (POW_FRAC_BITS - FRAC_BITS - 1))) >> (POW_FRAC_BITS - FRAC_BITS); -#endif } static int decode_init(AVCodecContext * avctx) @@ -388,10 +393,6 @@ for(i=1;i<TABLE_4_3_SIZE;i++) { int e, m; m = int_pow(i, &e); -#if FRAC_BITS <= 15 - if ((unsigned short)m != m) - m = 65535; -#endif #if 0 /* test code */ { @@ -401,8 +402,10 @@ fm = frexp(f, &e1); m1 = FIXR(2 * fm); #if FRAC_BITS <= 15 - if ((unsigned short)m1 != m1) - m1 = 65535; + if ((unsigned short)m1 != m1) { + m1 = m1 >> 1; + e1++; + } #endif e1--; if (m != m1 || e != e1) { @@ -413,9 +416,8 @@ #endif /* normalized to FRAC_BITS */ table_4_3_value[i] = m; - table_4_3_exp[i] = e - 1; + table_4_3_exp[i] = e; } - for(i=0;i<7;i++) { float f;