Commit 8e7d76a2 authored by Archit Tamarapu's avatar Archit Tamarapu Committed by Manuel Jander
Browse files

[cleanup] accept NONBE_1377_REND_DIRATT_CONF

parent 602f1a08

apps/renderer.c

+0 −2
Original line number Diff line number Diff line
@@ -1354,7 +1354,6 @@ int main( 
    {

        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF

#ifdef FIX_1377_HANDLE_ERROR_CODE

    if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )

    {
@@ -1363,7 +1362,6 @@ int main( 
    }

#else

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif

#endif



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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328  */

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_1053_REVERB_RECONFIGURATION

#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

lib_rend/ivas_objectRenderer_fx.c

+0 −18
Original line number Diff line number Diff line
@@ -631,16 +631,10 @@ ivas_error TDREND_Update_object_positions_fx( 
    const ISM_METADATA_HANDLE *hIsmMetaData            /* i  : Input metadata for ISM objects   */

)

{

#ifndef NONBE_1377_REND_DIRATT_CONF

    TDREND_DirAtten_t *DirAtten_p;

#endif

    Word16 nS;

    Word32 Pos_fx[3]; // Q25

    Word32 Dir_fx[3]; // Q30

    ivas_error error;

#ifndef NONBE_1377_REND_DIRATT_CONF

    DirAtten_p = hBinRendererTd->DirAtten_p;

#endif



    /* For each source, write the frame data to the source object*/

    FOR( nS = 0; nS < num_src; nS++ )
@@ -665,12 +659,6 @@ ivas_error TDREND_Update_object_positions_fx( 
            {

                return error;

            }

#ifndef NONBE_1377_REND_DIRATT_CONF

            IF( NE_32( ( error = TDREND_MIX_SRC_SetDirAtten_fx( hBinRendererTd, nS, DirAtten_p ) ), IVAS_ERR_OK ) )

            {

                return error;

            }

#endif

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

            {

                return error;
@@ -825,9 +813,7 @@ ivas_error ivas_td_binaural_open_ext_fx( 
    RENDER_CONFIG_DATA *hRendCfg, /* i  : Renderer configuration */

    LSSETUP_CUSTOM_STRUCT *customLsInput,

    const Word32 outFs,

#ifdef NONBE_1377_REND_DIRATT_CONF

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

#endif

    Word16 *SrcInd,

    Word16 *num_src )

{
@@ -877,11 +863,7 @@ ivas_error ivas_td_binaural_open_ext_fx( 


    if ( NULL != hRendCfg )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

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

#else

        directivity_fx = hRendCfg->directivity_fx;

#endif

        distAtt_fx = hRendCfg->distAtt_fx;

    }

lib_rend/ivas_prot_rend_fx.h

+0 −2
Original line number Diff line number Diff line
@@ -683,9 +683,7 @@ ivas_error ivas_td_binaural_open_ext_fx( 
    RENDER_CONFIG_DATA *hRendCfg,                               /* i  : Renderer configuration                  */

    LSSETUP_CUSTOM_STRUCT *customLsInput,

    const Word32 output_Fs,

#ifdef NONBE_1377_REND_DIRATT_CONF

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

#endif

    Word16 *SrcInd,

    Word16 *num_src

);

lib_rend/lib_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -152,11 +152,9 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( 
    const IVAS_CUSTOM_LS_DATA layout                /* i  : custom loudspeaker layout for input                 */

);



#ifdef NONBE_1377_REND_DIRATT_CONF

ivas_error IVAS_REND_SetObjectIDs(

    IVAS_REND_HANDLE hIvasRend                      /* i/o: Renderer handle                                     */

);

#endif



ivas_error IVAS_REND_SetInputGain_fx(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle             */