Commit c9124511 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

[fix] default room acoustics parameters in all renderers and BINAURAL_ROOM_REVERB output format

parent 2969a363

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                goto cleanup;

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = true;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -1050,7 +1050,9 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                exit( -1 );

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = 1;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.

lib_com/common_api_types.h

+2 −0
Original line number Diff line number Diff line
@@ -300,7 +300,9 @@ typedef enum 


typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

#ifndef FIX_587_DEFAULT_REVERB

    int16_t override;

#endif

    int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */

    float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX];      /* Center frequencies for which following values are provided:                                        */

    float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /*  - The room's T60 per center frequency                                                             */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#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 */

#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */



/* #################### End BE switches ################################## */

lib_dec/ivas_binRenderer_internal.c

+18 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,23 @@ ivas_error ivas_binRenderer_open( 
        }

    }



#ifdef FIX_587_DEFAULT_REVERB

    /* Allocate and initialize the reverberator */

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) 

    {

        if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, NULL, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

    else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

    {

        if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

#else

    /* Allocate memories needed for reverb module */

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {
@@ -1341,6 +1358,7 @@ ivas_error ivas_binRenderer_open( 
            return error;

        }

    }

#endif

    else

    {

        hBinRenderer->hReverb = NULL;