Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec... (652c4d0c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

ci/remove_unsupported_testcases.py

+7 −2

Original line number	Diff line number	Diff line
		@@ -104,8 +104,9 @@ TESTCASES_MAIN_PC = [
		"Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM_REVERB out",
		"OSBA 2OA 2ISM bitrate switching, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, JBM Prof 5",
		]


		TESTCASES_MAIN_PC_REENABLE = [
		"4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id",
		]
		def remove_testcases(cfg: Path, testcases: list):
		"""
		Go through file line by line and copy all testcases except the given ones
		@@ -136,7 +137,11 @@ if __name__ == "__main__":

		testcases = TESTCASES_MAIN
		if args.use_main_pc_set:
		# Add further unsupported test cases
		testcases.extend(TESTCASES_MAIN_PC)
		# Re-enable test cases that are now supported
		for case in TESTCASES_MAIN_PC_REENABLE:
		testcases.remove(case)

		for f in args.cfg_files:
		remove_testcases(f, testcases)

lib_com/bits_alloc.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -552,9 +552,6 @@ 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 */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		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 */
		@@ -772,11 +769,7 @@ ivas_error config_acelp1(

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

lib_com/cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -524,9 +524,7 @@ enum
		#define ACELP_TCX_TRANS_NS 1250000 /* Duration of the ACELP->TCX overlap - 1.25 ms */
		#define L_FRAME_MAX L_FRAME48k /* Max 20ms frame size @48kHz */
		#define L_FRAME_PLUS 1200 /* Max frame size (long TCX frame) */
		#ifdef FIX_1320_STACK_CPE_DECODER
		#define L_FRAME_PLUS_INTERNAL 800 /* Max frame size (long TCX frame) at maximum internal sampling rate */
		#endif
		#define L_MDCT_OVLP_MAX NS2SA( 48000, ACELP_LOOK_NS ) /* = Max mdct overlap */
		#define N_TCX10_MAX 480 /* Max size of TCX10 MDCT spectrum */
		#define BITS_TEC 1 /* number of bits for TEC */

lib_com/ivas_cnst.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -172,13 +172,8 @@ typedef enum
		#define JBM_CLDFB_SLOTS_IN_SUBFRAME 4
		#define MAX_JBM_CLDFB_TIMESLOTS 32
		#define DEFAULT_JBM_CLDFB_TIMESLOTS 16
		#ifdef JBM_MEMORY_OPT
		#define MAX_JBM_L_FRAME48k ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920: max. time-scaled frame buffer length (per channel) in samples */
		#define MAX_JBM_L_FRAME_NS 40000000L /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k */
		#else
		#define MAX_JBM_L_FRAME48k 1920
		#define MAX_JBM_L_FRAME_NS 40000000L
		#endif
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
		#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */

lib_com/ivas_prot.h

+0 −21

Original line number	Diff line number	Diff line
		@@ -259,7 +259,6 @@ uint32_t ivas_syn_output(
		int16_t synth_out / o : integer 16 bits synthesis signal */
		);

		#ifdef JBM_MEMORY_OPT
		void ivas_buffer_interleaved_to_deinterleaved(
		float audio, / i/o: audio buffer */
		const int16_t n_channels, /* i : number of channels */
		@@ -273,14 +272,6 @@ void ivas_buffer_deinterleaved_to_interleaved(
		const int16_t frame_length, /* i : frame length (one channel) */
		float audio_out / o : interleaved audio buffer */
		);
		#else
		void ivas_syn_output_f(
		float synth[], / i/o: float synthesis signal */
		const int16_t output_frame, /* i : output frame length (one channel) */
		const int16_t n_channels, /* i : number of output channels */
		float synth_out / o : integer 16 bits synthesis signal */
		);
		#endif

		void ivas_initialize_handles_enc(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		@@ -849,10 +840,6 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t nSamplesForRendering, /* i : number of TC samples available for rendering */
		int16_t nSamplesResidual / o : number of samples not fitting into the renderer grid and buffer for the next call*/
		#ifndef JBM_MEMORY_OPT
		,
		float data / i/o: time-scaled transport channels */
		#endif
		);

		void ivas_dec_prepare_renderer(
		@@ -2122,9 +2109,6 @@ void td_stereo_param_updt(
		const float lsp_old_PCh[], /* i : primary channel old LSPs */
		const float lsf_old_PCh[], /* i : primary channel old LSFs */
		const float pitch_buf_PCh[], /* i : primary channel pitch buffer */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		float tdm_lspQ_PCh[], /* o : Q LSPs for primary channel */
		#endif
		float tdm_lsfQ_PCh[], /* o : Q LSFs for primary channel */
		float tdm_Pri_pitch_buf[], /* o : pitch values for primary channel */
		const int16_t flag_ACELP16k, /* i : ACELP@16kHz flag */
		@@ -3727,13 +3711,8 @@ void ivas_dirac_dec_render_sf(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[], / i/o: synthesized core-coder transport channels/DirAC output */
		const int16_t nchan_transport, /* i : number of transport channels */
		#ifdef FIX_1319_STACK_SBA_DECODER
		float *pppQMfFrame_ts_re[HOA3_CHANNELS][CLDFB_NO_COL_MAX],
		float *pppQMfFrame_ts_im[HOA3_CHANNELS][CLDFB_NO_COL_MAX]
		#else
		float *pppQMfFrame_ts_re[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX],
		float *pppQMfFrame_ts_im[IVAS_MAX_FB_MIXER_IN_CH][CLDFB_NO_COL_MAX]
		#endif
		);

		void computeDiffuseness_mdft(