Commit 1a387b9f authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_963_USAN_ERROR

parent 5c797638

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

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

#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

lib_enc/ivas_stereo_dft_enc_itd.c

+0 −8
Original line number Diff line number Diff line
@@ -908,7 +908,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 );
@@ -917,9 +916,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++ )

                {
@@ -954,7 +950,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 );
@@ -963,9 +958,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;

            }