Commit 87956ac5 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1217_OBJ_EDIT_FOA

parent 2dbf8b68

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#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 NONBE_FIX_1262_OSBA_STEREO                      /* FhG: issue 1262: Fix missing scaling factor for OSBA stereo output */

lib_dec/lib_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -1410,10 +1410,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 */
@@ -1436,20 +1434,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 )

        {