Commit 83b938a3 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_EVS_PHA

parent 6fbdff39

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -171,10 +171,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */

#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 NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_enc/ivas_stat_enc.h

+0 −10
Original line number Diff line number Diff line
@@ -1074,9 +1074,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];
@@ -1097,7 +1094,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;
@@ -1109,21 +1105,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;
@@ -1133,7 +1124,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 −447

File changed.

Preview size limit exceeded, changes collapsed.