Commit 56246ac5 authored Feb 05, 2023 by multrus

[cleanup] accept SET_TNS_FLAG_IN_EVERY_FRAME

parent 792fd02e

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@
		#define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */

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

lib_dec/core_dec_init.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -670,13 +670,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/ivas_tcx_core_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -96,13 +96,11 @@ 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
		/* TODO: also apply for MCT modes, once issue #24 is solved */
		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 );

lib_enc/ivas_tcx_core_enc.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -100,12 +100,10 @@ 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;