Commit 985e8349 authored by thomas dettbarn's avatar thomas dettbarn
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 2012-improve-wmops-performance-of-ivas_dirac_dec_output_synthesis_process_slot_fx
parents 0bcc9e77 758f3c34

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 −1
Original line number Diff line number Diff line
@@ -343,7 +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} */



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define NONBE_FIX_1143_MASA_BRSW                        /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN               /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */

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



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_objectRenderer_fx.c

+13 −2
Original line number Diff line number Diff line
@@ -604,13 +604,16 @@ 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++ )
@@ -635,11 +638,12 @@ 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( hIsmMetaData[nS]->non_diegetic_flag )

            {
@@ -790,6 +794,9 @@ 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 )

{
@@ -839,7 +846,11 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -687,6 +687,9 @@ 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

);