Merge branch 'main' into FIX_331_ALL_BRS (7ed171dc) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@ codec-smoke-test:
		- *print-common-info
		- bash ci/smoke_test.sh
		### analyze for failures
		- cat out/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt
		- if cat smoke_test_output.txt \| grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
		- if cat smoke_test_output_plc.txt \| grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
		- if cat smoke_test_output_jbm_noEXT.txt \| grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi

+26 −21

Original line number	Diff line number	Diff line
		@@ -536,6 +536,9 @@ 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 */
		@@ -754,11 +757,12 @@ 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 )
		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 ) )
		{
		@@ -1323,6 +1327,7 @@ ivas_error config_acelp1(
		else
		{
		int16_t nb_prm = 4;

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1801,7 +1801,11 @@ 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
		{

+23 −1

Original line number	Diff line number	Diff line
		@@ -1391,6 +1391,25 @@ 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
		#define FDCNG_VQ_DCT_MAXTRUNC 18
		#define FDCNG_VQ_MAX_LEN_WB 21

		#define FDCNG_VQ_DCT_NPOST 8

		typedef enum _DCTTYPE
		{
		DCT_T2_24_XX = 0, /* truncated DCT_T2_24 */
		IDCT_T2_XX_24 = 1,
		DCT_T2_21_XX = 2, /* truncated DCT_T2_21 */
		IDCT_T2_XX_21 = 3
		} DCTTYPE;

		#endif

		#define MSSUBFRLEN 12
		#define MSNUMSUBFR 6
		#define MSBUFLEN 5
		@@ -1513,7 +1532,10 @@ enum
		#define TOD_NSPEC 80 /* number of spectral bins of the tonal detector */
		#define TOD_THR_MASS 0.86f /* initial value for the adaptive threshold of the tonal detector */
		#define P2A_FACT 0.9f /* long-term averaging factor for peak-to-average ratio */
		#define THR_P2A 80.0f /* threshold to detect strongly peaky signals */
		#ifdef FIX_SP2A
		#define THR_P2A_HIGH 95.0f /* higher threshold to detect strongly peaky signals at low bitrates*/
		#endif
		#define THR_P2A 80.0f /* lower threshold to detect strongly peaky signals at higher bitrates */

		/----------------------------------------------------------------------------------
		* LD music post-filter constants

+12 −1

Original line number	Diff line number	Diff line
		@@ -793,7 +793,7 @@ enum fea_names
		#define TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ( TDM_SECONDARY_SIGNALLING + TDM_RATIO_BITS + TDM_LP_REUSE_BITS + TDM_LR_CONTENT_BITS + STEREO_BITS_TCA )
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		#define TDM_IC_LSF_PRED_BITS 1 /* Number of bits to code the inter channel lsf prediction mode */
		#define TDM_IC_LSF_PRED_BITS 1 /* number of bits to code the inter channel LSF prediction mode */
		#endif
		#endif

		@@ -986,6 +986,9 @@ typedef enum
		/* Common SPAR metadata constants */
		#define IVAS_ACTIVEW_DM_F_SCALE 0.5f
		#define IVAS_ACTIVEW_DM_F_SCALE_DTX 0.25f
		#ifdef LBR_SBA
		#define IVAS_ACTIVEW_DM_F_SCALE_VLBR 0.25f
		#endif
		#define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN 24000

		#define MAX_QUANT_STRATS 3
		@@ -1018,7 +1021,11 @@ typedef enum
		DECX_COEFF
		} ivas_coeffs_type_t;

		#ifdef LBR_SBA
		#define IVAS_SPAR_BR_TABLE_LEN 20
		#else
		#define IVAS_SPAR_BR_TABLE_LEN 18
		#endif

		/* TD decorr */ // VE: not all 16CH are currently supported -> t be revisited later
		enum
		@@ -1442,7 +1449,11 @@ typedef enum
		#define SFX_SPAT_BIN_NUM_SUBSAMPLES 64
		#define ITD_MEM_LEN (MAX_ITD + SFX_SPAT_BIN_SINC_M)
		#define L_SUBFRAME5MS_48k (L_FRAME48k/4)
		#ifdef FIX_421_TD_INT_TUNE
		#define MAX_ANGULAR_STEP (0.01f)
		#else
		#define MAX_ANGULAR_STEP (1.0f)
		#endif
		#define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP )
		#define MAX_INTERPOLATION_STEPS 12