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

small cleanups

parent 3014b343

lib_com/fd_cng_com_fx.c

+3 −12
Original line number Diff line number Diff line
@@ -1781,19 +1781,18 @@ void minimum_statistics_fx( 
    IF( LT_16( hFdCngCom->msFrCnt_init_counter, hFdCngCom->msFrCnt_init_thresh ) )

    {

#ifdef FIX_2485_HARMONIZE_minimum_statistics

        Copy( msPeriodog, msPsd, len ); /* 6Q9 */

        Copy( msPeriodog, msPsdFirstMoment, len ); /* 6Q9 */

        IF( isIVAS == 0 )

        {

            Copy( msPeriodog, msPsd, len );                 /* 6Q9 */



            Copy( msPeriodog, msNoiseFloor_buffer16, len ); /* 6Q9 */

            Copy( msPeriodog, msNoiseEst_buffer16, len );   /* 6Q9 */

            Copy( msPeriodog, msPsdFirstMoment, len );      /* 6Q9 */

        }

        ELSE

        {

            Copy( msPeriodog, msPsd, len );                                             /* 6Q9 */

            Copy_Scale_sig_16_32_no_sat( msPeriodog, msNoiseFloor_buffer32, len, Q16 ); /* Q25 */

            Copy_Scale_sig_16_32_no_sat( msPeriodog, msNoiseEst_buffer32, len, Q16 );   /* Q25 */

            Copy( msPeriodog, msPsdFirstMoment, len );                                  /* 6Q9 */

        }

#else

        Copy( msPeriodog, msPsd, len );                                           /* 6Q9 */
@@ -2159,21 +2158,13 @@ void minimum_statistics_fx( 


                /* Compute bias correction Bmin */

                tmp0 = Mpy_32_16_1( scalar, QeqInv );

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

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

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

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

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

#else

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

#endif

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

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

                move32();

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +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_2485_HARMONIZE_minimum_statistics_EVSmode   /* FhG: harmonize... and use EVS-code for certain calculations, instead of IVAS code,  ensures EVS-BEness */