[cleanup] accept UNIFIED_DECODING_PATHS_LEFTOVERS (73c02708) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_cnst.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -195,11 +195,7 @@ typedef enum
		#define MAX_JBM_L_FRAME48k 1920
		#define MAX_JBM_L_FRAME_NS 40000000L
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */
		#else
		#define MAX_CLDFB_DIGEST_CHANNELS (FOA_CHANNELS + MAX_NUM_OBJECTS)
		#endif

		typedef enum
		{

lib_com/ivas_prot_fx.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -648,21 +648,6 @@ void ivas_jbm_dec_get_adapted_subframes_fx(
		Word16 nb_subframes / i/o: number of subframes in the frame */
		);

		#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
		void ivas_jbm_dec_copy_tc_no_tsm_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle Q0 */
		Word32 tc_fx[], / i : transport channels Q11 */
		const Word16 output_frame /* i : output frame size Q0 */
		);

		void ivas_ism_param_dec_tc_gain_ajust_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const UWord16 nSamples, /* i : number of samples to be compensate */
		const UWord16 nFadeLength, /* i : length of the crossfade in samples */
		Word32 transport_channels_f[], / i : synthesized core-coder transport channels/DirAC output Q_tc*/
		Word16 Q_tc / i/o : Q of input tc buffer */
		);
		#endif
		/! r: number of bits read /
		Word16 read_GR0(
		const UWord16 bit_stream, / i : bitstream to be read */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@
		#define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */
		#define FIX_1388_MSAN_ivas_init_decoder /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */
		#define FIX_1288_SPLIT_REND_XSAN /* Dlb: Fix asan, msan and usan issues in split rendering mode*/
		#define UNIFIED_DECODING_PATHS_LEFTOVERS /* VA: issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS */
		#define FIX_NCHAN_BUFFERS /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */
		#define FIX_RENDERER_STACK /* VA: issue 1322: reduction of renderers' buffers size */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */

lib_dec/ivas_ism_param_dec_fx.c

+0 −74

Original line number	Diff line number	Diff line
		@@ -44,14 +44,12 @@
		#include "debug.h"


		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		/-----------------------------------------------------------------------
		* Local function declarations
		-----------------------------------------------------------------------/

		static void ivas_ism_param_dec_tc_gain_adjust_fx( Decoder_Struct st_ivas, const Word16 nSamples, const Word16 nFadeLength, Word32 p_data_fx[], Word16 *q_data );

		#endif

		/-----------------------------------------------------------------------
		* Local function definitions
		@@ -1090,30 +1088,13 @@ void ivas_param_ism_dec_digest_tc_fx(
		const Word16 q_data_in /* i : Q-factor of input signal for single channel */
		)
		{
		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		Word16 i, ch, slot_idx, output_frame;
		Word16 num_freq_bands, cldfb_ch, n_ch_cldfb;
		Word32 cldfb_real_buffer, cldfb_imag_buffer;
		Word16 q_data = q_data_in;
		move16();
		#else
		move16();
		move16();
		move16();

		Word16 q_tc = q_data_in;
		move16();
		Word16 ch, nchan_transport, i;
		Word16 slot_idx;

		Word16 output_frame;
		PARAM_ISM_DEC_HANDLE hParamIsmDec;
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		Word16 fade_len;
		#endif

		/* Initialization */
		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		num_freq_bands = st_ivas->hSpatParamRendCom->num_freq_bands;
		move16();
		output_frame = imult1616( nCldfbSlots, st_ivas->hSpatParamRendCom->num_freq_bands );
		@@ -1141,35 +1122,7 @@ void ivas_param_ism_dec_digest_tc_fx(
		move16();
		}
		}
		#else
		hParamIsmDec = st_ivas->hParamIsmDec;
		assert( hParamIsmDec );
		hSpatParamRendCom = st_ivas->hSpatParamRendCom;
		assert( hSpatParamRendCom );
		output_frame = imult1616( nCldfbSlots, hSpatParamRendCom->num_freq_bands );
		fade_len = shr( output_frame, 1 );

		nchan_transport = st_ivas->nchan_transport;
		move16();

		IF( st_ivas->hDecoderConfig->Opt_tsm )
		{
		/TODO : FhG to check/
		ivas_ism_param_dec_tc_gain_ajust_fx( st_ivas, output_frame, fade_len, transport_channels, &q_tc );

		IF( NE_16( q_tc, q_tc_in ) )
		{
		FOR( i = 0; i < 2; i++ )
		{
		scale_sig32( transport_channels[i], output_frame, sub( q_tc_in, q_tc ) ); // q_tc_in
		}
		q_tc = q_tc_in;
		move16();
		}
		}
		#endif

		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		/* CLDFB Analysis */
		FOR( ( ch = 0, cldfb_ch = 0 ); cldfb_ch < n_ch_cldfb; ( cldfb_ch++, ch++ ) )
		{
		@@ -1189,29 +1142,6 @@ void ivas_param_ism_dec_digest_tc_fx(
		move16();
		}
		}
		#else
		FOR( ch = 0; ch < nchan_transport; ch++ )
		{
		/* CLDFB Analysis */
		FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
		{
		IF( st_ivas->hDecoderConfig->Opt_tsm )
		{
		Word32 RealBuffer_fx[CLDFB_NO_CHANNELS_MAX];
		Word32 ImagBuffer_fx[CLDFB_NO_CHANNELS_MAX];
		q_tc = q_tc_in;
		move16();
		cldfbAnalysis_ts_fx_fixed_q( &( transport_channels[ch][hSpatParamRendCom->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hSpatParamRendCom->num_freq_bands, st_ivas->cldfbAnaDec[ch], &q_tc );
		Copy32( RealBuffer_fx, &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );
		Copy32( ImagBuffer_fx, &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[slot_idx * hSpatParamRendCom->num_freq_bands * nchan_transport + ch * hSpatParamRendCom->num_freq_bands], hSpatParamRendCom->num_freq_bands );
		hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp = sub( 31, q_tc );
		move16();
		hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = sub( 31, q_tc );
		move16();
		}
		}
		}
		#endif

		return;
		}
		@@ -1437,11 +1367,7 @@ void ivas_param_ism_dec_prepare_renderer_fx(
		*
		-------------------------------------------------------------------------/

		#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
		static void ivas_ism_param_dec_tc_gain_adjust_fx(
		#else
		void ivas_ism_param_dec_tc_gain_ajust_fx(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const Word16 nSamples, /* i : number of samples to be compensate */
		const Word16 nFadeLength, /* i : length of the crossfade in samples */

lib_dec/ivas_jbm_dec_fx.c

+0 −324

File changed.

Preview size limit exceeded, changes collapsed.