Commit 30e0e6d0 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

macro FIX_2485_HARMONIZE_minimum_statistics_EVSmode : use old evs code in some minor places

parent aaf7a501

lib_com/fd_cng_com_fx.c

+13 −16
Original line number Diff line number Diff line
@@ -1907,13 +1907,13 @@ void minimum_statistics_fx( 
                scalar16 = shl( scalar16, s3 );

                scalar16 = s_max( scalar16, MSALPHACORMAX );



#ifdef FIX_2485_HARMONIZE_minimum_statistics

                /*EVS:

#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode )

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

                                                    L_mult( scalar16, msAlphaCorAlpha2 ) );

                                                                    */

#endif

#else

                hFdCngCom->msAlphaCor[cnt] = Madd_32_16( L_mult( scalar16, msAlphaCorAlpha2 ), hFdCngCom->msAlphaCor[cnt], msAlphaCorAlpha );

#endif

                

                move32();

            }
@@ -2059,13 +2059,12 @@ void minimum_statistics_fx( 
                }



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

#ifdef FIX_2485_HARMONIZE_minimum_statistics

                /*EVS:

#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode )

                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] ) ) );

                */

#endif

#else

                msPsd[j] = round_fx( Madd_32_16( Mpy_32_16_1( msAlpha[j], msPsd[j] ), L_sub( 2147483647l /*1.0 Q31*/, msAlpha[j] ), msPeriodog[j] ) );

#endif



                move16();

            }
@@ -2155,24 +2154,22 @@ void minimum_statistics_fx( 


                /* Compute bias correction Bmin */

                tmp0 = Mpy_32_16_1( scalar, QeqInv );

#ifdef FIX_2485_HARMONIZE_minimum_statistics

/*EVS:

#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode )

                tmp1 = L_sub( 1073741824l, L_mult( msM_win, QeqInv ) );

                */

#endif

#else

                tmp1 = L_msu( 1073741824l /*0.5 Q31*/, msM_win, QeqInv );

#endif

                tmp16 = BASOP_Util_Divide3232_uu_1616_Scale( tmp0, tmp1, &s );

                msBminWin[j] = L_add( 134217728l /*1.0 Q27*/, L_shl( L_deposit_h( tmp16 ), add( s, 7 - 4 ) ) );

                move32();



                tmp0 = Mpy_32_16_1( scalar2, QeqInv );

                tmp1 = L_msu( 1073741824l /*0.5 Q31*/, msM_subwin, QeqInv );

#ifdef FIX_2485_HARMONIZE_minimum_statistics

/*EVS:

#if defined( FIX_2485_HARMONIZE_minimum_statistics ) && defined( FIX_2485_HARMONIZE_minimum_statistics_EVSmode )

                tmp1 = L_sub( 1073741824l, L_mult( msM_subwin, QeqInv ) );

                */

#endif

#else

                tmp16 = BASOP_Util_Divide3232_uu_1616_Scale( tmp0, tmp1, &s );

#endif

                msBminSubWin[j] = L_add( 134217728l /*1.0 Q27*/, L_shl( L_deposit_h( tmp16 ), s ) );

                move32();

            }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define FIX_2455_HARMONIZE_configureFdCngEnc          /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#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*/

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc   /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */