Loading lib_com/options.h +2 −4 Original line number Diff line number Diff line Loading @@ -152,14 +152,12 @@ #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 */ <<<<<<< HEAD #define FIX_288_RECONF_TCX_ON_1ST_GOOD_FRAME_ALWAYS /* FhG: fix for issue 288: fixes range coder crash in unified stereo with frameloss */ ======= #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 LOW_RATE_TRANS_FIX /* Eri: Fix for critical item during transitions */ >>>>>>> main #define SET_TNS_FLAG_IN_EVERY_FRAME /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ Loading lib_dec/core_dec_init.c +6 −0 Original line number Diff line number Diff line Loading @@ -670,6 +670,12 @@ 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 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; Loading lib_dec/ivas_tcx_core_dec.c +6 −0 Original line number Diff line number Diff line Loading @@ -96,6 +96,12 @@ void stereo_tcx_init_dec( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); #ifdef SET_TNS_FLAG_IN_EVERY_FRAME if ( !MCT_flag && st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } #endif if ( hTcxLtpDec != NULL ) { hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core ); Loading lib_enc/ivas_tcx_core_enc.c +6 −0 Original line number Diff line number Diff line Loading @@ -100,6 +100,12 @@ void stereo_tcx_init_enc( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); #ifdef SET_TNS_FLAG_IN_EVERY_FRAME if ( st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } #endif st->core_brate = st->total_brate; Loading Loading
lib_com/options.h +2 −4 Original line number Diff line number Diff line Loading @@ -152,14 +152,12 @@ #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 */ <<<<<<< HEAD #define FIX_288_RECONF_TCX_ON_1ST_GOOD_FRAME_ALWAYS /* FhG: fix for issue 288: fixes range coder crash in unified stereo with frameloss */ ======= #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 LOW_RATE_TRANS_FIX /* Eri: Fix for critical item during transitions */ >>>>>>> main #define SET_TNS_FLAG_IN_EVERY_FRAME /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ Loading
lib_dec/core_dec_init.c +6 −0 Original line number Diff line number Diff line Loading @@ -670,6 +670,12 @@ 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 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; Loading
lib_dec/ivas_tcx_core_dec.c +6 −0 Original line number Diff line number Diff line Loading @@ -96,6 +96,12 @@ void stereo_tcx_init_dec( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); #ifdef SET_TNS_FLAG_IN_EVERY_FRAME if ( !MCT_flag && st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } #endif if ( hTcxLtpDec != NULL ) { hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core ); Loading
lib_enc/ivas_tcx_core_enc.c +6 −0 Original line number Diff line number Diff line Loading @@ -100,6 +100,12 @@ void stereo_tcx_init_enc( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); #ifdef SET_TNS_FLAG_IN_EVERY_FRAME if ( st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } #endif st->core_brate = st->total_brate; Loading