Commit 0022fc7d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_963_USAN_ERROR

parent c07cdffe

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ 
#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0)  */

lib_enc/ivas_stereo_dft_enc_itd.c

+0 −8
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ void stereo_dft_enc_compute_itd( 
                {

                    hStereoDft->expectedNumUpdates += 1 + min( hCPE->hFrontVad[0]->rem_dtx_ho, hCPE->hFrontVad[1]->rem_dtx_ho );

                }

#ifdef FIX_963_USAN_ERROR

                if ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates == 0 )

                {

                    cng_xcorr_filt = max( CORR_FILT, sfm_L );
@@ -919,9 +918,6 @@ void stereo_dft_enc_compute_itd( 
                {

                    cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );

                }

#else

                cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );

#endif

                hStereoDft->currentNumUpdates++;

                for ( i = 1; i < NFFT / 2; i++ )

                {
@@ -956,7 +952,6 @@ void stereo_dft_enc_compute_itd( 
            if ( vad_flag_dtx[0] == 0 )

            {

                /* expectedNumUpdates updated after call to dtx() in SID frames */

#ifdef FIX_963_USAN_ERROR

                if ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates == 0 )

                {

                    cng_xcorr_filt = max( CORR_FILT, sfm_L );
@@ -965,9 +960,6 @@ void stereo_dft_enc_compute_itd( 
                {

                    cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );

                }

#else

                cng_xcorr_filt = max( min( CORR_FILT, 10.0f * CORR_FILT / ( hStereoDft->expectedNumUpdates + hStereoDft->currentNumUpdates ) ), sfm_L );

#endif

                hStereoDft->currentNumUpdates++;

                hStereoDft->sfm = cng_xcorr_filt;

            }