Commit 06229736 authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into basop-2280-back-and-forth-scaling-in-core-coder
parents 52613189 667b7bee

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
#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_2280_REDUCTION_UNNECESSARY_SCALING          /* VA: reduction of unnecessary scaling */

//#define FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE

#define FIX_2280_REDUCTION_UNNECESSARY_SCALING2

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;