Commit 64a77f08 authored by norvell's avatar norvell
Browse files

Change to object id within inputIsm structs

parent c95ebb73

apps/renderer.c

+3 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,9 @@ int main( 
    {

        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

    {

lib_com/common_api_types.h

+0 −4
Original line number Diff line number Diff line
@@ -337,10 +337,6 @@ typedef struct _IVAS_RENDER_CONFIG 
    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

    float distAtt[3];

#ifdef NONBE_1377_REND_DIRATT_CONF

    int16_t object_id[IVAS_MAX_NUM_OBJECTS];

    int16_t number_of_objects;

#endif



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

lib_rend/ivas_objectRenderer.c

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ ivas_error ivas_td_binaural_open_ext( 
    LSSETUP_CUSTOM_STRUCT *customLsInput,

#ifdef NONBE_1377_REND_DIRATT_CONF

    const int32_t outFs,     /* i: output sampling rate */

    const int16_t ism_number /* i: ISM number */

    const int16_t object_id /* i: Object ID */

)

#else

    const int32_t outFs )
@@ -723,7 +723,7 @@ ivas_error ivas_td_binaural_open_ext( 
    if ( NULL != hRendCfg )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        directivity = hRendCfg->directivity + 3 * ism_number;

        directivity = hRendCfg->directivity + 3 * object_id;

#else

        directivity = hRendCfg->directivity;

#endif

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ ivas_error ivas_td_binaural_open_ext( 
    LSSETUP_CUSTOM_STRUCT *customLsInput,

#ifdef NONBE_1377_REND_DIRATT_CONF

    const int32_t output_Fs,                                    /* i: output sampling rate                      */

    const int16_t ism_number                                    /* i: ISM number                                */

    const int16_t object_id                                     /* i: Object ID                                 */

#else

    const int32_t output_Fs 

#endif

lib_rend/ivas_render_config.c

+0 −4
Original line number Diff line number Diff line
@@ -136,10 +136,6 @@ ivas_error ivas_render_config_init_from_rom( 
    ( *hRenderConfig )->distAtt[1] = 1.0f;   /* Default ref dist */

    ( *hRenderConfig )->distAtt[2] = 1.0f;   /* Default rolloff factor */



#ifdef NONBE_1377_REND_DIRATT_CONF

    ( *hRenderConfig )->number_of_objects = 0;

#endif



    /* ISAR-related parameters */

    ( *hRenderConfig )->split_rend_config.splitRendBitRate = ISAR_MAX_SPLIT_REND_BITRATE;

    ( *hRenderConfig )->split_rend_config.dof = 3;