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

[cleanup] accept NONBE_1217_OBJ_EDIT_FOA

parent 2eda3ad0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ 
#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */

lib_dec/lib_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1655,10 +1655,8 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                st_ivas->hParamIsmDec->edited_azimuth_values[obj] = hIvasEditableParameters.ism_metadata[obj].azimuth;

                st_ivas->hParamIsmDec->edited_elevation_values[obj] = hIvasEditableParameters.ism_metadata[obj].elevation;



#ifdef NONBE_1217_OBJ_EDIT_FOA

                if ( st_ivas->hMasaIsmData != NULL )

                {

#endif

                    st_ivas->hMasaIsmData->gain_ism_edited[obj] = hIvasEditableParameters.ism_metadata[obj].gain;



                    /* Detect direction editing in Param-ISM mode */
@@ -1681,20 +1679,14 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                    {

                        st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 0u;

                    }

#ifdef NONBE_1217_OBJ_EDIT_FOA

                }

#endif

            }



#ifdef NONBE_1217_OBJ_EDIT_FOA

            if ( st_ivas->hMasaIsmData != NULL )

            {

#endif

                /* MASA is not present with the ISM format */

                st_ivas->hMasaIsmData->masa_gain_is_edited = 0u;

#ifdef NONBE_1217_OBJ_EDIT_FOA

            }

#endif

        }

        else if ( ism_mode == ISM_MODE_NONE )

        {