Commit 610f75bc authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

- remove IVAS_REND.enableHeadRotation since it is part of IVAS_REND.headRotData 

- fix a bug in compare_audio.py
parent 4882e387

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ int main( 
    }



    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, headRotReader != NULL, strlen( args.renderConfigFilePath ) != 0 ) ) != IVAS_ERR_OK )

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, strlen( args.renderConfigFilePath ) != 0 ) ) != IVAS_ERR_OK )

    {

        exit( -1 );

    }

lib_rend/lib_rend.c

+6 −11
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ typedef struct 
    const LSSETUP_CUSTOM_STRUCT *pCustomLsOut;

    const EFAP_WRAPPER *pEfapOutWrapper;

    const IVAS_REND_HeadRotData *pHeadRotData;

    /* TODO @Philips : would this be a better place to store the render config data? 

     * bearing in mind we could have multiple inputs to the renderer, we might neeed to accomodate 

     * multiple rendering configurations unless one global one can be used. If this is not relevant,

     * feel free to remove this TODO.

    */

} rendering_context;



/* Common base for input structs */
@@ -148,12 +153,12 @@ struct IVAS_REND 
    input_mc inputsMc[RENDERER_MAX_MC_INPUTS];

    input_sba inputsSba[RENDERER_MAX_SBA_INPUTS];



    /* TODO @Philips - inputConfig should not be stored here, but read from e.g. input_mc->input_base.inConfig, please remove this */

    IVAS_REND_AudioConfig inputConfig;

    IVAS_REND_AudioConfig outputConfig;

    EFAP_WRAPPER efapOutWrapper;

    IVAS_LSSETUP_CUSTOM_STRUCT customLsOut;



    int8_t enableHeadRotation;

    IVAS_REND_HeadRotData headRotData;



    int8_t rendererConfigEnabled;
@@ -2672,20 +2677,10 @@ ivas_error IVAS_REND_FeedInputObjectMetadata( 
}



ivas_error IVAS_REND_InitConfig( IVAS_REND_HANDLE st,

                                 bool headRotationEnabled,

                                 bool rendererConfigEnabled )

{

    ivas_error error;



    if ( headRotationEnabled )

    {

        st->enableHeadRotation = 1;

    }

    else

    {

        st->enableHeadRotation = 0;

    }



    if ( rendererConfigEnabled )

    {

        st->rendererConfigEnabled = 1;

lib_rend/lib_rend.h

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( 


ivas_error IVAS_REND_InitConfig( 

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

    bool headRotationEnabled,                       /* i  : enable head rotation for binaural output, ignored for other output formats  */

    bool rendererConfigEnabled                      /* i  : flag indicating if a renderer configuration file was supplied               */

);

tests/renderer/compare_audio.py

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ def compare_audio_arrays( 
            category=RuntimeWarning,

        )

        left = left[:, :cmp_ch]

        right = right[:, cmp_ch]

        right = right[:, :cmp_ch]



    if left.shape[0] != right.shape[0]:

        cmp_smp = min(left.shape[0], right.shape[0])