Commit 553c0875 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OBJ_EDITING_INTERFACE

parent 06f91d3c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ 
#define LIB_DEC_REVISION                                /* VA: cleaning and simplification of lib_dec.c */



// object-editing feature porting

#define OBJ_EDITING_INTERFACE                           /* Interface for object editing */

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

#ifdef OBJ_EDITING_API

#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)

lib_rend/ivas_objectRenderer_fx.c

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

            }

#endif

#ifdef OBJ_EDITING_INTERFACE

            if ( ( error = TDREND_MIX_SRC_SetGain( hBinRendererTd, nS, hIsmMetaData[nS]->gain_fx ) ) != IVAS_ERR_OK ) // TODO: Check Gain has correct Q-value

            {

                return error;

            }

#endif



            IF( hIsmMetaData[nS]->non_diegetic_flag )

            {
@@ -989,9 +987,7 @@ ivas_error ivas_td_binaural_renderer_ext_fx( 
        move32();

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

        move32();

#ifdef OBJ_EDITING_INTERFACE

        hIsmMetaData[0]->gain_fx = ONE_IN_Q29; // TODO: check Q value

#endif

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

        move16();

    }

lib_rend/ivas_objectRenderer_sources_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx( const TDREND_DirAtten_t *DirAtte 
static Word16 TDREND_SRC_SPATIAL_GetDistGain_fx( const TDREND_DistAtten_t *DistAtten_p, const Word32 Dist_fx, const Word16 Dist_e );

static void TDREND_SRC_SPATIAL_SetDirAtten_fx( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_DirAtten_t *DirAtten_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 Word32 Gain );

#endif

static ivas_error TDREND_SRC_REND_Alloc( TDREND_SRC_REND_t **SrcRend_pp );

static void TDREND_SRC_SPATIAL_Dealloc( TDREND_SRC_SPATIAL_t *SrcSpatial_p );
@@ -132,7 +130,6 @@ ivas_error TDREND_MIX_SRC_SetDir_fx( 
    return IVAS_ERR_OK;

}



#ifdef OBJ_EDITING_INTERFACE



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

 * TDREND_MIX_SRC_SetGain()
@@ -151,7 +148,6 @@ ivas_error TDREND_MIX_SRC_SetGain( 
    return IVAS_ERR_OK;

}



#endif



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

 * TDREND_MIX_SRC_SetDirAtten()
@@ -694,7 +690,6 @@ static void TDREND_SRC_SPATIAL_SetDistAtten( 
    return;

}



#ifdef OBJ_EDITING_INTERFACE

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

 * TDREND_SRC_SPATIAL_SetGain()

 *
@@ -710,7 +705,6 @@ static void TDREND_SRC_SPATIAL_SetGain( 


    return;

}

#endif



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

 * TDREND_SRC_SPATIAL_GetDirGain()

lib_rend/ivas_prot_rend_fx.h

+0 −2
Original line number Diff line number Diff line
@@ -750,13 +750,11 @@ ivas_error TDREND_MIX_SRC_SetDir_fx( 
    const Word16 Vec_p_q                                        /* i  : Direction vector q  */

);



#ifdef OBJ_EDITING_INTERFACE

ivas_error TDREND_MIX_SRC_SetGain(

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

	const Word16 SrcInd,

	const Word32 Gain                                            /* i  : Gain                                    */

);

#endif



ivas_error TDREND_MIX_SRC_SetDirAtten_fx(

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