Commit ce2a6985 authored by Manuel Jander's avatar Manuel Jander
Browse files

Use same change also for mixed TCX10/TCX20 frames to avoid zero hTonalMDCTConc->curr_noise_nrg.

parent 30569464
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -3141,7 +3141,11 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx(
                cnp_e = norm_l( concealment_noise[i] );
                cnp = L_shl( concealment_noise[i], cnp_e );
                cnp = Mpy_32_32( cnp, cnp );
<<<<<<< HEAD
                cnp_e = shl( sub( *concealment_noise_exp, cnp_e ), 1 );
=======
                cnp_e = shl( add( cnp_e, *concealment_noise_exp ), 1 );
>>>>>>> 7df2a6925 (Use same change also for mixed TCX10/TCX20 frames to avoid zero hTonalMDCTConc->curr_noise_nrg.)

                hTonalMDCTConc->curr_noise_nrg = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->curr_noise_nrg, hTonalMDCTConc->curr_noise_nrg_exp, cnp, cnp_e, &temp_e ); // Q31-temp_e
#else