Commit c66787dd authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD

parent 654c7edb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD       /* BASOP issue 2561: fix diffs in stereo_dft_enc_compute_itd() between float and BASOP */

#define FIX_BASOP_2517_CLICK_IN_OMASA_LTV               /* FhG: BASOP #2517: preserve precision by removing one-bit headroom from Q_min and allowing saturation during buffer scaling */

#define NONBE_FIX_ISSUE_2518                            /* FhG: Fix issue 2518, noise during ACELP switching from 16KHz to 12k8Hz by improving Q_new calculation. */

#define NONBE_FIX_ISSUE_2518_TRANSENC_SAT_FIX           /* FhG: Fix issue 2518, fix wrong amplitude because of saturation of x_tran in transf_cdbk_enc_fx() for transient signals. */

lib_enc/ivas_stereo_dft_enc_itd_fx.c

+0 −9
Original line number Diff line number Diff line
@@ -1492,13 +1492,8 @@ void stereo_dft_enc_compute_itd_fx( 
        L_temp2_e = sub( 31, q_temp );

        L_temp = Mpy_32_32( L_temp, L_temp2 );

        L_temp_e = add( L_temp_e, L_temp2_e );

#ifdef FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD

        sfm_R = BASOP_Util_Divide3232_Scale_newton( L_temp, sum_abs_R, &sfm_R_e );

        sfm_R_e = add( sfm_R_e, sub( L_temp_e, sum_abs_R_e ) );

#else

        sfm_R = BASOP_Util_Divide3232_Scale_newton( L_temp, sum_abs_R, &sfm_L_e );

        sfm_R_e = add( sfm_L_e, sub( L_temp_e, sum_abs_R_e ) );

#endif

        // sfm_R = L_shl_r( sfm_R, sfm_R_e ); // Q31

        sfm_R = L_shl_sat( sfm_R, sfm_R_e ); // Q31

    }
@@ -1691,11 +1686,7 @@ void stereo_dft_enc_compute_itd_fx( 


                hStereoDft->currentNumUpdates = add( hStereoDft->currentNumUpdates, 1 );

                move16();

#ifdef FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD

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

#else

                FOR( i = 1; i < NFFT / 4; i++ )

#endif

                {

                    /* Low pass filter cross L/R power spectrum */

                    // hStereoDft->xspec_smooth[2 * i] = ( 1.f - cng_xcorr_filt ) * hStereoDft->xspec_smooth[2 * i] + cng_xcorr_filt * xcorr[2 * i];