Commit d29cd14f authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1197_OMASA_META_BUFFER

parent 3e62d67f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ 




#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching */

#define NONBE_FIX_1212_TONAL_MDCT_CONCEALMENT           /* FhG: Fix issue 1212, zero IGF spec also in 1st concealed frame */

lib_dec/ivas_omasa_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ ivas_error ivas_omasa_dec_config( 
            ivas_omasa_separate_object_renderer_close( st_ivas );

        }



#ifdef NONBE_FIX_1197_OMASA_META_BUFFER

        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->hMasaIsmData != NULL ) /* this structure is in use only in ISM_MASA_MODE_PARAM_ONE_OBJ */

        {

            MASA_ISM_DATA_HANDLE hMasaIsmData = st_ivas->hMasaIsmData;
@@ -353,7 +352,6 @@ ivas_error ivas_omasa_dec_config( 
            set_s( hMasaIsmData->azimuth_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

            set_s( hMasaIsmData->elevation_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

        }

#endif



        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC )

        {

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −6
Original line number Diff line number Diff line
@@ -3107,17 +3107,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            }



            /* Limit target energies to non-negative values */

#ifdef NONBE_FIX_1197_OMASA_META_BUFFER

            /* due to rounding, the sum may exceed 1.0f ever so slightly, so clip it */

            ratioAccOrig = min( ratioAccOrig, 1.0f );

#endif

            if ( masaGainEdited )

            {

#ifdef NONBE_FIX_1197_OMASA_META_BUFFER

                ratioAccNew += gainMasaPow2 * ( 1.0f - ratioAccOrig );

#else

                ratioAccNew += gainMasaPow2 * ( 1 - ratioAccOrig );

#endif

            }

            else

            {