Commit 21145641 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1197_OMASA_META_BUFFER

parent 43d683e0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ 
#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

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

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */



// object-editing feature porting

lib_dec/ivas_omasa_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -334,7 +334,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;
@@ -350,7 +349,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
@@ -3128,17 +3128,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
                totalTargetEneCh[ch] = max( totalTargetEneCh[ch], 0.0f );

            }



#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

            {