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

Fix div_l with zero exit(-1) problem. Still need to check if the the problem...

Fix div_l with zero exit(-1) problem. Still need to check if the the problem needs to avoided in a second place (else branch of the if where it happens).
parent ce3be40f
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -3105,7 +3105,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 );
>>>>>>> ba2f8a054 (Fix div_l with zero exit(-1) problem. Still need to check if the the problem needs to avoided in a second place (else branch of the if where it happens).)

                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