Commit 519ec4aa authored by Manuel Jander's avatar Manuel Jander
Browse files

Remove merge conflict

parent 2c6f9d22

lib_com/disclaimer.c

+0 −11
Original line number Diff line number Diff line
@@ -44,20 +44,9 @@ Word16 print_disclaimer( FILE *fPtr ) 
{



    fprintf( fPtr, "\n==================================================================================================\n" );

<<<<<<< HEAD

<<<<<<< HEAD

    fprintf( fPtr, "\n" );

    fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" );

    fprintf( fPtr, "\n" );

=======

    fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" );

    fprintf( fPtr, " \n" );

>>>>>>> 8dafeeec2 (update version number printout)

=======

    fprintf( fPtr, "\n" );

    fprintf( fPtr, " 3GPP TS26.251 IVAS Codec Version IVAS-FX-3.0 (fixed-point C-Code)\n" );

    fprintf( fPtr, "\n" );

>>>>>>> cda7a50ab (harmonize whitespace with FL)

    fprintf( fPtr, " Based on EVS Codec (Alternative Fixed Point) 3GPP TS26.452 Nov 04, 2021,\n" );

    fprintf( fPtr, " Version 16.4.0\n" );

    fprintf( fPtr, "\n" );

lib_dec/tonalMDCTconcealment_fx.c

+0 −24
Original line number Diff line number Diff line
@@ -3105,19 +3105,7 @@ 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

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

=======

                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
@@ -3149,19 +3137,7 @@ 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

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

=======

                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