Commit 880ccac7 authored by multrus's avatar multrus
Browse files

Merge branch '20230202_cleanup' into 'main' 

20230202 cleanup

See merge request !423
parents 82b46990 6989a161

lib_com/options.h

+2 −16
Original line number Diff line number Diff line
@@ -144,30 +144,16 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#ifdef SBA_BR_SWITCHING

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#define SBA_BR_SWITCHING_COMPLEXITY_FIX                 /* VA: fix complexity overhead */ 

#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */



#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define FIX_245_RANGE_CODER_VOIP_MSAN                   /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */

#define REND_CFG_LFE                                    /* Issue 110: Configurable LFE handling for external renderer */

#define FIX_235                                         /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */

#define ENV_STAB_FIX                                    /* Contribution 23: HQ envelope stability memory fix */

#define STABILIZE_GIPD                                  /* FhG: Contribution 22: gIPD stabilization */

#define FIX_292_VBAP_CALLOC_REMOVAL                     /* Nokia: Fixes issue 292 by removing the remnant callocs */

#define FIX_293_EXT_RENDERER_CLI                        /* FhG: Fix bugs in external renderer CLI */

#define FIX_268                                         /* Issue 268: Add low cost dry-run of memory analysis */

#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#define LOW_RATE_TRANS_FIX                              /* Eri: Fix for critical item during transitions */



#define FIX_197_CREND_INTERFACE 

#define SET_TNS_FLAG_IN_EVERY_FRAME                     /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo  with frameloss */

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_299_ISM_BWS                                 /* VA: issue 299 - fix Band-width switching issues in ISM format */

#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */

#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/





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

/* clang-format on */

#endif

lib_dec/core_dec_init.c

+0 −2
Original line number Diff line number Diff line
@@ -674,13 +674,11 @@ void open_decoder_LPD( 
    st->last_tns_active = 0;

    st->second_last_tns_active = 0;

    st->second_last_core = -1;

#ifdef SET_TNS_FLAG_IN_EVERY_FRAME

    /* TODO: also apply for MCT modes, once issue #24 is solved */

    if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );

    }

#endif

    if ( hTcxDec != NULL )

    {

        hTcxDec->tcxltp_second_last_pitch = st->old_fpitch;

lib_dec/core_switching_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -1028,11 +1028,7 @@ void bandwidth_switching_detect( 
    {

        st->bws_cnt1 = 0;

    }

    else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB

#ifdef FIX_299_ISM_BWS

              && st->last_low_rate_mode == 0

#endif

    )

    else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB && st->last_low_rate_mode == 0 )

    {

        st->bws_cnt1++;

    }

lib_dec/init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ ivas_error init_decoder( 
    st->last_good = UNVOICED_CLAS;

    st->clas_dec = UNVOICED_CLAS;

    st->low_rate_mode = 0;

#ifdef FIX_299_ISM_BWS

    st->last_low_rate_mode = 0;

#endif



    st->lp_gainp = 0.0f;

    st->lp_gainc = 0.0f;

lib_dec/ivas_stereo_mdct_stereo_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -327,19 +327,11 @@ void stereo_decoder_tcx( 
                hStereoMdct->reverse_dmx = 0;

            }



#ifdef FIX_317

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r );

            }

#ifdef FIX_317

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_l[k], 1.0f / nrgRatio, spec_l[k], L_frameTCX_l );

            }