Commit 78545b82 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

fix for issue 392

parent 607235da

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -675,7 +675,11 @@ int main( 
    }



    /* === Configure === */

#ifdef FIX_392_LATE_REVERB

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "Error in Renderer Config Init\n" );

        exit( -1 );

lib_com/options.h

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


#define FIX_389_EXT_REND_PCM_SR                         /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */

#define FIX_390_EXT_REND_MASA_META_COPY                 /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */

#define FIX_392_LATE_REVERB                             /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_rend/lib_rend.c

+14 −2
Original line number Diff line number Diff line
@@ -3658,10 +3658,19 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( 


ivas_error IVAS_REND_InitConfig(

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

#ifdef FIX_392_LATE_REVERB

    const IVAS_REND_AudioConfig outAudioConfig /* i  : output audioConfig  */

#else

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

#endif

)

{

    ivas_error error;

#ifdef FIX_392_LATE_REVERB

    bool rendererConfigEnabled;



    rendererConfigEnabled = ( outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL );

#endif



    if ( rendererConfigEnabled )

    {
@@ -3678,8 +3687,11 @@ ivas_error IVAS_REND_InitConfig( 
        {

            return error;

        }



#ifdef FIX_392_LATE_REVERB

        if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_rend/lib_rend.h

+6 −2
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ ivas_error IVAS_REND_FeedInputMasaMetadata( 


ivas_error IVAS_REND_InitConfig(

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

#ifdef FIX_392_LATE_REVERB

    const IVAS_REND_AudioConfig outAudioConfig /* i  : output audioConfig  */

#else

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

#endif

);



int16_t IVAS_REND_GetRenderConfig(