Commit f495643d authored Sep 04, 2023 by eichenseer

Rename switch to NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE.

parent f75f328e

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@

		#define NONBE_FIX_736_FOA_BR_SWITCH /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */
		#define NONBE_FIX_746_NONDIEGETIC_MD /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/
		#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */
		#define NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */

		/* ##################### End NON-BE switches ############################# */

lib_dec/ivas_jbm_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ ivas_error ivas_jbm_dec_tc(
		{
		return error;
		}
		#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE
		#ifdef NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

		/* decode dominant object first so the noise energy of the other objects can be limited */
		if ( ( error = ivas_sce_dec( st_ivas, st_ivas->hISMDTX.sce_id_dtx, &output[st_ivas->hISMDTX.sce_id_dtx], output_frame, nb_bits_metadata[st_ivas->hISMDTX.sce_id_dtx] ) ) != IVAS_ERR_OK )
		@@ -179,7 +179,7 @@ ivas_error ivas_jbm_dec_tc(

		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE
		#ifdef NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE
		/* for DTX frames, dominant object has already been decoded before */
		if ( !( ( ivas_total_brate == IVAS_SID_5k2 \|\| ivas_total_brate == FRAME_NO_DATA ) && n == st_ivas->hISMDTX.sce_id_dtx ) )
		{