Commit c8181436 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept BE_FIX_567_DOUBLE_STEREO_DMX

parent a50ad2a3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif



#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */  

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

lib_enc/ivas_stereo_dmx_evs.c

+0 −8
Original line number Diff line number Diff line
@@ -58,11 +58,7 @@ 
#define STEREO_DMX_EVS_POC_FORGETTING        0.78f

#define STEREO_DMX_EVS_TARGET_POC_FORGETTING 0.79f

#define STEREO_DMX_EVS_POC_W_FORGETTING      0.875f

#ifdef BE_FIX_567_DOUBLE_STEREO_DMX

#define STEREO_DMX_EVS_SHIFT_LIMIT STEREO_DFT_ZP_NS_ENC

#else

#define STEREO_DMX_EVS_SHIFT_LIMIT 5.625f /* ms */

#endif



#define STEREO_DMX_EVS_DMX_EGY_FORGETTING 0.25f

#define STEREO_DMX_EVS_CORR_FORGETTING    0.78f
@@ -2299,11 +2295,7 @@ ivas_error stereo_dmx_evs_init_encoder( 
        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for STEREO_DMX_EVS_POC_DATA\n" ) );

    }



#ifdef BE_FIX_567_DOUBLE_STEREO_DMX

    hStereoDmxEVS->hPOC->shift_limit = NS2SA( input_Fs, STEREO_DMX_EVS_SHIFT_LIMIT );

#else

    hStereoDmxEVS->hPOC->shift_limit = (int16_t) ( STEREO_DMX_EVS_SHIFT_LIMIT * input_Fs / 1000 );

#endif



    for ( n = 0; n < CPE_CHANNELS; n++ )

    {