wrapper/libxaac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix for integer overflow in ixheaacd_cplx_synt_qmffilt" am: bf603c488f am: d836d24c78

Browse source 
Original change: 1425113

Change-Id: Iad4373e2ca1e5c12563012bd5f346f5c6d8dd768
This commit is contained in:
Treehugger Robot 2020-09-30 02:38:36 +00:00 • committed by Automerger Merge Worker
commit 6772b2f2fc
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
decoder/ixheaacd_basic_ops40.h
View file

@ -156,8 +156,8 @@ static PLATFORM_INLINE WORD32 ixheaacd_mac32x16in32_shl(WORD32 a, WORD32 b,
return (result);
}
static PLATFORM_INLINE WORD32 mac32x16in32_shl_sat(WORD32 a, WORD32 b,
WORD16 c) {
static PLATFORM_INLINE WORD32 ixheaacd_mac32x16in32_shl_sat(WORD32 a, WORD32 b,
WORD16 c) {
return (ixheaacd_add32_sat(a, ixheaacd_mult32x16in32_shl_sat(b, c)));
}

6
decoder/ixheaacd_qmf_dec.c
View file

@ -666,10 +666,10 @@ void ixheaacd_sbr_pre_twiddle(WORD32 *p_xre, WORD32 *p_xim,
WORD32 re, im;
re = ixheaacd_mac32x16in32_shl(
re = ixheaacd_mac32x16in32_shl_sat(
ixheaacd_mult32x16in32_shl(x_re, ixheaacd_cosine), x_im, ixheaacd_sine);
im = ixheaacd_sub32(ixheaacd_mult32x16in32_shl(x_im, ixheaacd_cosine),
ixheaacd_mult32x16in32_shl(x_re, ixheaacd_sine));
im = ixheaacd_sub32_sat(ixheaacd_mult32x16in32_shl(x_im, ixheaacd_cosine),
ixheaacd_mult32x16in32_shl(x_re, ixheaacd_sine));
*p_xre++ = re;
*p_xim++ = im;