Commit 90332f65 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_EVS_PHA

parent ce864926

lib_com/options.h

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

#endif



#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif 





#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

lib_enc/ivas_stat_enc.h

+0 −10
Original line number Diff line number Diff line
@@ -1078,9 +1078,6 @@ typedef struct stereo_dmx_evs_phase_only_correlation_structure 


typedef struct stereo_dmx_evs_correlation_filter_structure

{

#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    int16_t init_frmCntr;

#endif

    float isd_rate_s;

    float iccr_s;

    float ipd_ff[STEREO_DMX_EVS_NB_SUBBAND_MAX];
@@ -1101,7 +1098,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    STEREO_DMX_EVS_PHA curr_pha;

    STEREO_DMX_EVS_PHA prev_pha;

    int16_t pha_hys_cnt;

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    STEREO_DMX_EVS_PHA proc_pha;

    bool force_poc;
@@ -1113,21 +1109,16 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    int16_t pha_ipd_chanswitch;

    int16_t pha_ipd_chanswitch_allowed;

    float pha_ipd_sf_Threshold;

#endif



    int16_t prc_thres;

    STEREO_DMX_EVS_PRC curr_prc;

    STEREO_DMX_EVS_PRC prev_prc;

    int16_t prc_hys_cnt;

    float fad_g_prc[L_FRAME48k];

#ifndef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    int16_t fad_len_prc;

#endif



    float trns_aux_energy[CPE_CHANNELS];

    float crst_fctr;



#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    int16_t n_fad_g;

    int16_t n_fad_cnt;

    float dmx_pha_ener;
@@ -1137,7 +1128,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    float dmx_pha_gain_sgc;

    float dmx_poc_gain_sgc;

    float low_egy_thres_sgc;

#endif



} STEREO_DMX_EVS_PHA_DATA, *STEREO_DMX_EVS_PHA_HANDLE;

lib_enc/ivas_stereo_dmx_evs.c

+0 −451

File changed.

Preview size limit exceeded, changes collapsed.