Commit 16f7f9e3 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 2194_basop_port_float_MR2105_default_reverb_configuration
parents 4b06fb4c f344a5ab

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ 


#define FIX_2173_UBSAN_IN_JBM_PCMDSP_APA                     /* FhG: Fix UBSAN problems in jbm_pcmdsp_apa_fx.c */

#define FIX_1947_DEC_HIGH_MLD_FOR_STEREO2MONO                /* FhG: Make Q-factor of synth_16_fx and output_16_fx dynamic to prevent overflow in HQ_CORE mode */



#define FIX_2184_EVS_STEREO_DMX_CHANNEL_DISAPPEARING         /* Orange: Fix for issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */

#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA                    /* Nokia: Add missing code to solve issue */

/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */

lib_dec/lib_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4042,6 +4042,10 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
                    move32();

                    hIsmMetaData[obj]->edited_radius_fx = hIsmMetaData[obj]->radius_fx;

                    move32();

#ifdef FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA

                    hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29;

                    move32();

#endif

                }



                if ( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )

lib_enc/ivas_stat_enc.h

+8 −4
Original line number Diff line number Diff line
@@ -1186,6 +1186,12 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 


    Word32 isd_rate_s_fx; // Q31

    Word32 iccr_s_fx;     // Q31

#ifdef FIX_2184_EVS_STEREO_DMX_CHANNEL_DISAPPEARING

    Word32 phitd_fx;    // Q15

    Word32 iccres_s_fx; // Q31

    Word32 lvlin_fx[CPE_CHANNELS];

    Word16 lvlin_fx_e[CPE_CHANNELS];

#endif

    Word32 ipd_ff_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX]; // Q31

    Word32 Pr_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX];     // Q31

    Word32 Pi_fx[STEREO_DMX_EVS_NB_SUBBAND_MAX];     // Q31
@@ -1194,7 +1200,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    Word16 pha_len;

    Word16 fad_len;





    Word16 win_fx[STEREO_DMX_EVS_PHA_LEN_MAX];                                                    // Q14

    Word32 fad_g_fx[STEREO_DMX_EVS_FAD_LEN_MAX];                                                  // Q31

    Word32 *p_prev_taps_fx[CPE_CHANNELS], prev_taps_fx[CPE_CHANNELS][STEREO_DMX_EVS_PHA_LEN_MAX]; // Q31
@@ -1223,7 +1228,6 @@ typedef struct stereo_dmx_evs_correlation_filter_structure 
    Word32 fad_g_prc_fx[L_FRAME48k]; // Q31

    Word16 fad_len_prc;





    Word32 trns_aux_energy_fx[CPE_CHANNELS];

    Word16 trns_aux_energy_fx_e[CPE_CHANNELS];

    Word32 crst_fctr_fx; // Q0

lib_enc/ivas_stereo_dmx_evs_fx.c

+291 −19

File changed.

Preview size limit exceeded, changes collapsed.