Commit 2b04dcec authored by norvell's avatar norvell
Browse files

Merge branch '1010-usan-division-by-zero-in-dft-stereo-dtx-with-frameloss' into 'main' 

[Non-BE] Resolve "USAN: division by zero in DFt-Stereo DTX with frameloss"

See merge request !1431
parents efafe4c6 65257257

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_stereo_dft_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -2947,7 +2947,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->ipd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->gipd[k + k_offset] != hStereoDft->ipd_xfade_target )

#endif

            {

                if ( ( hStereoDft->gipd[k + k_offset] - hStereoDft->ipd_xfade_prev ) > EVS_PI )

                {
@@ -2993,7 +2997,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->itd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->itd[k + k_offset] != hStereoDft->itd_xfade_target )

#endif

            {

                hStereoDft->itd_xfade_target = hStereoDft->itd[k + k_offset];

                hStereoDft->itd_xfade_step = ( hStereoDft->itd_xfade_target - hStereoDft->itd_xfade_prev ) / ( STEREO_DFT_ITD_CNG_XFADE - hStereoDft->itd_xfade_counter );