Commit 37c7cfcc authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OBJ_EDITING_INTERFACE

parent c63ab21b

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -201,8 +201,6 @@ 
#endif



// objject-editing feature porting

#define OBJ_EDITING_INTERFACE                           /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

#ifdef OBJ_EDITING_API

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features
@@ -215,7 +213,6 @@ 
#define OBJ_EDITING_PARAMISM_BIN                        /* Nokia: object editing for ParamISM to binaural */

#define FIX_BRATE_SWITCHING                             /* VA: fix bitrate switching cases in OMASA and OSBA */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

#endif

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

#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 */

lib_rend/ivas_objectRenderer.c

+0 −4
Original line number Diff line number Diff line
@@ -571,12 +571,10 @@ ivas_error TDREND_Update_object_positions( 
                return error;

            }

#endif

#ifdef OBJ_EDITING_INTERFACE

            if ( ( error = TDREND_MIX_SRC_SetGain( hBinRendererTd, nS, hIsmMetaData[nS]->gain ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif



            if ( hIsmMetaData[nS]->non_diegetic_flag )

            {
@@ -812,9 +810,7 @@ ivas_error ivas_td_binaural_renderer_ext( 
        hIsmMetaData[0]->yaw = currentPos->yaw;

        hIsmMetaData[0]->pitch = currentPos->pitch;

        hIsmMetaData[0]->radius = currentPos->radius;

#ifdef OBJ_EDITING_INTERFACE

        hIsmMetaData[0]->gain = 1.0f;

#endif

        hIsmMetaData[0]->non_diegetic_flag = currentPos->non_diegetic_flag;

    }

lib_rend/ivas_objectRenderer_sources.c

+0 −6
Original line number Diff line number Diff line
@@ -53,9 +53,7 @@ static void TDREND_SRC_SPATIAL_SetDirAtten( TDREND_SRC_SPATIAL_t *SrcSpatial_p, 


static void TDREND_SRC_SPATIAL_SetDistAtten( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_DistAtten_t *DistAtten_p );



#ifdef OBJ_EDITING_INTERFACE

static void TDREND_SRC_SPATIAL_SetGain( const TDREND_SRC_t *Src_p, const float Gain );

#endif



static float TDREND_SRC_SPATIAL_GetDirGain( const TDREND_DirAtten_t *DirAtten_p, const float *Front_p, const float *RelPos_p );
@@ -133,7 +131,6 @@ ivas_error TDREND_MIX_SRC_SetDir( 
}





#ifdef OBJ_EDITING_INTERFACE

/*-------------------------------------------------------------------*

 * TDREND_MIX_SRC_SetGain()

 *
@@ -150,7 +147,6 @@ ivas_error TDREND_MIX_SRC_SetGain( 


    return IVAS_ERR_OK;

}

#endif





/*-------------------------------------------------------------------*
@@ -559,7 +555,6 @@ static void TDREND_SRC_SPATIAL_SetDistAtten( 
}





#ifdef OBJ_EDITING_INTERFACE

/*-------------------------------------------------------------------*

 * TDREND_SRC_SPATIAL_SetGain()

 *
@@ -575,7 +570,6 @@ static void TDREND_SRC_SPATIAL_SetGain( 


    return;

}

#endif





/*-------------------------------------------------------------------*

lib_rend/ivas_prot_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -728,13 +728,11 @@ ivas_error TDREND_MIX_SRC_SetDir( 
    const float *Vec_p                                          /* i  : Direction vector                        */

);



#ifdef OBJ_EDITING_INTERFACE

ivas_error TDREND_MIX_SRC_SetGain(

	BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */

	const int16_t SrcInd,                                       /* i  : Source index                            */

	const float Gain                                            /* i  : Gain                                    */

);

#endif



ivas_error TDREND_MIX_SRC_SetDirAtten(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                      */