fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50 am: b471c2c215 

am: f69ca4c614

Change-Id: I78ee4dccc649e0ff2ee4006212795d89c2f8233c
This commit is contained in:
Jean-Michel Trivi 2018-12-26 17:10:27 -08:00 committed by android-build-merger
parent 1308fe1b8b f69ca4c614
commit 2ddc635e1d
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libAACdec/src/channelinfo.h
View File

@ -359,7 +359,7 @@ typedef struct {
shouldBeUnion { shouldBeUnion {
struct { struct {
FIXP_DBL fac_data0[LFAC]; FIXP_DBL fac_data0[LFAC];
UCHAR fac_data_e[4]; SCHAR fac_data_e[4];
FIXP_DBL FIXP_DBL
*fac_data[4]; /* Pointers to unused parts of pSpectralCoefficient */ *fac_data[4]; /* Pointers to unused parts of pSpectralCoefficient */

2
libAACdec/src/usacdec_fac.cpp
View File

@ -142,7 +142,7 @@ FIXP_DBL *CLpd_FAC_GetMemory(CAacDecoderChannelInfo *pAacDecoderChannelInfo,
return ptr; return ptr;
} }
int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, UCHAR *pFacScale, int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, SCHAR *pFacScale,
int length, int use_gain, int frame) { int length, int use_gain, int frame) {
FIXP_DBL fac_gain; FIXP_DBL fac_gain;
int fac_gain_e = 0; int fac_gain_e = 0;

2
libAACdec/src/usacdec_fac.h
View File

@ -131,7 +131,7 @@ FIXP_DBL *CLpd_FAC_GetMemory(CAacDecoderChannelInfo *pAacDecoderChannelInfo,
* Always 0 for FD case. * Always 0 for FD case.
* \return 0 on success, -1 on error. * \return 0 on success, -1 on error.
*/ */
int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, UCHAR *pFacScale, int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, SCHAR *pFacScale,
int length, int use_gain, int frame); int length, int use_gain, int frame);
/** /**

1
libAACdec/src/usacdec_lpd.cpp
View File

@ -418,6 +418,7 @@ void CLpd_AdaptLowFreqDeemph(FIXP_DBL x[], int lg, FIXP_DBL alfd_gains[],
FIXP_DBL tmp_pow2[32]; FIXP_DBL tmp_pow2[32];
s = s * 2 + ALFDPOW2_SCALE; s = s * 2 + ALFDPOW2_SCALE;
s = fMin(31, s);
k = 8; k = 8;
i_max = lg / 4; /* ALFD range = 1600Hz (lg = 6400Hz) */ i_max = lg / 4; /* ALFD range = 1600Hz (lg = 6400Hz) */