diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-11-24 09:28:55 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-11-24 09:28:55 +0000 |
| commit | 4deaa94639148297cef58d35bc25ebcab45e9111 (patch) | |
| tree | 03a79a4895415234e3ec75717864a5411eefda01 /libavcodec/mpegaudiodec.c | |
| parent | 8f5aaa6d2fde23d372c80844514103c93088b2f2 (diff) | |
| download | ffmpeg-4deaa94639148297cef58d35bc25ebcab45e9111.tar.gz | |
Add shift argument to MULL() macro
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount. All uses of this macro are
updated to pass FRAC_BITS as third argument.
Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index a277492727..a853562a3f 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -351,9 +351,9 @@ static int decode_init(AVCodecContext * avctx) int n, norm; n = i + 2; norm = ((INT64_C(1) << n) * FRAC_ONE) / ((1 << n) - 1); - scale_factor_mult[i][0] = MULL(FIXR(1.0 * 2.0), norm); - scale_factor_mult[i][1] = MULL(FIXR(0.7937005259 * 2.0), norm); - scale_factor_mult[i][2] = MULL(FIXR(0.6299605249 * 2.0), norm); + scale_factor_mult[i][0] = MULL(FIXR(1.0 * 2.0), norm, FRAC_BITS); + scale_factor_mult[i][1] = MULL(FIXR(0.7937005259 * 2.0), norm, FRAC_BITS); + scale_factor_mult[i][2] = MULL(FIXR(0.6299605249 * 2.0), norm, FRAC_BITS); dprintf(avctx, "%d: norm=%x s=%x %x %x\n", i, norm, scale_factor_mult[i][0], @@ -1097,7 +1097,7 @@ static void imdct36(int *out, int *buf, int *in, int *win) t2 = tmp[i + 1]; t3 = tmp[i + 3]; s1 = MULH(2*(t3 + t2), icos36h[j]); - s3 = MULL(t3 - t2, icos36[8 - j]); + s3 = MULL(t3 - t2, icos36[8 - j], FRAC_BITS); t0 = s0 + s1; t1 = s0 - s1; @@ -1705,8 +1705,8 @@ static void compute_stereo(MPADecodeContext *s, v2 = is_tab[1][sf]; for(j=0;j<len;j++) { tmp0 = tab0[j]; - tab0[j] = MULL(tmp0, v1); - tab1[j] = MULL(tmp0, v2); + tab0[j] = MULL(tmp0, v1, FRAC_BITS); + tab1[j] = MULL(tmp0, v2, FRAC_BITS); } } else { found1: @@ -1716,8 +1716,8 @@ static void compute_stereo(MPADecodeContext *s, for(j=0;j<len;j++) { tmp0 = tab0[j]; tmp1 = tab1[j]; - tab0[j] = MULL(tmp0 + tmp1, ISQRT2); - tab1[j] = MULL(tmp0 - tmp1, ISQRT2); + tab0[j] = MULL(tmp0 + tmp1, ISQRT2, FRAC_BITS); + tab1[j] = MULL(tmp0 - tmp1, ISQRT2, FRAC_BITS); } } } @@ -1749,8 +1749,8 @@ static void compute_stereo(MPADecodeContext *s, v2 = is_tab[1][sf]; for(j=0;j<len;j++) { tmp0 = tab0[j]; - tab0[j] = MULL(tmp0, v1); - tab1[j] = MULL(tmp0, v2); + tab0[j] = MULL(tmp0, v1, FRAC_BITS); + tab1[j] = MULL(tmp0, v2, FRAC_BITS); } } else { found2: @@ -1760,8 +1760,8 @@ static void compute_stereo(MPADecodeContext *s, for(j=0;j<len;j++) { tmp0 = tab0[j]; tmp1 = tab1[j]; - tab0[j] = MULL(tmp0 + tmp1, ISQRT2); - tab1[j] = MULL(tmp0 - tmp1, ISQRT2); + tab0[j] = MULL(tmp0 + tmp1, ISQRT2, FRAC_BITS); + tab1[j] = MULL(tmp0 - tmp1, ISQRT2, FRAC_BITS); } } } |