Merge branch 'main' into 145-static-memory-of-fastconv-binaural-handle (4d03bcd5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+2 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ codec-comparison-on-main-push:
		- git checkout $latest_commit

		# helper variable - "\|\| true" to prevent failures from grep not finding anything
		- non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true
		- non_be_flag=$(echo $CI_COMMIT_MESSAGE \| grep -c --ignore-case "\[non[ -]*be\]") \|\| true

		### prepare pytest
		# create short test vectors
		@@ -481,6 +481,7 @@ codec-comparison-on-main-push:
		when: always
		paths:
		- ep_015.g192
		- "CLANG*/logs"

		sanitizer-test-mono:
		extends: .sanitizer-test-template

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_pca_tools.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -152,7 +152,11 @@ static void house_refl(
		pu[0] -= 1;
		}

		#ifdef FIX_I120_INV_SQRT
		_rcp = inv_sqrt( fabsf( pu[0] ) );
		#else
		_rcp = 1.f / sqrtf( fabsf( pu[0] ) );
		#endif

		for ( i = 0; i < sizex; i++ )
		{
		@@ -645,7 +649,11 @@ static void norm_quat(

		norm_q = dotp( q, q, IVAS_PCA_INTERP );

		#ifdef FIX_I120_INV_SQRT
		norm_q = inv_sqrt( norm_q ); // VE: TBV: possible division by 0
		#else
		norm_q = 1 / sqrtf( norm_q ); // VE: TBV: possible division by 0
		#endif

		for ( i = 0; i < IVAS_PCA_INTERP; i++ )
		{