Commit 170c2123 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 'main'

[Non-BE] Use HRTF convolution for BINUARAL_ROOM_REVERB output config with FastConv renderer

See merge request !1731
parents 9d74510e 2ae700b3

apps/decoder.c

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

    }



#ifndef FIX_1158_FASTCONV_REVERB_HRTF

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

     * Open renderer configuration reader file

     *------------------------------------------------------------------------------------------*/
@@ -427,6 +428,7 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -614,6 +616,14 @@ 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 )

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ 
#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */

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

#define FIX_1166_TDREND_DIV0                            /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */

#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: BASOP issue 835: wide range of buffer values for cx in ParamMC */

lib_dec/ivas_output_config.c

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

            }