Commit 2fab46b1 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_EVS_PHA

parent 73a2bb54

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -114,10 +114,7 @@ 
#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */



#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_978_MC_TDREND_REVERB                  /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

lib_enc/ivas_stat_enc.h

+0 −7
Original line number Diff line number Diff line
@@ -1178,9 +1178,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

    Word16 init_frmCntr;

#endif



    Word32 isd_rate_s_fx;                            // Q31

    Word32 iccr_s_fx;                                // Q31
@@ -1204,7 +1201,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    STEREO_DMX_EVS_PHA prev_pha;

    Word16 pha_hys_cnt;



#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    STEREO_DMX_EVS_PHA proc_pha;

    Word16 force_poc;
@@ -1214,7 +1210,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    Word16 pha_ipd_chan_thresh;

    Word16 pha_ipd_chanswitch;

    Word16 pha_ipd_chanswitch_allowed;

#endif



    Word16 prc_thres;

    STEREO_DMX_EVS_PRC curr_prc;
@@ -1228,7 +1223,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    Word16 trns_aux_energy_fx_e[CPE_CHANNELS];

    Word32 crst_fctr_fx; // Q0



#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

    Word16 n_fad_g;

    Word16 n_fad_cnt;
@@ -1247,7 +1241,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 


    Word32 low_egy_thres_sgc;

    Word16 low_egy_thres_sgc_e;

#endif



} STEREO_DMX_EVS_PHA_DATA, *STEREO_DMX_EVS_PHA_HANDLE;

lib_enc/ivas_stereo_dmx_evs_fx.c

+0 −677

File changed.

Preview size limit exceeded, changes collapsed.