[cleanup] accept FIX_416_ISM_BR_SWITCHING (bea6d163) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,6 @@



		#define FIX_416_ISM_BR_SWITCHING /* FhG: add missing CLDFB reconfig to ISM BR switching */
		#define FIX_SP2A /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */

		#define FIX_413_SBA_DTX /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/

+0 −6

Original line number	Diff line number	Diff line
		@@ -63,9 +63,7 @@ static ivas_error ivas_ism_bitrate_switching(
		ivas_error error;
		int32_t element_brate_tmp[MAX_NUM_OBJECTS];
		int16_t nSCE_old, nCPE_old;
		#ifdef FIX_416_ISM_BR_SWITCHING
		int16_t numCldfbAnalyses_old, numCldfbSyntheses_old, ism_mode;
		#endif

		#ifdef JBM_TSM_ON_TCS
		TC_BUFFER_MODE tc_buffer_mode_new;
		@@ -82,13 +80,11 @@ static ivas_error ivas_ism_bitrate_switching(
		nCPE_old = st_ivas->nCPE;
		nSCE_old = st_ivas->nSCE;

		#ifdef FIX_416_ISM_BR_SWITCHING
		/* we have to temporarily set the ism mode back to the old one, otherwise this can give wrong results*/
		ism_mode = st_ivas->ism_mode;
		st_ivas->ism_mode = last_ism_mode;
		ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
		st_ivas->ism_mode = ism_mode;
		#endif

		if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		@@ -297,7 +293,6 @@ static ivas_error ivas_ism_bitrate_switching(
		}
		}

		#ifdef FIX_416_ISM_BR_SWITCHING
		/-----------------------------------------------------------------
		* CLDFB instances
		-----------------------------------------------------------------/
		@@ -306,7 +301,6 @@ static ivas_error ivas_ism_bitrate_switching(
		{
		return error;
		}
		#endif

		#ifdef JBM_TSM_ON_TCS
		/-----------------------------------------------------------------