Commit 7be2f3f4 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1217_OBJ_EDIT_FOA

parent c720eecb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

#define OBJ_EDIT_BASOP

#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 FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */

lib_dec/lib_dec_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -4388,10 +4388,8 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                move32();

                st_ivas->hParamIsmDec->edited_elevation_values_fx[obj] = hIvasEditableParameters.ism_metadata[obj].elevation_fx;

                move32();

#ifdef NONBE_1217_OBJ_EDIT_FOA

                IF( st_ivas->hMasaIsmData != NULL )

                {

#endif

                    st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = shr( extract_h( hIvasEditableParameters.ism_metadata[obj].gain_fx ), Q1 ); // Q29 -> Q12

                    move32();
@@ -4417,21 +4415,15 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                        st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 0;

                    }

                    move16();

#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 = 0;

                move16();

#ifdef NONBE_1217_OBJ_EDIT_FOA

            }

#endif

        }

        ELSE IF( EQ_32( ism_mode, ISM_MODE_NONE ) )

        {