Merge "Fix integer overflows in ixheaacd_harm_idx_zerotwo and ixheaacd_harm_idx_onethree"

This commit is contained in:
TreeHugger Robot 2019-03-08 19:31:46 +00:00 • committed by Android (Google) Code Review
commit 4e1da7999e
4 changed files with 18 additions and 18 deletions

View file

@ -374,13 +374,13 @@ static PLATFORM_INLINE WORD32 div32(WORD32 a, WORD32 b, WORD *q_format) {
return quotient;
}
static PLATFORM_INLINE WORD32 ixheaacd_mac16x16in32(WORD32 a, WORD16 b,
WORD16 c) {
static PLATFORM_INLINE WORD32 ixheaacd_mac16x16in32_sat(WORD32 a, WORD16 b,
WORD16 c) {
WORD32 acc;
acc = ixheaacd_mult16x16in32(b, c);
acc = ixheaacd_add32(a, acc);
acc = ixheaacd_add32_sat(a, acc);
return acc;
}
@ -469,4 +469,4 @@ static PLATFORM_INLINE WORD32 sub32_shr(WORD32 a, WORD32 b) {
return diff;
}
#endif
#endif