merge main (beb01e8d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1065,7 +1065,7 @@ complexity-ism-in-binaural-out:
		- *complexity-measurements-setup
		- in_format=ISM
		- out_format=BINAURAL
		- bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format"
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
		- *complexity-measurements-prepare-artifacts

		complexity-sba-hoa3-in-hoa3-out:

apps/encoder.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1648,18 +1648,17 @@ static void usage_enc( void )
		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );
		fprintf( stdout, "-stereo [Mode] : Stereo format, default is unified stereo \n" );
		fprintf( stdout, " optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo\n" );
		fprintf( stdout, "-stereo : Stereo format \n" );
		fprintf( stdout, "-ism (+)Ch Files : ISM format \n" );
		fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" );
		fprintf( stdout, " where positive (+) means extended metadata format is used (including orientation and radius) \n" );
		fprintf( stdout, " where positive (+) indicates extended metadata (only 64 kbps and up) \n" );
		fprintf( stdout, " and Files specify input files containing metadata, one file per object\n" );
		fprintf( stdout, " (use NULL for no input metadata)\n" );
		fprintf( stdout, "-sba +/-Order : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" );
		fprintf( stdout, " where Order specifies the Ambisionics order (1-3),\n" );
		fprintf( stdout, " where positive (+) means full 3D and negative (-) only 2D/planar components to be coded\n" );
		fprintf( stdout, "-masa Channels File : MASA format \n" );
		fprintf( stdout, " where Channels specifies the number of input/transport channels (1 or 2): \n" );
		fprintf( stdout, "-masa Ch File : MASA format \n" );
		fprintf( stdout, " where Ch specifies the number of input/transport channels (1 or 2): \n" );
		fprintf( stdout, " and File specifies input file containing parametric MASA metadata \n" );
		fprintf( stdout, "-mc InputConf : Multi-channel format\n" );
		fprintf( stdout, " where InputConf specifies the channel configuration: 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4\n" );

lib_com/bits_alloc.c

+21 −53

Original line number	Diff line number	Diff line
		@@ -536,9 +536,7 @@ ivas_error config_acelp1(
		const int16_t tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */
		const int16_t tdm_low_rate_mode, /* i : secondary channel low rate mode flag */
		const int16_t idchan, /* i : stereo channel ID */
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		const int16_t active_cnt, /* i : Active frame counter */
		#endif
		const int16_t tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag*/
		const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const int16_t GSC_IVAS_mode /* i : GSC IVAS mode */
		@@ -756,12 +754,10 @@ ivas_error config_acelp1(

		bits -= acelp_cfg->mid_lsf_bits;
		}
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )
		{
		bits -= TDM_IC_LSF_PRED_BITS;
		}
		#endif

		/* gain Q bit-budget - part 1 */
		if ( ( coder_type != UNVOICED && coder_type != AUDIO && coder_type != INACTIVE && !( core_brate <= ACELP_8k00 && coder_type != TRANSITION ) ) \|\| ( coder_type == INACTIVE && total_brate > MAX_GSC_INACTIVE_BRATE ) )
		@@ -1318,7 +1314,6 @@ ivas_error config_acelp1(
		{
		if ( idchan > 0 && element_mode == IVAS_CPE_TD )
		{
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL
		if ( !tdm_lp_reuse_flag )
		{
		acelp_cfg->lsf_bits += bits; /* increase LSF Q bits */
		@@ -1348,33 +1343,6 @@ ivas_error config_acelp1(
		bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits );
		}
		}
		#else
		int16_t nb_prm = 4;

		if ( tdm_low_rate_mode == 1 )
		{
		nb_prm = 2;
		}

		/* First add remaining bits on gains */
		if ( !( *uc_two_stage_flag ) )
		{
		bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, GAINSPRM, acelp_cfg->gains_mode );
		}

		/* Then, Increase pitch bit budget */
		if ( tdm_Pitch_reuse_flag == 0 && bits > 0 )
		{
		bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, PITCHPRM, acelp_cfg->pitch_bits );
		}

		/* Increase mid-lsf bit budget */
		if ( tdm_lp_reuse_flag == 0 && bits > 0 )
		{
		bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, MID_LSFSPRM, &acelp_cfg->mid_lsf_bits );
		bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits );
		}
		#endif
		#ifdef DEBUGGING
		if ( idchan > 0 && bits > 0 && ( coder_type > UNVOICED \|\| tdm_low_rate_mode == 0 ) )
		{

lib_com/bitstream.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1801,11 +1801,7 @@ ivas_error preview_indices(
		if ( bit_stream[2] == 0 )
		{
		st_ivas->ivas_format = SBA_FORMAT;
		#ifndef LBR_SBA
		st_ivas->sba_mode = ivas_sba_mode_select( total_brate );
		#else
		st_ivas->sba_mode = ivas_sba_mode_select();
		#endif
		}
		else
		{

lib_com/cnst.h

+6 −5

Original line number	Diff line number	Diff line
		@@ -294,9 +294,7 @@ enum
		IND_ISF_1_2,
		IND_ISF_1_3,
		IND_ISF_1_4,
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL
		IND_IC_LSF_PRED,
		#endif
		IND_GSC_ATTACK,
		IND_GSC_SWB_SPEECH,
		IND_NOISE_LEVEL,
		@@ -1391,7 +1389,6 @@ enum
		#define NPARTCLDFB 10
		#define NPART_SHAPING 62

		#ifdef ERI_FDCNGVQ_LOW_ROM
		#define FDCNG_VQ_MAX_LEN FD_CNG_maxN_37bits
		#define FDCNG_VQ_DCT_NSEGM 4
		#define FDCNG_VQ_DCT_MINTRUNC 8
		@@ -1408,7 +1405,6 @@ typedef enum _DCTTYPE
		IDCT_T2_XX_21 = 3
		} DCTTYPE;

		#endif

		#define MSSUBFRLEN 12
		#define MSNUMSUBFR 6
		@@ -1434,7 +1430,12 @@ typedef enum _DCTTYPE
		#define CHEAP_NORM_SIZE 161

		#define CNA_MAX_BRATE ACELP_13k20

		#ifdef FIX_I414_OOA_CNA
		#define CNA_INIT_NBANDS 6
		#else
		#define MAX_CNA_NBANDS 12
		#endif

		#define GAIN_Q_OFFSET_EVS 60.f
		#define GAIN_Q_OFFSET_IVAS 45.f