Commit 5a1884f8 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch... 

Merge branch '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution' into '1158-rendering-using-fastconv-to-binaural_room_reverb-uses-brir-convolution-cleanup'
parents 1b43851e 3251ba95

apps/decoder.c

+0 −14
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ int main( 
    }



#ifndef FIX_1158_FASTCONV_REVERB_HRTF



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

     * Open renderer configuration reader file

     *------------------------------------------------------------------------------------------*/
@@ -688,19 +687,6 @@ int main( 
            goto cleanup;

        }

    }

#ifdef FIX_1158_FASTCONV_REVERB_HRTF

    else if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    {

        /* supply default renderer config for BINAURAL_ROOM_REVERB */

        IVAS_RENDER_CONFIG_DATA renderConfig;

        IVAS_DEC_GetDefaultRenderConfig( &renderConfig );

        if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

    }

#endif



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

     * Load custom loudspeaker layout data