| Index: third_party/opus/src/silk/float/find_pred_coefs_FLP.c
|
| diff --git a/third_party/opus/src/silk/float/find_pred_coefs_FLP.c b/third_party/opus/src/silk/float/find_pred_coefs_FLP.c
|
| index 1af4fe5f1b2d1676ca2682c026d98c2e781ae50c..cb2e763b1db02bb3fd0c166f6a900d57fc23b824 100644
|
| --- a/third_party/opus/src/silk/float/find_pred_coefs_FLP.c
|
| +++ b/third_party/opus/src/silk/float/find_pred_coefs_FLP.c
|
| @@ -41,8 +41,9 @@ void silk_find_pred_coefs_FLP(
|
| )
|
| {
|
| opus_int i;
|
| - silk_float WLTP[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
|
| - silk_float invGains[ MAX_NB_SUBFR ], Wght[ MAX_NB_SUBFR ];
|
| + silk_float XXLTP[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ];
|
| + silk_float xXLTP[ MAX_NB_SUBFR * LTP_ORDER ];
|
| + silk_float invGains[ MAX_NB_SUBFR ];
|
| opus_int16 NLSF_Q15[ MAX_LPC_ORDER ];
|
| const silk_float *x_ptr;
|
| silk_float *x_pre_ptr, LPC_in_pre[ MAX_NB_SUBFR * MAX_LPC_ORDER + MAX_FRAME_LENGTH ];
|
| @@ -52,7 +53,6 @@ void silk_find_pred_coefs_FLP(
|
| for( i = 0; i < psEnc->sCmn.nb_subfr; i++ ) {
|
| silk_assert( psEncCtrl->Gains[ i ] > 0.0f );
|
| invGains[ i ] = 1.0f / psEncCtrl->Gains[ i ];
|
| - Wght[ i ] = invGains[ i ] * invGains[ i ];
|
| }
|
|
|
| if( psEnc->sCmn.indices.signalType == TYPE_VOICED ) {
|
| @@ -62,13 +62,11 @@ void silk_find_pred_coefs_FLP(
|
| silk_assert( psEnc->sCmn.ltp_mem_length - psEnc->sCmn.predictLPCOrder >= psEncCtrl->pitchL[ 0 ] + LTP_ORDER / 2 );
|
|
|
| /* LTP analysis */
|
| - silk_find_LTP_FLP( psEncCtrl->LTPCoef, WLTP, &psEncCtrl->LTPredCodGain, res_pitch,
|
| - psEncCtrl->pitchL, Wght, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.ltp_mem_length );
|
| + silk_find_LTP_FLP( XXLTP, xXLTP, res_pitch, psEncCtrl->pitchL, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr );
|
|
|
| /* Quantize LTP gain parameters */
|
| silk_quant_LTP_gains_FLP( psEncCtrl->LTPCoef, psEnc->sCmn.indices.LTPIndex, &psEnc->sCmn.indices.PERIndex,
|
| - &psEnc->sCmn.sum_log_gain_Q7, WLTP, psEnc->sCmn.mu_LTP_Q9, psEnc->sCmn.LTPQuantLowComplexity, psEnc->sCmn.nb_subfr,
|
| - psEnc->sCmn.arch );
|
| + &psEnc->sCmn.sum_log_gain_Q7, &psEncCtrl->LTPredCodGain, XXLTP, xXLTP, psEnc->sCmn.subfr_length, psEnc->sCmn.nb_subfr, psEnc->sCmn.arch );
|
|
|
| /* Control LTP scaling */
|
| silk_LTP_scale_ctrl_FLP( psEnc, psEncCtrl, condCoding );
|
|
|