Commit 676884a3 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fix bug and insert check for asserts

parent f9a5c270

lib_com/fd_cng_com_fx.c

+6 −4
Original line number Diff line number Diff line
@@ -1970,7 +1970,7 @@ void minimum_statistics_fx( 
                /* Compute optimal smoothing parameter for PSD estimation */

                test();

#ifdef FIX_2485_HARMONIZE_minimum_statistics

                IF( ( scalar == 0 ) || ( element_mode == 0 ? msNoiseFloor_buffer16[j] : msNoiseFloor_buffer32[j] == 0 ) )

                IF( ( scalar == 0 ) || ( ( element_mode == 0 ? msNoiseFloor_buffer16[j] : msNoiseFloor_buffer32[j] ) == 0 ) )

#else

                IF( ( scalar == 0 ) || ( msNoiseFloor_buffer[j] == 0 ) )

#endif
@@ -2164,12 +2164,12 @@ void minimum_statistics_fx( 
                move32();



                tmp0 = Mpy_32_16_1( scalar2, QeqInv );

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

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

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

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

#else

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

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

            }
@@ -2327,6 +2327,7 @@ void minimum_statistics_fx( 
                set16_fx( msLocalMinFlag, 0, len );

                set32_fx( msCurrentMin, 2147483647l /*1.0 Q31*/, len );



                /* Get the current noise floor */

#ifdef FIX_2485_HARMONIZE_minimum_statistics

                IF( element_mode == 0 )

                {
@@ -2494,6 +2495,7 @@ void minimum_statistics_fx( 


#endif /*FIX_2485_HARMONIZE_minimum_statistics*/





/*-------------------------------------------------------------------

 * apply_scale()

 *

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#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_CHECK1    /*Check wheter EVS mode can be entered being in IVAS mode*/

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

lib_dec/fd_cng_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,9 @@ void perform_noise_estimation_dec_ivas_fx( 
        compress_range( hFdCngDec->msPeriodog, hFdCngDec->msPeriodog_exp, hFdCngDec->msLogPeriodog, npart );



        /* Call the minimum statistics routine for noise estimation */

#ifdef FIX_2485_HARMONIZE_minimum_statistics_CHECK1

        assert( element_mode  != 0);

#endif

        minimum_statistics_fx(

            npart,

            nFFTpart,

lib_enc/fd_cng_enc_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -2666,6 +2666,9 @@ void perform_noise_estimation_enc_fx( 


    /* Call the minimum statistics routine for noise estimation */

#ifdef FIX_2485_HARMONIZE_minimum_statistics

#ifdef FIX_2485_HARMONIZE_minimum_statistics_CHECK1

    assert( element_mode == hCPE->element_mode );

#endif

    minimum_statistics_fx(

        hFdCngEnc->hFdCngCom->npart,

        nFFTpart,