Commit 9449b0d6 authored by Manuel Jander's avatar Manuel Jander
Browse files

Correct exponent calculation acccording to comment from @tyagiri.

parent ce2a6985

lib_dec/tonalMDCTconcealment_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3105,11 +3105,15 @@ 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

<<<<<<< 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).)

=======

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

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



                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
@@ -3141,11 +3145,15 @@ 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

<<<<<<< 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.)

=======

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

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



                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