Commit 218ceee1 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents f1c5d3e2 5890fad8

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
+5 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ 
/* #define DEBUG_OSBA */

/*#define DEBUG_BINAURAL_FILTER_DESIGN*/        /* debugging of Crend binaural filter design */

/*#define DEBUG_AGC_ENCODER_CMD_OPTION*/        /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */

#define DEBUG_JBM_CMD_OPTION                    /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

#define VARIABLE_SPEED_DECODING                 /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

/*#define DEBUG_JBM_CMD_OPTION*/                /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

/*#define VARIABLE_SPEED_DECODING*/                 /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */



/*Split Rendering Debug switches*/

/*#define DBG_WAV_WRITER*/                      /* add debugging function dbgwrite_wav() */
@@ -244,6 +244,9 @@ 
#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */

#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 ######################### */

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_dec/peak_vq_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -280,7 +280,11 @@ static void peak_vq_dec( 
    pvq_bands = hvq_pvq_bitalloc( pvq_bits, core_brate, st->bwidth, ynrm, manE_peak, expE_peak, Rk, R, sel_bnds, &n_sel_bnds );



    /* safety check in case of bit errors */

#ifdef FIX_685_BER_IN_HVQ

    if ( ( pvq_bands == 0 ) && st->element_mode == EVS_MONO ) /* PVQ bands may be zero for IVAS */

#else

    if ( pvq_bands == 0 )

#endif

    {

        st->BER_detect = 1;

    }