Commit a9afe5d4 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG

parent 41d6eabb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */



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

lib_enc/ivas_stereo_dft_enc_itd.c

+0 −9
Original line number Diff line number Diff line
@@ -641,9 +641,7 @@ void stereo_dft_enc_compute_itd( 
    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;
@@ -729,9 +727,6 @@ void stereo_dft_enc_compute_itd( 
        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;
@@ -788,7 +783,6 @@ 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 );
@@ -798,9 +792,6 @@ void stereo_dft_enc_compute_itd( 
            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;