Commit 26ad912c authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '1063-usan-division-by-zero-in-ivas_stereo_dft_enc_itd-c-for-omasa-encoding' into 'main'

Resolve "USAN: division by zero in ivas_stereo_dft_enc_itd.c for OMASA encoding"

See merge request !1504
parents 288a390e 66b9e050

lib_com/options.h

+5 −3
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
#define FIX_1043_JBM_MD_BUFFER                          /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */

#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */
@@ -170,9 +171,10 @@ 
#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	



#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */





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

lib_enc/ivas_stereo_dft_enc_itd.c

+18 −2
Original line number Diff line number Diff line
@@ -640,9 +640,10 @@ void stereo_dft_enc_compute_itd( 
    STEREO_CLASSIF_HANDLE hStereoClassif;

    const float *dft_trigo32k;

    float trigo_enc[STEREO_DFT_N_32k_ENC / 2 + 1];



    float cng_xcorr_filt;



#ifdef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG

    float sum_nrg_delta;

#endif

    int16_t prev_itd_max;

    int16_t itd_max_flip;
@@ -727,7 +728,10 @@ void stereo_dft_enc_compute_itd( 
        grand_dot_prod_real += xcorr[2 * i];

        grand_dot_prod_img += xcorr[2 * i + 1];

        xcorr_abs[i] = sqrtf( xcorr[2 * i] * xcorr[2 * i] + xcorr[2 * i + 1] * xcorr[2 * i + 1] );



#ifndef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG

        /* VM: prod_LL tends to overflow, better to replace with sum(log(prod_L)) and retrain the classifier */

#endif

        prod_LL = prod_L;

        prod_RR = prod_R;
@@ -784,7 +788,19 @@ void stereo_dft_enc_compute_itd( 
        hStereoClassif->unclr_fv[E_gainIPD] = g_IPD;

        hStereoClassif->xtalk_fv[E_gainIPD] = g_IPD;



#ifdef NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG

        if ( sum_nrg_L >= sum_nrg_R )

        {

            sum_nrg_delta = max( sum_nrg_L - sum_nrg_R, 1.0f );

        }

        else

        {

            sum_nrg_delta = min( sum_nrg_L - sum_nrg_R, -1.0f );

        }

        angle_rot = fabsf( atanf( 2.0f * ( grand_dot_prod_real ) / sum_nrg_delta ) );

#else

        angle_rot = fabsf( atanf( 2.0f * ( grand_dot_prod_real ) / ( sum_nrg_L - sum_nrg_R + 1.0f ) ) );

#endif

        hStereoClassif->unclr_fv[E_angle_rot] = angle_rot;

        hStereoClassif->xtalk_fv[E_angle_rot] = angle_rot;