Commit f340cc8c authored by norvell's avatar norvell
Browse files

Change to object id within inputIsm structs

parent 05ba3d7f

apps/renderer.c

+3 −0
Original line number Diff line number Diff line
@@ -1278,6 +1278,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 −5
Original line number Diff line number Diff line
@@ -343,11 +343,6 @@ typedef struct _IVAS_RENDER_CONFIG 
    Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}

    float distAtt[3];

    Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */

#ifdef NONBE_1377_REND_DIRATT_CONF

    Word16 object_id[IVAS_MAX_NUM_OBJECTS];

    Word16 number_of_objects;

#endif



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct

lib_rend/ivas_objectRenderer_fx.c

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

    const Word32 outFs,

#ifdef NONBE_1377_REND_DIRATT_CONF

    Word16 ism_number, /* i: ISM number */

    Word16 object_id, /* i: Object ID */

#endif

    Word16 *SrcInd,

    Word16 *num_src )
@@ -847,7 +847,7 @@ ivas_error ivas_td_binaural_open_ext_fx( 
    if ( NULL != hRendCfg )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        directivity_fx = hRendCfg->directivity_fx + 3 * ism_number; /* Address calculation -- no BASOPs */

        directivity_fx = hRendCfg->directivity_fx + 3 * object_id; /* Address calculation -- no BASOPs */

#else

        directivity_fx = hRendCfg->directivity_fx;

#endif

lib_rend/ivas_prot_rend_fx.h

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

    const Word32 output_Fs,

#ifdef NONBE_1377_REND_DIRATT_CONF

    const Word16 ism_number,                                    /* i  : ISM number                                  */

    const Word16 object_id,                                     /* i  : Object ID                               */

#endif

    Word16 *SrcInd,

    Word16 *num_src

lib_rend/ivas_render_config_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -140,10 +140,6 @@ ivas_error ivas_render_config_init_from_rom_fx( 
    move32();

    ( *hRenderConfig )->distAtt_fx[2] = ONE_IN_Q30; // Q30   /* Default rolloff factor */

    move32();

#ifdef NONBE_1377_REND_DIRATT_CONF

    ( *hRenderConfig )->number_of_objects = 0;

    move16();

#endif

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

    move32();

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