Fixes two fixed-point overflow issues
One in SILK, one in CELT, none of them causing real harm in practice it seems
This commit is contained in:
parent
9faea25d29
commit
1a9e8539d3
2 changed files with 5 additions and 4 deletions
|
@ -865,8 +865,9 @@ static int stereo_analysis(const CELTMode *m, const celt_norm *X,
|
|||
R = X[N0+j];
|
||||
M = L+R;
|
||||
S = L-R;
|
||||
sumLR += EXTEND32(ABS16(L)) + EXTEND32(ABS16(R));
|
||||
sumMS += EXTEND32(ABS16(M)) + EXTEND32(ABS16(S));
|
||||
/* We cast to 32-bit first because of the -32768 case */
|
||||
sumLR += ABS32(EXTEND32(L)) + ABS32(EXTEND32(R));
|
||||
sumMS += ABS32(EXTEND32(M)) + ABS32(EXTEND32(S));
|
||||
}
|
||||
}
|
||||
sumMS = MULT16_32_Q15(QCONST16(0.707107f, 15), sumMS);
|
||||
|
|
|
@ -135,9 +135,9 @@ void silk_prefilter_FIX(
|
|||
tmp_32 = silk_SMULWB( tmp_32, -psEncCtrl->GainsPre_Q14[ k ] ); /* Q24 */
|
||||
tmp_32 = silk_RSHIFT_ROUND( tmp_32, 14 ); /* Q10 */
|
||||
B_Q10[ 1 ]= silk_SAT16( tmp_32 );
|
||||
x_filt_Q12[ 0 ] = silk_SMLABB( silk_SMULBB( st_res_Q2[ 0 ], B_Q10[ 0 ] ), P->sHarmHP_Q2, B_Q10[ 1 ] );
|
||||
x_filt_Q12[ 0 ] = silk_MLA( silk_MUL( st_res_Q2[ 0 ], B_Q10[ 0 ] ), P->sHarmHP_Q2, B_Q10[ 1 ] );
|
||||
for( j = 1; j < psEnc->sCmn.subfr_length; j++ ) {
|
||||
x_filt_Q12[ j ] = silk_SMLABB( silk_SMULBB( st_res_Q2[ j ], B_Q10[ 0 ] ), st_res_Q2[ j - 1 ], B_Q10[ 1 ] );
|
||||
x_filt_Q12[ j ] = silk_MLA( silk_MUL( st_res_Q2[ j ], B_Q10[ 0 ] ), st_res_Q2[ j - 1 ], B_Q10[ 1 ] );
|
||||
}
|
||||
P->sHarmHP_Q2 = st_res_Q2[ psEnc->sCmn.subfr_length - 1 ];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue