Commit 40d64e3c authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into basop-2379-remove-st-previoussynth_fx_32

parents 3e191ba3 b0d9de9e

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ 
#define FIX_2356_GET_CHAN_ENERGIES                      /* FhG: basop issue 2356: correctly initialize exponents in getChannelEnergies_fx() */

#define FIX_2355_IGF_EXP_POWERSPEC                      /* FhG: basop issue 2355: make sure exp_pPowerSpectrumParameter_fx is initialized in all cases */

#define FIX_2319_CLDFB_INIT_FLAGS                       /* FhG: basop issue 2319: init hs->flags during openCldfb(), to avoid reading of uninitialized memory */

#define FIX_BASOP_2357_OBJECT_EDIT_MSAN                 /* Nokia: basop issue 2357: initialize missing exponents in object edit */

#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE                /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */



/* #################### End BE switches ################################## */

lib_dec/ivas_omasa_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -344,8 +344,16 @@ ivas_error ivas_omasa_data_open_fx( 
        move16();

        hMasaIsmData->preprocEneTarget_fx[band_idx] = 0;

        move32();

#ifdef FIX_BASOP_2357_OBJECT_EDIT_MSAN

        hMasaIsmData->preprocEneTarget_e[band_idx] = 0;

        move16();

#endif

        hMasaIsmData->preprocEneRealized_fx[band_idx] = 0;

        move32();

#ifdef FIX_BASOP_2357_OBJECT_EDIT_MSAN

        hMasaIsmData->preprocEneRealized_e[band_idx] = 0;

        move16();

#endif

    }



    hMasaIsmData->objectsEdited = 0;

lib_rend/ivas_dirac_rend_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -253,6 +253,10 @@ ivas_error ivas_spat_hSpatParamRendCom_config_fx( 
        move16();

        hSpatParamRendCom->numIsmDirections = 0;

        move16();

#ifdef FIX_BASOP_2354_MSAN_DIFF_Q_VALUE

        hSpatParamRendCom->q_diffuseness_vector = Q30;

        move16();

#endif

    }



    /*-----------------------------------------------------------------*