Commit 85251a18 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1893_basop_port_mr_1765_inconsistent_default_reverb' into 'main' 

[Non-BE] [allow regression] Port float MR 1765 to BASOP.

See merge request !2045
parents d5d268e9 7226d62e

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -570,7 +570,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.

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -1203,7 +1203,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
@@ -315,7 +315,9 @@ typedef enum 


typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

#ifndef FIX_587_DEFAULT_REVERB

    Word16 override;

#endif

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

    Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                     /*Q16 Center frequencies for which following values are provided:                                         */

    Word32 pAcoustic_rt60_fx[IVAS_CLDFB_NO_CHANNELS_MAX];                                                                                /*Q26  - The room's T60 per center frequency                                                             */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
#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 NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

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

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_1289_STEREO_SW_TO_MONO                    /* VA: issue 1289: Fix glitch when stereo signal is decoded to mono n TD->DFT switching */

lib_dec/ivas_binRenderer_internal_fx.c

+52 −38
Original line number Diff line number Diff line
@@ -1193,6 +1193,9 @@ ivas_error ivas_binRenderer_open_fx( 
    Word16 convBand, chIdx, k;

#endif

    ivas_error error;

#ifdef FIX_587_DEFAULT_REVERB

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;

#endif



    error = IVAS_ERR_OK;

    move32();
@@ -1350,8 +1353,19 @@ ivas_error ivas_binRenderer_open_fx( 


    /* Allocate memories needed for reverb module */

    test();

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ){

        IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) ){

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

    {

#ifdef FIX_587_DEFAULT_REVERB

        pRoomAcoustics = NULL;

        IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

        {

            pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );

        }

        IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

#else

        IF( NE_32( ( 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_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) )

#endif

        {

            return error;

        }