Merge branch 'main' into VA_basop_no_glob_extrem_saturation_part2 (232a38c7) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -239,7 +239,7 @@ stages:
		exit_codes:
		- 123
		artifacts:
		name: "mld--sha-$CI_COMMIT_SHORT_SHA--results"
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -274,7 +274,7 @@ stages:
		- testcase_timeout=300
		- python3 -m pytest $SHORT_TEST_SUITE -v --tb=no --update_ref 1 -m create_ref --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec
		artifacts:
		name: "ivas-pytest-dec-msan--sha-$CI_COMMIT_SHORT_SHA--results"
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		when: always
		expire_in: "2 weeks"
		paths:
		@@ -539,7 +539,7 @@ ivas-smoke-test-saturation:
		- if cat smoke_test_output_hrtf.txt \| grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
		- exit $ret_val
		artifacts:
		name: "ivas-smoke-test-saturation--sha-$CI_COMMIT_SHORT_SHA--results"
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		expire_in: 1 week
		when: always
		paths:
		@@ -578,7 +578,7 @@ be-2-evs-26444:
		- exit 0

		artifacts:
		name: "evs-26444--sha-$CI_COMMIT_SHORT_SHA--results"
		name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
		expire_in: 1 week
		when: always
		paths:

apps/decoder.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2461,12 +2461,13 @@ static ivas_error decodeVoIP(
		}
		}

		frame++;
		if ( !arg.quietModeEnabled )
		{
		fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		//frame++;
		systemTime_ms += systemTimeInc_ms;
		#ifdef WMOPS
		#ifndef DONT_COUNT

lib_com/bits_alloc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1428,6 +1428,7 @@ static int16_t allocate_unused(
		--------------------------------------------------------------------/

		/! r: ACELP16k flag /
		#ifndef IVAS_FLOAT_FIXED
		int16_t set_ACELP_flag_IVAS(
		const int16_t element_mode, /* i : element mode */
		const int32_t element_brate, /* i : element bitrate */
		@@ -1485,3 +1486,4 @@ int16_t set_ACELP_flag_IVAS(
		return 0;
		}
		}
		#endif

lib_com/bits_alloc_fx.c

+73 −0

Original line number	Diff line number	Diff line
		@@ -1700,4 +1700,77 @@ Word16 set_ACELP_flag(
		}
		}
		#endif

		/-------------------------------------------------------------------
		* set_ACELP_flag_IVAS()
		*
		* set ACELP@16kHz flag
		--------------------------------------------------------------------/

		/! r: ACELP16k flag /
		#ifdef IVAS_FLOAT_FIXED
		Word16 set_ACELP_flag_IVAS(
		const Word16 element_mode, /* i : element mode */
		const Word32 element_brate, /* i : element bitrate */
		const Word32 total_brate, /* i : total bitrate per channel */
		const Word16 idchan, /* i : Channel id */
		const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const Word16 bwidth, /* i : audio bandwidth */
		const Word16 cng_type /* i : CNG type */
		)
		{
		test();
		test();
		test();
		test();
		IF( EQ_16( element_mode, IVAS_CPE_DFT ) && EQ_16( idchan, 0 ) && LE_32( total_brate, SID_2k40 ) && EQ_16( bwidth, WB ) && EQ_16( cng_type, LP_CNG ) )
		{
		return 1;
		}
		ELSE IF( EQ_16( element_mode, IVAS_CPE_TD ) )
		{
		test();
		test();
		test();
		IF( GE_32( element_brate, IVAS_24k4 ) && EQ_16( idchan, 0 ) && ( EQ_16( tdm_LRTD_flag, 0 ) \|\| GT_32( element_brate, IVAS_24k4 ) ) )
		{
		return 1;
		}
		ELSE
		{
		return 0;
		}
		}
		ELSE IF( EQ_16( element_mode, IVAS_CPE_DFT ) )
		{
		IF( GE_32( element_brate, IVAS_24k4 ) )
		{
		return 1;
		}
		ELSE
		{
		return 0;
		}
		}
		ELSE IF( EQ_16( element_mode, IVAS_SCE ) )
		{
		IF( GE_32( element_brate, SCE_CORE_16k_LOW_LIMIT ) )
		{
		return 1;
		}
		ELSE
		{
		return 0;
		}
		}
		ELSE IF( GE_32( total_brate, ACELP_16k_LOW_LIMIT ) ) /* EVS_MONO */
		{
		return 1;
		}
		ELSE
		{
		return 0;
		}
		}
		#endif
		/#endif IVAS_CODE/
		No newline at end of file

lib_com/bitstream.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,9 @@
		#include "ivas_cnst.h"
		#include "ivas_rom_com.h"
		#include "wmc_auto.h"
		#ifdef IVAS_FLOAT_FIXED
		#include "ivas_prot_fx.h"
		#endif


		#define STEP_MAX_NUM_INDICES 100 /* increase the maximum number of allowed indices in the list by this amount */