Commit a983b3e9 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

cleanup - delete EVS-basop BE-switch and code

parent 96c5f4f3

lib_com/fd_cng_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ void minimum_statistics_fx( 
                scalar16 = shl( scalar16, s3 );

                scalar16 = s_max( scalar16, MSALPHACORMAX );



#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode_ )

#ifdef FIX_2485_HARMONIZE_minimum_statistics

                hFdCngCom->msAlphaCor[cnt] = L_add( Mpy_32_16_1( hFdCngCom->msAlphaCor[cnt], msAlphaCorAlpha ),

                                                    L_mult( scalar16, msAlphaCorAlpha2 ) );

#else
@@ -2061,7 +2061,7 @@ void minimum_statistics_fx( 
                }



                /* Compute the PSD (smoothed periodogram) in each band */

#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode_ )

#ifdef FIX_2485_HARMONIZE_minimum_statistics

                msPsd[j] = round_fx( L_add( Mpy_32_16_1( msAlpha[j], msPsd[j] ),

                                            Mpy_32_16_1( L_sub( 2147483647l, msAlpha[j] ), msPeriodog[j] ) ) );

#else

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define HARMONIZE_2481_EXTEND_SHRINK                    /* FhG: basop issue 2481: Harmonize extend_frm_*fx() and shrink_frm_*fx() */

#define FIX_2485_HARMONIZE_perform_noise_estimation_enc /* FhG: harmonize perform_noise_estimation_enc and perform_noise_estimation_enc_ivas */

#define FIX_2485_HARMONIZE_minimum_statistics           /* FhG: harmonize minimum_statistics and minimum_statistics_fx */

#define FIX_2485_HARMONIZE_minimum_statistics_EVSmode   /* FhG: harmonize... and use EVS-code for certain calculations, instead of IVAS code,  ensures EVS-BEness */





/* #################### End BE switches ################################## */