[cleanup] accept FIX_417_TD_DECORR_BRATE_SW (51035aaa) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -3725,7 +3725,6 @@ void ivas_dirac_dec_render_sf(
		#endif
		);

		#ifdef FIX_417_TD_DECORR_BRATE_SW
		ivas_error ivas_td_decorr_reconfig_dec(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate, /* i : total IVAS bitrate */
		@@ -3740,12 +3739,6 @@ float configure_reqularization_factor(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int32_t ivas_total_brate /* i : total IVAS bitrate */
		);
		#else
		ivas_error ivas_dirac_dec_init_binaural_data(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i : HRTF structure for rendering */
		);
		#endif

		void computeDiffuseness_mdft(
		float **buffer_intensity[DIRAC_NUM_DIMS],

+0 −4

Original line number	Diff line number	Diff line
		@@ -87,10 +87,8 @@ static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = {
		};


		#ifdef FIX_417_TD_DECORR_BRATE_SW
		#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f )
		#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f )
		#endif

		/------------------------------------------------------------------------------------------
		* Local functions declaration
		@@ -101,7 +99,6 @@ static int16_t ivas_get_APD_filt_orders( const int16_t num_out_chans, const int3
		static void ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const int16_t num_out_chans, const int16_t ducking_flag );


		#ifdef FIX_417_TD_DECORR_BRATE_SW
		/*-------------------------------------------------------------------------
		* ivas_td_decorr_reconfig_dec()
		*
		@@ -191,7 +188,6 @@ ivas_error ivas_td_decorr_reconfig_dec(

		return IVAS_ERR_OK;
		}
		#endif


		/*-------------------------------------------------------------------------

+0 −1

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



		#define FIX_417_TD_DECORR_BRATE_SW /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */
		#define FIX_368_SBA_MODE /* Dlb: Fix for issue 368 */
		#define FIX_427_MAXIMUM_S_INDEX /* VA: issue 427: fix return index of function maximum_s() */
		#define FIX_431_PARAMMC_PLC_INTERPOLATOR /* FhG: Issue 431: fix missing interpolator reset for ParamMC PCL */

+0 −6

Original line number	Diff line number	Diff line
		@@ -1147,9 +1147,7 @@ ivas_error ivas_masa_dec_reconfigure(
		uint16_t *bit_stream;
		Decoder_State **sts;
		int32_t ivas_total_brate, last_ivas_total_brate;
		#ifdef FIX_417_TD_DECORR_BRATE_SW
		int16_t numCldfbAnalyses_old, numCldfbSyntheses_old;
		#endif
		ivas_error error;

		error = IVAS_ERR_OK;
		@@ -1157,9 +1155,7 @@ ivas_error ivas_masa_dec_reconfigure(
		ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
		last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;

		#ifdef FIX_417_TD_DECORR_BRATE_SW
		ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
		#endif

		#ifdef FIX_425_MASA_BRSW_RENDERER
		/* renderer might have changed, reselect */
		@@ -1244,7 +1240,6 @@ ivas_error ivas_masa_dec_reconfigure(
		st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );
		}
		#endif
		#ifdef FIX_417_TD_DECORR_BRATE_SW
		/-----------------------------------------------------------------
		* TD Decorrelator
		-----------------------------------------------------------------/
		@@ -1269,7 +1264,6 @@ ivas_error ivas_masa_dec_reconfigure(
		/-----------------------------------------------------------------
		* Set-up MASA coding elements and bitrates
		-----------------------------------------------------------------/
		#endif

		ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp );

+0 −13

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ ivas_error ivas_mcmasa_dec_reconfig(
		}
		else
		{
		#ifdef FIX_417_TD_DECORR_BRATE_SW
		/* if necessary, close/open td-decorrs */
		if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK )
		{
		@@ -140,18 +139,6 @@ ivas_error ivas_mcmasa_dec_reconfig(

		/* regularization factor is bitrate-dependent */
		st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );
		#else
		/* the decision for useTdDecorr is done in ivas_dirac_dec_init_binaural_data(). here, comparing against the same condition. */
		if ( st_ivas->hDiracDecBin->useTdDecorr != ( ivas_total_brate < IVAS_48k && st_ivas->nchan_transport == 1 ) )
		{
		/* st_ivas->hDiracDecBin->useTdDecorr will change => close and re-open. */
		ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
		if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif
		}
		}