Commit 2a76b568 authored by Manuel Jander's avatar Manuel Jander
Browse files

Correct exponent calculation acccording to comment from @tyagiri. second attempt.

parent 9449b0d6

lib_dec/tonalMDCTconcealment_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3106,6 +3106,7 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx( 
                cnp = L_shl( concealment_noise[i], cnp_e );

                cnp = Mpy_32_32( cnp, cnp );

<<<<<<< HEAD

<<<<<<< HEAD

<<<<<<< HEAD

                cnp_e = shl( sub( *concealment_noise_exp, cnp_e ), 1 );

=======
@@ -3114,6 +3115,9 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx( 
=======

                cnp_e = shl( sub( cnp_e, *concealment_noise_exp ), 1 );

>>>>>>> ea79e5a6b (Correct exponent calculation acccording to comment from @tyagiri.)

=======

                cnp_e = shl( sub( *concealment_noise_exp, cnp_e ), 1 );

>>>>>>> 415ac0bec (Correct exponent calculation acccording to comment from @tyagiri. second attempt.)



                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
@@ -3146,6 +3150,7 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx( 
                cnp = L_shl( concealment_noise[i], cnp_e );

                cnp = Mpy_32_32( cnp, cnp );

<<<<<<< HEAD

<<<<<<< HEAD

<<<<<<< HEAD

                cnp_e = shl( sub( *concealment_noise_exp, cnp_e ), 1 );

=======
@@ -3154,6 +3159,9 @@ void TonalMdctConceal_create_concealment_noise_ivas_fx( 
=======

                cnp_e = shl( sub( cnp_e, *concealment_noise_exp ), 1 );

>>>>>>> ea79e5a6b (Correct exponent calculation acccording to comment from @tyagiri.)

=======

                cnp_e = shl( sub( *concealment_noise_exp, cnp_e ), 1 );

>>>>>>> 415ac0bec (Correct exponent calculation acccording to comment from @tyagiri. second attempt.)



                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