Merge branch 'cleanup_20221007' into 'main' (35967113) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bitstream.c

+0 −28

Original line number	Diff line number	Diff line
		@@ -1820,11 +1820,7 @@ ivas_error preview_indices(
		break;
		}
		}
		#ifdef ALIGN_SID_SIZE
		else if ( total_brate == IVAS_SID_5k2 )
		#else
		else if ( total_brate == IVAS_SID_4k4 )
		#endif
		{
		/* read SID format */
		st_ivas->sid_format = 0;
		@@ -1888,16 +1884,6 @@ ivas_error preview_indices(
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Invalid value %c found in SID format field.", st_ivas->sid_format );
		}
		}
		#ifndef ALIGN_SID_SIZE
		else if ( total_brate == IVAS_SID_5k )
		{
		/* SBA SID frame */
		st_ivas->sid_format = SID_SBA_1TC;
		st_ivas->ivas_format = SBA_FORMAT;
		st_ivas->sba_mode = SBA_MODE_SPAR;
		st_ivas->element_mode_init = IVAS_SCE;
		}
		#endif

		/* only read element mode from active frames */
		if ( is_DTXrate( total_brate ) == 0 )
		@@ -2072,19 +2058,7 @@ ivas_error read_indices(
		}
		else if ( k == SIZE_IVAS_BRATE_TBL )
		{
		#ifdef ALIGN_SID_SIZE
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in the G.192 frame ! Exiting ! \n", total_brate );
		#else
		/temp change for SPAR DTX/
		if ( total_brate == IVAS_SID_5k )
		{
		st_ivas->element_mode_init = -1;
		}
		else
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error, illegal bitrate (%d) in the G.192 frame ! Exiting ! \n", total_brate );
		}
		#endif
		}
		else
		{
		@@ -2978,7 +2952,6 @@ void evs_dec_previewFrame(
		}


		#ifdef ALIGN_SID_SIZE
		void dtx_read_padding_bits(
		DEC_CORE_HANDLE st,
		int16_t num_bits )
		@@ -2990,6 +2963,5 @@ void dtx_read_padding_bits(
		get_next_indice( st, num_bits );
		st->total_brate = tmp;
		}
		#endif

		#undef WMC_TOOL_MAN

lib_com/ivas_cnst.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -165,9 +165,6 @@ typedef enum
		#define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */
		#define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/
		#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) */
		#ifndef FIX_CREND_CHANNELS
		#define IVAS_MAX_NUM_CH 16 /* == MAX_OUTPUT_CHANNELS */
		#endif

		#define FOA_CHANNELS 4 /* number of FOA channels */

		@@ -197,12 +194,7 @@ typedef enum
		/----------------------------------------------------------------------------------
		* IVAS Bitrates
		----------------------------------------------------------------------------------/
		#ifdef ALIGN_SID_SIZE
		#define IVAS_SID_5k2 5200 /* SID frame bitrate */
		#else
		#define IVAS_SID_4k4 4400 /* SID frame bitrate */
		#define IVAS_SID_5k 5000 /* SBA SID frame bitrate */
		#endif
		#define IVAS_13k2 13200
		#define IVAS_16k4 16400
		#define IVAS_24k4 24400
		@@ -220,13 +212,8 @@ typedef enum

		#define IVAS_BRATE_MAX IVAS_512k

		#ifdef ALIGN_SID_SIZE
		#define SIZE_IVAS_BRATE_TBL 16
		#define IVAS_NUM_ACTIVE_BRATES (SIZE_IVAS_BRATE_TBL - 2)
		#else
		#define SIZE_IVAS_BRATE_TBL 17
		#define IVAS_NUM_ACTIVE_BRATES (SIZE_IVAS_BRATE_TBL - 3)
		#endif

		/----------------------------------------------------------------------------------
		* IVAS modes : IVAS SCE, IVAS CPE modes (DFT, TD, MDCT stereo)
		@@ -842,9 +829,7 @@ typedef enum {
		----------------------------------------------------------------------------------/
		// VE: this should be renamed to e.g. N_SPATIAL_SUBFRAMES
		#define MAX_PARAM_SPATIAL_SUBFRAMES 4 /* Maximum number of subframes for parameteric spatial coding */
		#ifdef FIX_I106_TDREND_5MS
		#define L_SPATIAL_SUBFR_48k (L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES)
		#endif


		/----------------------------------------------------------------------------------

lib_com/ivas_dirac_com.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -337,11 +337,7 @@ ivas_error ivas_dirac_sba_config(
		if ( sba_mode == SBA_MODE_SPAR )
		{
		/map the bitrate for SID frame/
		#ifdef ALIGN_SID_SIZE
		if ( sba_total_brate == IVAS_SID_5k2 )
		#else
		if ( sba_total_brate == IVAS_SID_5k )
		#endif
		{
		if ( *element_mode == IVAS_SCE )
		{
		@@ -438,11 +434,7 @@ ivas_error ivas_dirac_sba_config(
		return error;
		}

		#ifdef ALIGN_SID_SIZE
		if ( sba_total_brate > IVAS_SID_5k2 )
		#else
		if ( sba_total_brate > IVAS_SID_4k4 )
		#endif
		{
		#ifdef HARMONIZE_SBA_NCHAN_TRANSPORT
		*nchan_transport = ivas_get_sba_num_TCs( sba_total_brate, sba_order );
		@@ -450,11 +442,7 @@ ivas_error ivas_dirac_sba_config(
		*nchan_transport = ivas_dirac_getNumTransportChannels( sba_total_brate, sba_order, sba_planar );
		#endif
		}
		#ifdef ALIGN_SID_SIZE
		else if ( sba_total_brate == IVAS_SID_5k2 )
		#else
		else if ( sba_total_brate == IVAS_SID_4k4 )
		#endif
		{
		switch ( *element_mode )
		{

lib_com/ivas_prot.h

+0 −20

Original line number	Diff line number	Diff line
		@@ -2782,12 +2782,7 @@ void reset_metadata_spatial(
		int32_t total_brate, / o : total bitrate */
		const int32_t core_brate, /* i : core bitrate */
		const int16_t nb_bits_metadata, /* i : number of meatdata bits */
		#ifndef ALIGN_SID_SIZE
		const SBA_MODE sba_mode, /* i : SBA mode */
		const int16_t element_mode /* i : element mode */
		#else
		const SBA_MODE sba_mode /* i : SBA mode */
		#endif
		);

		/! r: number of bits written /
		@@ -4956,21 +4951,12 @@ void TDREND_HRFILT_SetFiltSet(
		#endif

		ivas_error TDREND_REND_RenderSourceHRFilt(
		#ifdef FIX_I106_TDREND_5MS
		TDREND_SRC_t Src_p, / i/o: The source to be rendered */
		#else
		const TDREND_SRC_t Src_p, / i/o: The source to be rendered */
		#endif
		#ifdef TDREND_HRTF_TABLE_METHODS
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
		#endif
		#ifdef FIX_I106_TDREND_5MS
		float output_buf[][L_SPATIAL_SUBFR_48k], /* o : Output buffer */
		const int16_t subframe_length, /* i : Subframe length in use */
		#else
		float output_buf[][L_FRAME48k], /* o : Output buffer */
		const int16_t output_frame, /* i : Output frame length in use */
		#endif
		const int32_t output_Fs /* i : Output sample rate */
		);

		@@ -5110,11 +5096,7 @@ void TDREND_SFX_SpatBin_SetParams(
		void TDREND_SFX_SpatBin_Execute_Main(
		SFX_SpatBin_t SfxSpatBin_p, / i/o: Spatial parameters handle */
		const float InBuffer_p, / i : Input buffer */
		#ifdef FIX_I106_TDREND_5MS
		const int16_t subframe_length, /* i : subframe length */
		#else
		const int16_t output_frame, /* i : frame length */
		#endif
		float LeftOutBuffer_p, / o : Rendered left channel */
		float RightOutBuffer_p, / o : Rendered right channel */
		int16_t NoOfUsedInputSamples_p, / o : Number of input samples actually used */
		@@ -5494,10 +5476,8 @@ float rand_triangular_signed(

		/* clang-format on */

		#ifdef ALIGN_SID_SIZE
		void dtx_read_padding_bits(
		DEC_CORE_HANDLE st,
		int16_t num_bits );
		#endif

		#endif /* IVAS_PROT_H */

lib_com/ivas_rom_com.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -49,11 +49,7 @@

		const int32_t ivas_brate_tbl[SIZE_IVAS_BRATE_TBL] =
		{
		#ifdef ALIGN_SID_SIZE
		FRAME_NO_DATA, IVAS_SID_5k2,
		#else
		FRAME_NO_DATA, IVAS_SID_4k4, IVAS_SID_5k,
		#endif
		IVAS_13k2, IVAS_16k4, IVAS_24k4, IVAS_32k, IVAS_48k,
		IVAS_64k, IVAS_80k, IVAS_96k, IVAS_128k, IVAS_160k,
		IVAS_192k, IVAS_256k, IVAS_384k, IVAS_512k