strip out anything related to UNIFY_CHANNEL_MEM_HEAP, will be a distinct MR (59b3631f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -190,10 +190,6 @@ typedef enum
		TC_BUFFER_MODE_BUFFER
		} TC_BUFFER_MODE;

		#ifdef UNIFY_CHANNEL_MEM_HEAP
		#define TC_BUFFER_NUM_FULL_CHAN_UNKNOWN -1
		#define TC_BUFFER_NUM_FULL_CHAN_DONT_COUNT 0
		#endif

		/----------------------------------------------------------------------------------
		* IVAS Bitrates
		@@ -1218,9 +1214,6 @@ enum
		#define MASA_STEREO_MIN_BITRATE IVAS_24k4
		#define MAXIMUM_OMASA_FREQ_BANDS 8 /* Corresponds to maximum number of coding bands at 32 kbps */
		#define OMASA_STEREO_SW_CNT_MAX 100
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		#define OMASA_TDREND_MATCHING_GAIN 0.7943f
		#endif
		#define MASA_BIT_REDUCT_PARAM 10
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4

lib_com/ivas_prot.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -854,12 +854,6 @@ void ivas_jbm_dec_get_md_map(

		int16_t ivas_jbm_dec_get_num_tc_channels(
		Decoder_Struct st_ivas / i : IVAS decoder handle */
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		,
		int16_t nchan_transport_jbm, / o : number of TSM channels */
		int16_t nchan_transport_internal, / o : number of internal channels (i.e. plus e.g. addtl. decorr */
		int16_t nchan_transport_full / o : number of channels to allocate fully */
		#endif
		);

		void ivas_jbm_dec_copy_tc_no_tsm(
		@@ -882,14 +876,10 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(

		/! r: render granularity /
		int16_t ivas_jbm_dec_get_render_granularity(
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		Decoder_Struct st_ivas / i : main decoder structure */
		#else
		const RENDERER_TYPE rendererType, /* i : renderer type */
		const IVAS_FORMAT ivas_format, /* i : ivas format */
		const MC_MODE mc_mode, /* i : MC mode */
		const int32_t output_Fs /* i : sampling rate */
		#endif
		);

		ivas_error ivas_jbm_dec_tc_buffer_open(
		@@ -903,14 +893,12 @@ ivas_error ivas_jbm_dec_tc_buffer_open(

		ivas_error ivas_jbm_dec_tc_buffer_reconfigure(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		#ifndef UNIFY_CHANNEL_MEM_HEAP
		,
		const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */
		const int16_t nchan_transport_jbm, /* i : new number of real transport channels */
		const int16_t nchan_transport_internal, /* i : new number of totally buffered channels */
		const int16_t nchan_full, /* i : new number of channels to fully store */
		const int16_t n_samples_granularity /* i : new granularity of the renderer/buffer */
		#endif
		);

		void ivas_jbm_dec_tc_buffer_close(
		@@ -3695,9 +3683,6 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		const SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		);

		@@ -5942,9 +5927,6 @@ void ivas_omasa_separate_object_render(
		void ivas_omasa_separate_object_render_jbm(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesRendered, /* i : number of samples rendered */
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		float input_f[], / i : discrete objects transport time signal */
		#endif
		float output_f[], / o : rendered time signal */
		const int16_t subframes_rendered, /* i : number of subframes rendered */
		const int16_t slots_rendered /* i : number of CLDFB slots rendered */

lib_com/options.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -166,9 +166,6 @@
		#define NONBE_FIX_849_OMASA_BFI_CRASH /* VA: issue 849: fix OMASA 2TC and FEC crashes */

		#define NONBE_UNIFIED_DECODING_PATHS /* FhG: unify decoding paths */
		#ifdef NONBE_UNIFIED_DECODING_PATHS
		/#define UNIFY_CHANNEL_MEM_HEAP/
		#endif

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

lib_dec/fd_cng_dec.c

+0 −28

Original line number	Diff line number	Diff line
		@@ -1804,9 +1804,6 @@ void generate_masking_noise_lb_dirac(
		HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
		float tdBuffer, / i/o: time-domain signal, if NULL no LB-CNA */
		const int16_t nCldfbTs, /* i : number of CLDFB slots that will be rendered */
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		const SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial parameter rendering handle */
		#endif
		const int16_t cna_flag /* i : CNA flag for LB and HB */
		)
		{
		@@ -1943,31 +1940,6 @@ void generate_masking_noise_lb_dirac(
		n_samples_start += hFdCngCom->frameSize;
		}
		}
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		/* move to the real subframe start to avoid overwriting the LB signal */
		{
		int16_t slot_size_lb, slot_size_fb, move_size;
		int16_t n_samples_out_start_fb;
		int16_t n_samples_out_start_lb;
		slot_size_lb = hFdCngCom->frameSize / DEFAULT_JBM_CLDFB_TIMESLOTS;
		slot_size_fb = hSpatParamRendCom->slot_size;
		/* move from last to first subframe */
		n_samples_out_start_lb = ( hSpatParamRendCom->num_slots - hSpatParamRendCom->subframe_nbslots[hSpatParamRendCom->nb_subframes - 1] ) * slot_size_lb;
		n_samples_out_start_fb = ( hSpatParamRendCom->num_slots - hSpatParamRendCom->subframe_nbslots[hSpatParamRendCom->nb_subframes - 1] ) * slot_size_fb;

		for ( i = hSpatParamRendCom->nb_subframes - 1; i > 0; i-- )
		{
		move_size = hSpatParamRendCom->subframe_nbslots[i] * slot_size_lb;
		mvr2r( &tdBuffer[n_samples_out_start_lb], &tdBuffer[n_samples_out_start_fb], move_size );
		n_samples_out_start_lb -= hSpatParamRendCom->subframe_nbslots[i] * slot_size_lb;
		n_samples_out_start_fb -= hSpatParamRendCom->subframe_nbslots[i] * slot_size_fb;
		}
		#ifdef DEBUGGING
		assert( n_samples_out_start_fb == 0 );
		assert( n_samples_out_start_lb == 0 );
		#endif
		}
		#endif

		pop_wmops();

lib_dec/ivas_dirac_dec.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -1621,11 +1621,7 @@ void ivas_dirac_dec(
		{
		Decoder_State *st = st_ivas->hSCE[0]->hCoreCoder[0];
		st_ivas->hTcBuffer->tc[nchan_transport] = &cng_td_buffer[0];
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], DEFAULT_JBM_CLDFB_TIMESLOTS, st_ivas->hSpatParamRendCom, st->cna_dirac_flag && st->flag_cna );
		#else
		generate_masking_noise_lb_dirac( st->hFdCngDec->hFdCngCom, st_ivas->hTcBuffer->tc[1], DEFAULT_JBM_CLDFB_TIMESLOTS, st->cna_dirac_flag && st->flag_cna );
		#endif
		}

		ivas_dirac_dec_set_md_map( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS );
		@@ -2055,18 +2051,10 @@ void ivas_dirac_dec_render_sf(

		generate_masking_noise_dirac( st->hFdCngDec->hFdCngCom,
		st_ivas->cldfbAnaDec[1],
		#ifdef UNIFY_CHANNEL_MEM_HEAP
		&st_ivas->hTcBuffer->tc[1][slot_idx_start * hSpatParamRendCom->num_freq_bands],
		#else
		st_ivas->hTcBuffer->tc[1],
		#endif
		Cldfb_RealBuffer[1][0],
		Cldfb_ImagBuffer[1][0],
		#ifndef UNIFY_CHANNEL_MEM_HEAP
		index_slot,
		#else
		slot_idx,
		#endif
		st->cna_dirac_flag && st->flag_cna,
		( st->core_brate == FRAME_NO_DATA \|\| st->core_brate == SID_2k40 ) && st->cng_type == FD_CNG && st->cng_sba_flag );
		}