har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ac3enc: use MUL64() to multiply fixed-point coefficients"

Browse Source 
Author says, this is unneeded.

This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e.
This commit is contained in:
Michael Niedermayer 2011-03-09 19:50:36 +01:00
parent 5126a8ecbb
commit 2800e8d62e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ac3enc.c
View File

@ -328,10 +328,10 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s)
CoefType rt = block->mdct_coef[1][i]; CoefType rt = block->mdct_coef[1][i];
CoefType md = lt + rt; CoefType md = lt + rt;
CoefType sd = lt - rt; CoefType sd = lt - rt;
sum[0] += MUL_COEF(lt, lt); sum[0] += lt * lt;
sum[1] += MUL_COEF(rt, rt); sum[1] += rt * rt;
sum[2] += MUL_COEF(md, md); sum[2] += md * md;
sum[3] += MUL_COEF(sd, sd); sum[3] += sd * sd;
} }
/* compare sums to determine if rematrixing will be used for this band */ /* compare sums to determine if rematrixing will be used for this band */

2
libavcodec/ac3enc_fixed.h
View File

@ -36,8 +36,6 @@ typedef int16_t SampleType;
typedef int32_t CoefType; typedef int32_t CoefType;
typedef int64_t CoefSumType; typedef int64_t CoefSumType;
#define MUL_COEF(a,b) MUL64(a,b)
/** /**
* Compex number. * Compex number.

2
libavcodec/ac3enc_float.h
View File

@ -36,8 +36,6 @@ typedef float SampleType;
typedef float CoefType; typedef float CoefType;
typedef float CoefSumType; typedef float CoefSumType;
#define MUL_COEF(a,b) ((a)*(b))
typedef struct AC3MDCTContext { typedef struct AC3MDCTContext {
const float *window; ///< MDCT window function const float *window; ///< MDCT window function