Commit 453f80f4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1158_FASTCONV_REVERB_HRTF

parent 3863ef31

apps/decoder.c

+0 −23
Original line number Diff line number Diff line
@@ -404,27 +404,6 @@ int main( 
        }

    }



#ifndef FIX_1158_FASTCONV_REVERB_HRTF

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

     * Open renderer configuration reader file

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



    if ( arg.renderConfigEnabled )

    {

        /* sanity check */

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM && arg.non_diegetic_pan_enabled == false )

        {

            fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }



        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );

            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -619,13 +598,11 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_1158_FASTCONV_REVERB_HRTF

        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );

            goto cleanup;

        }

#endif



        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

        {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

lib_dec/ivas_output_config.c

+0 −4
Original line number Diff line number Diff line
@@ -141,11 +141,7 @@ void ivas_renderer_select( 
        {

            *internal_config = IVAS_AUDIO_CONFIG_HOA3;



#ifdef FIX_1158_FASTCONV_REVERB_HRTF

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#endif

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

            }