Commit ecf18df8 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into test-deactivated-debug-switches

parents ef0156ab 943754a5

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,10 @@ typedef enum 
#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12



#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )

#endif



/* ----- Enums - TD Renderer ----- */



typedef enum

lib_com/options.h

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ 
#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */



#define FIX_674_MISSING_TABLES_FOR_TDREND_REVERB        /* Eri: add tables for 32kHz, 16kHz (and update 48kHz) for left/right energies and coherence for late reverb in TD renderer path. Also read tables from binary when hrtf binaries are used. */



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



/* #################### Start NON-BE CR switches ########################## */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1944,7 +1944,11 @@ ivas_error ivas_init_decoder( 


        if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

lib_dec/ivas_ism_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -198,7 +198,11 @@ static ivas_error ivas_ism_bitrate_switching( 
#ifdef FIX_571_REVERB_NOT_ACTIVATED_ISM

                if ( st_ivas->hIntSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

                {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }

lib_rend/ivas_crend.c

+4 −0
Original line number Diff line number Diff line
@@ -1327,7 +1327,11 @@ ivas_error ivas_rend_openCrend( 


            if ( outConfig == AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

            {

#ifdef FIX_674_MISSING_TABLES_FOR_TDREND_REVERB

                if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, NULL, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }