- Merge remote-tracking branch 'remotes/origin/main' into 1023-unused-function-ivas_param_mc_dec (c10581d7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2044,7 +2044,7 @@ coverage-test-on-main-scheduled:
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n auto --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec
		# need to ignore non-zero exit codes as limiter is active and thus the different framesiszes will not be BE in all cases
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 5 --decoder_only \|\| true
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only \|\| true
		- python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --dut_encoder_path ./IVAS_cod --dut_decoder_path ./IVAS_dec --dut_fr 10 --decoder_only \|\| true
		- python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_ref
		- python3 -m pytest -q -n auto tests/renderer/test_renderer.py --create_cut
		- lcov -c -d obj -o coverage_stv.info # extract coverage of short test vectors here

apps/decoder.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -3366,14 +3366,10 @@ static ivas_error decodeVoIP(
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		if ( vec_pos_update == 0 )
		{
		systemTime_ms += vec_pos_len * systemTimeInc_ms;
		}
		#else
		systemTime_ms += systemTimeInc_ms;
		#endif

		#ifdef WMOPS
		update_mem();
		@@ -3382,7 +3378,6 @@ static ivas_error decodeVoIP(
		}


		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		int16_t nSamplesFlushed = 0;

		/* decode and get samples */
		@@ -3460,7 +3455,6 @@ static ivas_error decodeVoIP(
		}
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Add zeros at the end to have equal length of synthesized signals

lib_com/ivas_prot.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -769,9 +769,7 @@ void dtx_read_padding_bits(
		);

		void ivas_apply_non_diegetic_panning(
		#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING
		float input_f, / i : non-diegetic object */
		#endif
		float output_f[], / o : core-coder transport mono channel/stereo output */
		const float non_diegetic_pan_gain, /* i : non-diegetic panning gain */
		const int16_t output_frame /* i : output frame length per channel */
		@@ -3499,13 +3497,6 @@ ivas_error ivas_cldfb_dec_reconfig(
		const int16_t numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
		);

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA planar flag */
		);
		#endif
		/! r: Ambisonic (SBA) order used for analysis and coding /
		int16_t ivas_sba_get_analysis_order(
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */

lib_com/ivas_sba_config.c

+0 −47

Original line number	Diff line number	Diff line
		@@ -64,23 +64,7 @@ void ivas_sba_config(
		int16_t element_mode / o : element mode of the core coder */
		)
		{
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )
		{
		assert( 0 && "Either order or number of channels must be positive" );
		}
		else if ( sba_order < 0 )
		{
		sba_order = ivas_sba_get_order( nb_channels, sba_planar );
		}
		else if ( nb_channels < 0 )
		{
		nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );
		}
		else
		#else
		if ( nb_channels > 0 )
		#endif
		{
		if ( sba_planar )
		{
		@@ -121,37 +105,6 @@ void ivas_sba_config(
		return;
		}

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/-------------------------------------------------------------------
		* ivas_sba_get_order()
		*
		* Get Ambisonic order from number of ambisonic channels
		-------------------------------------------------------------------/

		/! r: Ambisonic (SBA) order /
		int16_t ivas_sba_get_order(
		const int16_t nb_channels, /* i : Number of ambisonic channels */
		const int16_t sba_planar /* i : SBA Planar flag */
		)
		{
		int16_t sba_order;

		if ( sba_planar )
		{
		sba_order = ( nb_channels - 1 ) / 2;
		assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );
		}
		else
		{
		sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;
		assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );
		}

		assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );

		return ( sba_order );
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_analysis_order()

lib_com/ivas_stat_com.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,6 @@ typedef struct ivas_spar_md_com_cfg
		int16_t max_bits_per_blk;
		int16_t prev_quant_idx;
		int16_t agc_bits_ch_idx;
		int16_t planarCP;
		int16_t num_umx_chs;
		int16_t max_md_bits_spar;