Commit 34b20422 authored by thomas dettbarn's avatar thomas dettbarn
Browse files

Merge branch 'main' into 1323-improve-wmops-of-dot_product_cholesky_fixed

parents d3d63a8b 4321031e

lib_com/ivas_dirac_com.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ void computeDiffuseness_fixed( 


#ifdef FIX_1072_SPEEDUP_COMPUTEDIFUSENESS

        Word16 shift_q = sub( q_tmp, q_ene );

        Word32 shiftEquiv;

        Word32 shiftEquiv = L_add( 0, 0 );

        Word16 shift_qtotal;

        if ( shift_q < 0 )

        {

lib_dec/acelp_core_dec_ivas_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ ivas_error acelp_core_dec_ivas_fx( 
            {

                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,

#ifdef FIX_ISSUE_1291

                             shr( imult1616( st->L_frame, HIBND_ACB_L_FAC_Q1 ), 1 ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

                             L_FRAME32k, 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

#else

                             imult1616( st->L_frame, HIBND_ACB_L_FAC ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

#endif
@@ -803,7 +803,7 @@ ivas_error acelp_core_dec_ivas_fx( 
            Copy( syn1_fx + st->L_frame - L_SYN_MEM_CLAS_ESTIM, st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );



            /* save and delay synthesis to be used by SWB BWE */

            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn

            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn -> Q(-1)

            IF( st->hBWE_FD != NULL )

            {

#ifdef FIX_ISSUE_1290

lib_enc/igf_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -2665,9 +2665,10 @@ void IGFEncApplyMono_ivas_fx( 


        FOR( Word16 i = 0; i < N_MAX + L_MDCT_OVLP_MAX; i++ )

        {

            common_pPowerSpectrum_fx[i] = L_shl( common_pPowerSpectrum_fx[i], sub( pPowerSpectrumParameter_exp[i], common_pPowerSpectrum_exp ) );

            common_pPowerSpectrum_fx[i] = L_shl( pPowerSpectrumParameter_fx[i], sub( pPowerSpectrumParameter_exp[i], common_pPowerSpectrum_exp ) );

            move16();

        }

        pPowerSpectrumParameter_fx = common_pPowerSpectrum_fx;

    }

    IGF_ErodeSpectrum_ivas_fx( st->hIGFEnc, pMDCTSpectrum_fx, pPowerSpectrumParameter_fx, common_pPowerSpectrum_exp, igfGridIdx, 0 );

}