Commit 420a1a10 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_392_LATE_REVERB

parent 8e3fc6f5

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -676,11 +676,7 @@ 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

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






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



#define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

#define ISSUE_24_CLEANUP_MCT_LFE                        /* Issue 24: Cleanup LFE path withing MCT */

lib_rend/lib_rend.c

+0 −10
Original line number Diff line number Diff line
@@ -3652,19 +3652,13 @@ 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 = ( getAudioConfigType( outAudioConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL );

#endif



    if ( rendererConfigEnabled )

    {
@@ -3681,11 +3675,7 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -229,11 +229,7 @@ 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(