Commit b8b177cf authored by malenov's avatar malenov
Browse files

cleanup NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING

parent 22561ebb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 


/* ################### Start FIXES switches ########################### */



#define NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING    /* FhG: fixes for decoder-side noise level estimation in MDCT-Stereo to prevent noise bursts in stereo switching */



#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH           /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */

lib_dec/ivas_stereo_mdct_core_dec.c

+1 −20
Original line number Diff line number Diff line
@@ -620,47 +620,28 @@ static void run_min_stats( 
               computed only once (for ch == 0) and not again in the second run sive the outcome will be the same anyway */

            if ( ( will_estimate_noise_on_channel[0] == will_estimate_noise_on_channel[1] ) || ch == 0 )

            {

#ifdef NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING

                float power_spec_scale_fac;



                /* calculate power spectrum from MDCT coefficients and estimated MDST coeffs */

                power_spec_scale_fac = 1.f / (float) ( L_FRAME16k * L_FRAME16k );

                power_spec[0] = spec_in[0] * spec_in[0] * power_spec_scale_fac;

                power_spec[L_FRAME16k - 1] = spec_in[L_FRAME16k - 1] * spec_in[L_FRAME16k - 1] * power_spec_scale_fac;

#else

                /* calculate power spectrum from MDCT coefficients and estimated MDST coeffs */

                power_spec[0] = spec_in[0] * spec_in[0];

                power_spec[L_FRAME16k - 1] = spec_in[L_FRAME16k - 1] * spec_in[L_FRAME16k - 1];

#endif



                for ( int16_t i = 1; i < L_FRAME16k - 1; i++ )

                {

                    float mdst;

                    mdst = spec_in[i + 1] - spec_in[i - 1];

#ifdef NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING

                    power_spec[i] = power_spec_scale_fac * ( spec_in[i] * spec_in[i] + mdst * mdst );

#else

                    power_spec[i] = spec_in[i] * spec_in[i] + mdst * mdst;

#endif

                }

            }

#ifndef NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING



            noisy_speech_detection( st->hFdCngDec, st->VAD && st->m_frame_type == ACTIVE_FRAME, power_spec );



            st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = 0.99f * st->hFdCngDec->hFdCngCom->likelihood_noisy_speech + 0.01f * (float) st->hFdCngDec->hFdCngCom->flag_noisy_speech;



            st->lp_noise = st->hFdCngDec->lp_noise;

#endif

        }



#ifdef NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING

        if ( st->core == TCX_20_CORE )

        {

            noisy_speech_detection( st->hFdCngDec, save_VAD[ch] && st->m_frame_type == ACTIVE_FRAME, x[ch][0] );

            st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = 0.99f * st->hFdCngDec->hFdCngCom->likelihood_noisy_speech + 0.01f * (float) st->hFdCngDec->hFdCngCom->flag_noisy_speech;

            st->lp_noise = st->hFdCngDec->lp_noise;

        }

#endif



        if ( will_estimate_noise_on_channel[0] || will_estimate_noise_on_channel[1] || st->bfi )

        {