Commit e97487ca authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

add #ifndef FIX_1696_UNNECESSARY_IF_CONDITION

parent 54720708

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */

#define VEC_ARITH_OPT_v1

#define FIX_1486_IND_SHB_RES                   /* VA: Fix for issue 1486: align the usage of IND_SHB_RES_GS indices with float code */

#define FIX_1696_UNNECESSARY_IF_CONDITION      /*FhG: remove unnecessary code*/



#define TEST_HR

#endif

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+3 −21
Original line number Diff line number Diff line
@@ -2285,27 +2285,6 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
    {

        FOR( l = 0; l < num_freq_bands; l++ )

        {

#ifdef FIX_867

            Word16 exp_tmp_1; // exp for p_power_smooth_prev



            g2 = L_sub( ONE_IN_Q31, alpha[l] ); // Q31



            L_tmp = Madd_32_32( Mpy_32_32( g2, *p_power_smooth_prev ), alpha[l], *p_power_smooth ); //(Q31, q_proto_power_smooth) -> q_proto_power_smooth



            L_tmp = BASOP_Util_Add_Mant32Exp( L_tmp,

                                              sub( 31, h_dirac_output_synthesis_state->proto_power_smooth_q ),

                                              EPSILON_FX_M, EPSILON_FX_E, &exp_tmp_1 );



            *( p_power_smooth_prev++ ) = L_tmp;

            move32();



            L_tmp = BASOP_Util_Divide3232_Scale_cadence( ONE_IN_Q31, L_tmp, &exp ); /*Q=31-(exp-exp_tmp_1)*/

            exp_arr[k * num_freq_bands + l] = sub( exp, exp_tmp_1 );

            move16();



            *( p_power_smooth++ ) = L_tmp; /*Q=31-(exp-exp_tmp_1))*/

            move32();

#else

            g1 = alpha[l]; // Q31

            move32();

            g2 = L_sub( ONE_IN_Q31, g1 );                                                          // Q31
@@ -2320,6 +2299,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
#else

            assert( h_dirac_output_synthesis_state->proto_power_smooth_prev_q == h_dirac_output_synthesis_state->proto_power_smooth_q );

#endif

#ifndef FIX_1696_UNNECESSARY_IF_CONDITION

            IF( EQ_32( *( p_power_smooth_prev ), EPSILON_FX ) )

            {

                p_power_smooth_prev++;
@@ -2332,12 +2312,14 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
            }

            ELSE

            {

#endif

                L_tmp = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q31, *( p_power_smooth_prev++ ), &exp ); /*Q=31-(exp-(31-q_proto_power_smooth))*/

                exp_arr[k * num_freq_bands + l] = exp;

                move16();



                *( p_power_smooth++ ) = L_tmp; /*Q=31-(exp-(31-q_proto_power_smooth))*/

                move32();

#ifndef FIX_1696_UNNECESSARY_IF_CONDITION

            }

#endif

        }