Commit eacec130 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1386-stereo_downmix_evs_quality_improvements_pha' into 'main' 

[non-BE][allow regression] Fix for 1386 "Stereo downmix EVS - Quality improvements for PHA mode."

Closes #1386

See merge request !1274
parents 1f99a605 c8c2e15a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -175,4 +175,5 @@ 
#define NONBE_FIX_1402_WAVEADJUST               /* VA: BASOP iisue 1402: fix waveform adjustment decoder PLC */

#define FIX_ISSUE_1376                          /* VA: Fix for issue 1376 (issue with GSC excitation) */

#define OPT_SBA_AVOID_SPAR_RESCALE              /* Optimization made to spar decoder and IGF */

#define NONBE_FIX_1386_STEREO_DMX_EVS_PHA       /* Orange: Fix for stereo DMX / PHA mode : Change the filter taps resolution (Q31->Q30), improve precision for the IR window, for the ILD & IPD smoothing in sub-bands, for the ISD counters and for ICCr. */

#endif

lib_enc/ivas_stat_enc.h

+9 −2
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
{

    Word16 init_frmCntr;



#ifdef NONBE_FIX_1386_STEREO_DMX_EVS_PHA

    Word32 isd_rate_s_fx; // Q31

#else

    Word16 isd_rate_s_fx;                            // Q15

#endif

    Word32 iccr_s_fx;                                // Q31

    Word32 ipd_ff_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX]; // Q31

    Word32 Pr_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX];     // Q31
@@ -1224,8 +1228,11 @@ typedef struct stereo_dmx_evs_enc_data_structure 
    STEREO_DMX_EVS_POC_HANDLE hPOC;

    STEREO_DMX_EVS_PHA_HANDLE hPHA;





#ifdef NONBE_FIX_1386_STEREO_DMX_EVS_PHA

    Word16 itd_fx; // Q0

#else

    Word32 itd_fx;                                   // Q16

#endif



    Word32 pre_dmx_energy_fx[1];

    Word16 pre_dmx_energy_fx_e[1];

lib_enc/ivas_stereo_dmx_evs_fx.c

+179 −28

File changed.

Preview size limit exceeded, changes collapsed.