Commit 5805e19a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1377_REND_DIRATT_CONF

parent fd5e5ea8

apps/renderer.c

+0 −2
Original line number Diff line number Diff line
@@ -1259,7 +1259,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 )

    {
@@ -1268,7 +1267,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
@@ -163,7 +163,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  */

#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.c

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

)

{

#ifndef NONBE_1377_REND_DIRATT_CONF

    TDREND_DirAtten_t *DirAtten_p;

#endif

    int16_t nS;

    float Pos[3];

    float Dir[3];

    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++ )
@@ -559,12 +553,6 @@ ivas_error TDREND_Update_object_positions( 
                return error;

            }



#ifndef NONBE_1377_REND_DIRATT_CONF

            if ( ( error = TDREND_MIX_SRC_SetDirAtten( hBinRendererTd, nS, DirAtten_p ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif

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

            {

                return error;
@@ -678,13 +666,9 @@ ivas_error ivas_td_binaural_open_ext( 
    AUDIO_CONFIG inConfig,

    RENDER_CONFIG_DATA *hRendCfg, /* i  : Renderer configuration */

    LSSETUP_CUSTOM_STRUCT *customLsInput,

#ifdef NONBE_1377_REND_DIRATT_CONF

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

    const int16_t object_id /* i: Object ID */

)

#else

    const int32_t outFs )

#endif

{

    int16_t nchan_transport;

    AUDIO_CONFIG transport_config;
@@ -721,11 +705,7 @@ ivas_error ivas_td_binaural_open_ext( 


    if ( NULL != hRendCfg )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        directivity = hRendCfg->directivity + 3 * object_id;

#else

        directivity = hRendCfg->directivity;

#endif

        distAtt = hRendCfg->distAtt;

    }

lib_rend/ivas_prot_rend.h

+0 −4
Original line number Diff line number Diff line
@@ -651,12 +651,8 @@ ivas_error ivas_td_binaural_open_ext( 
    const AUDIO_CONFIG inConfig,

    RENDER_CONFIG_DATA *hRendCfg,                               /* i  : Renderer configuration                  */

    LSSETUP_CUSTOM_STRUCT *customLsInput,

#ifdef NONBE_1377_REND_DIRATT_CONF

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

    const int16_t object_id                                     /* i: Object ID                                 */

#else

    const int32_t output_Fs 

#endif

);



void ivas_td_binaural_close(

lib_rend/lib_rend.c

+0 −24
Original line number Diff line number Diff line
@@ -126,9 +126,7 @@ typedef struct 
    float nonDiegeticPanGain;

    OMASA_ANA_HANDLE hOMasa;

    uint16_t total_num_objects;

#ifdef NONBE_1377_REND_DIRATT_CONF

    int16_t object_id;

#endif

    int16_t ism_metadata_delay_ms;

} input_ism;
@@ -1643,11 +1641,7 @@ static ivas_error setRendInputActiveIsm( 


    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL || outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || outConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate, inputIsm->object_id ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -1655,11 +1649,7 @@ static ivas_error setRendInputActiveIsm( 
        /* Open TD renderer wrappers */

        for ( i = 0; i < MAX_HEAD_ROT_POSES - 1; ++i )

        {

#ifdef NONBE_1377_REND_DIRATT_CONF

            if ( ( error = ivas_td_binaural_open_ext( &inputIsm->splitTdRendWrappers[i], inConfig, hRendCfg, NULL, *inputIsm->base.ctx.pOutSampleRate, inputIsm->object_id ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_td_binaural_open_ext( &inputIsm->splitTdRendWrappers[i], inConfig, hRendCfg, NULL, *inputIsm->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -1677,11 +1667,7 @@ static ivas_error setRendInputActiveIsm( 
    }

    else

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate, inputIsm->object_id ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -2438,11 +2424,7 @@ static ivas_error initMcBinauralRendering( 


    if ( useTDRend && inputMc->tdRendWrapper.hBinRendererTd == NULL )

    {

#ifdef NONBE_1377_REND_DIRATT_CONF

        if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate, 0 ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -2452,11 +2434,7 @@ static ivas_error initMcBinauralRendering( 
            /* Open TD renderer wrappers */

            for ( i = 0; i < MAX_HEAD_ROT_POSES - 1; ++i )

            {

#ifdef NONBE_1377_REND_DIRATT_CONF

                if ( ( error = ivas_td_binaural_open_ext( &inputMc->splitTdRendWrappers[i], inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate, 0 ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_td_binaural_open_ext( &inputMc->splitTdRendWrappers[i], inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -4081,7 +4059,6 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout( 
    return IVAS_ERR_OK;

}



#ifdef NONBE_1377_REND_DIRATT_CONF

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

 * IVAS_REND_SetObjectIDs()

 *
@@ -4107,7 +4084,6 @@ ivas_error IVAS_REND_SetObjectIDs( 


    return IVAS_ERR_OK;

}

#endif





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