Commit 4239e4df authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Port float MR 1765 to float reference.

parent d029b583

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -686,7 +686,9 @@ int main( 
#endif

                goto cleanup;

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = true;

#endif

        }

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

         * This will be ignored if output format is not split rendering. */

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -1106,7 +1106,9 @@ int main( 
#endif

                goto cleanup;

            }

#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
@@ -203,6 +203,7 @@ 
#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_binRenderer_internal.c

+8 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,9 @@ ivas_error ivas_binRenderer_open( 
    int16_t convBand, chIdx, k;

#endif

    ivas_error error;

#ifdef FIX_587_DEFAULT_REVERB

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    error = IVAS_ERR_OK;
@@ -1192,7 +1195,12 @@ ivas_error ivas_binRenderer_open( 
    /* 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 ) )

    {

#ifdef FIX_587_DEFAULT_REVERB

        pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;

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

#else

        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, st_ivas->hHrtfFastConv->fastconvReverberationTimes, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }