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

remove unnecessary condition

parent e43f1385

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
#define FIX_ISSUE_1167                          /* Ittiam: Fix for Issue 1167: Encoder crash for OSBA ISM3SBA1 at 13.2 and 16.4 kbps in gauss_L2_ivas_fx() */

#define FIX_1009_REPLACE_DIV_SQRT_BY_ISQRT_LC   /* FhG: Reduce workload of binaural rendering: replace 1./tmp & sqrt by Isqrt32 */

#define FIX_1113_OPT_DIRAC_BIN_REND             /* FhG: Various optimizations to ivas_dirac_dec_binaual_functions.c */

<<<<<<< HEAD

#define FIX_ISSUE_1187                          /* Ittiam: Fix for issue 1187: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from bass_pf_enc_fx function*/

#define FIX_ISSUE_1186                          /* Ittiam: Fix for Issue 1186: Energy/scaling issue for ISM-1 at all bitrates */

#define FIX_ISSUE_1165                          /* Ittiam: Fix for issue 1165: Assertion in lpc2lsp_fx for OMASA LTV input */
@@ -148,4 +149,7 @@ 
#define FIX_11_1_IVAS_SPAR_DEC_UPMIXER_SF_RND_COEFFS            /* FhG  ivas_spar_com.c: Zeroes very small negative coeffs via L_shr_r (was L_shr) */

#define FIX_ISSUE_1237                          /* VA: replacement of Copy_Scale_sig_16_32_DEPREC() that are doing 16 bits left shift by Copy_Scale_sig_16_32_no_sat() */

#define FIX_ISSUE_1237_KEEP_EVS_BE              /* VA: Fix to keep EVS bitexactness to 26.444 */



#define FIX_867_2



#endif

lib_rend/ivas_dirac_output_synthesis_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -2133,7 +2133,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
            move32();

            *( p_power_smooth_prev ) = L_add( *( p_power_smooth_prev ), Mpy_32_32( g1, ( *p_power_smooth ) ) ); //(Q31, q_proto_power_smooth) -> q_proto_power_smooth

            move32();



#ifndef FIX_867_2

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

            {

                p_power_smooth_prev++;
@@ -2146,13 +2146,16 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
            }

            ELSE

            {

#endif

                L_tmp = BASOP_Util_Divide3232_Scale_cadence( 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_867_2

            }

#endif

        }

    }