remove more JBM obsolete code; under FIX_1101_CLEANING_JBM_CALL (37e2b518) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_jbm_dec.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ ivas_error ivas_jbm_dec_tc(
		}
		}

		#ifndef FIX_1101_CLEANING_JBM_CALL
		if ( !st_ivas->hDecoderConfig->Opt_tsm )
		{
		for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
		@@ -110,7 +111,7 @@ ivas_error ivas_jbm_dec_tc(
		st_ivas->hTcBuffer->tc[n] = st_ivas->p_output_f[n];
		}
		}

		#endif
		/----------------------------------------------------------------
		* Decoding + pre-rendering
		----------------------------------------------------------------/
		@@ -2828,7 +2829,9 @@ void ivas_jbm_dec_copy_tc_no_tsm(
		const int16_t output_frame /* i : output frame size */
		)
		{
		#ifndef FIX_1101_CLEANING_JBM_CALL
		int16_t n_ch_full_copy;
		#endif
		int16_t n_ch_cldfb;
		int16_t ch_idx;
		DECODER_TC_BUFFER_HANDLE hTcBuffer;
		@@ -2836,9 +2839,12 @@ void ivas_jbm_dec_copy_tc_no_tsm(
		hTcBuffer = st_ivas->hTcBuffer;
		hTcBuffer->n_samples_buffered = output_frame;
		hTcBuffer->n_samples_available = hTcBuffer->n_samples_buffered;
		#ifndef FIX_1101_CLEANING_JBM_CALL
		n_ch_full_copy = min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
		#endif
		n_ch_cldfb = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full;

		#ifndef FIX_1101_CLEANING_JBM_CALL
		/* copy full tcs*/
		if ( st_ivas->hDecoderConfig->Opt_tsm )
		{
		@@ -2847,6 +2853,7 @@ void ivas_jbm_dec_copy_tc_no_tsm(
		mvr2r( tc[ch_idx], st_ivas->hTcBuffer->tc[ch_idx], hTcBuffer->n_samples_buffered );
		}
		}
		#endif
		ch_idx = 0;

		/* CLDFB ana for ParamMC/ParamISM */