- Merge remote-tracking branch 'remotes/origin/main' into remove_evs_duplicates (1fec13ee) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+12 −12

Original line number	Diff line number	Diff line
		@@ -48,9 +48,9 @@ variables:
		FAILED_TESTCASES_LIST: "failed-testcases.txt"
		ERRORS_TESTCASES_LIST: "errors-testcases.txt"
		PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha"
		CUT_COMMIT_FILE: "CuT-git-sha"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha"
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -171,7 +171,7 @@ stages:
		- git pull origin $FLOAT_REF_BRANCH
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null
		- mv ./IVAS_cod ./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_dec ./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_rend ./IVAS_rend_ref
		@@ -187,7 +187,7 @@ stages:
		- git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null
		- mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
		- mv ./IVAS_rend ./IVAS_rend_merge_target
		@@ -202,7 +202,7 @@ stages:
		### build dut binaries
		- *activate-debug-mode-info-if-set
		- make clean
		- make -j
		- make -j >> /dev/null

		.build-and-create-float-ref-outputs: &build-and-create-float-ref-outputs
		- *build-float-ref-and-dut-binaries
		@@ -509,7 +509,7 @@ stages:
		- *build-float-ref-binaries
		- *build-merge-target-binaries
		- make clean
		- make -j
		- make -j >> /dev/null
		- *check-up-to-date-in-comparison-jobs

		- exit_code_target=0
		@@ -660,7 +660,7 @@ stages:
		- git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
		- make clean
		- make -j
		- make -j >> /dev/null
		# need to restore cache again
		- *overwrite-pytest-cache-with-artifact
		- python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout \|\| true
		@@ -759,7 +759,7 @@ stages:
		- make_args="$make_args IGNORELIST=1"
		- fi
		- make clean
		- make -j $make_args
		- make -j $make_args >> /dev/null
		- testcase_timeout_arg="--testcase_timeout $TESTCASE_TIMEOUT_LTV_SANITIZERS"
		# disable per-testcase timeout for msan to evaluate what is going on that it takes so long
		- if [[ $CLANG_NUM = 1 ]]; then
		@@ -1536,7 +1536,7 @@ coverage-test-on-main-scheduled:
		- *copy-ltv-files-to-testv-dir
		- *build-float-ref-binaries
		# Build DuT binaries with GCOV
		- make clean
		- make clean >> /dev/null
		- make GCOV=1 -j
		- cp IVAS_rend IVAS_rend_ref # Copy to ensure instrumented renderer is run in the first pytest call

		@@ -1594,7 +1594,7 @@ be-2-evs-26444:
		- *print-common-info
		- *update-scripts-repo
		- sed -i".bak" "s/$#define EVS_FLOAT$/\/\/\1/" lib_com/options.h
		- make -j
		- make -j >> /dev/null

		# copy over to never change the testvector dir
		- cp -r $EVS_BE_TEST_DIR_BASOP ./evs_be_test
		@@ -1658,7 +1658,7 @@ voip-be-on-merge-request:
		script:
		- *print-common-info
		- make clean
		- make -j
		- make -j >> /dev/null
		- python3 -m pytest tests/test_be_for_jbm_neutral_dly_profile.py

lib_com/basop_util.c

+408 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/basop_util.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,13 @@ Word32 BASOP_Util_Divide3232_Scale_cadence( Word32 x, /!< i : Numerator/
		Word16 s ); /!< o : Additional scalefactor difference*/


		#ifdef DIV32_OPT_NEWTON
		Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, /!< i : Numerator/
		Word32 y, /!< i : Denominator/
		Word16 s ); /!< o : Additional scalefactor difference*/
		#endif


		/************************************************************************/
		/*!
		\brief Binary logarithm with 7 iterations

lib_com/bitstream_fx.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -240,11 +240,11 @@ Word16 rate2EVSmode(
		}

		/-------------------------------------------------------------------
		* push_indice_fx( )
		* push_indice( )
		*
		* Push a new indice into the buffer
		-------------------------------------------------------------------/

		#ifndef HARM_PUSH_BIT
		void push_indice_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		Word16 id, /* i : ID of the indice */
		@@ -288,9 +288,8 @@ void push_indice_fx(

		return;
		}

		/-------------------------------------------------------------------
		* push_next_indice_fx() *
		* push_next_indice() *
		* Push a new indice into the buffer at the next position
		-------------------------------------------------------------------/

		@@ -318,7 +317,7 @@ void push_next_indice_fx(


		/-------------------------------------------------------------------
		* push_next_bits_fx()
		* push_next_bits()
		* Push a bit buffer into the buffer at the next position
		-------------------------------------------------------------------/

		@@ -368,6 +367,7 @@ void push_next_bits_fx(
		hBstr->nb_bits_tot = add( hBstr->nb_bits_tot, nb_bits );
		move16();
		}
		#endif

		/-------------------------------------------------------------------
		* get_next_indice_fx( )
		@@ -530,11 +530,12 @@ void reset_indices_enc_fx(
		move16();
		hBstr->nb_bits_tot = 0;
		move16();
		#ifndef HARM_PUSH_BIT
		hBstr->next_ind_fx = 0;
		move16();
		hBstr->last_ind_fx = -1;
		move16();

		#endif
		FOR( i = 0; i < max_num_indices; i++ )
		{
		hBstr->ind_list[i].nb_bits = -1;
		@@ -565,7 +566,7 @@ void reset_indices_dec_fx(
		*
		* Write the buffer of indices to a file
		-------------------------------------------------------------------/

		#ifndef HARM_PUSH_BIT
		void write_indices_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		@@ -663,12 +664,13 @@ void write_indices_fx(

		return;
		}
		#endif
		/-------------------------------------------------------------------
		* write_indices_buf_fx()
		*
		* Write the buffer of indices to a file
		-------------------------------------------------------------------/

		#ifndef HARM_PUSH_BIT
		void write_indices_buf_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		@@ -772,6 +774,7 @@ void write_indices_buf_fx(

		return;
		}
		#endif
		/-------------------------------------------------------------------
		* indices_to_serial()
		*

lib_com/cldfb.c

+32 −8

Original line number	Diff line number	Diff line
		@@ -901,7 +901,7 @@ void cldfbAnalysis_ts_fx_fixed_q(
		const Word16 *ptr_pf_fx;
		Word16 ptr_pf_sf;
		Word32 timeBuffer_fx, buffer_fx[( CLDFB_NO_CHANNELS_MAX CLDFB_NO_COL_MAX ) + ( 9 * CLDFB_NO_CHANNELS_MAX )];
		Word16 offset, frameSize;
		Word16 offset, frameSize, gb, hr, shift;

		offset = sub( h_cldfb->p_filter_length, h_cldfb->no_channels );
		frameSize = i_mult( h_cldfb->no_channels, h_cldfb->no_col );
		@@ -1071,10 +1071,33 @@ void cldfbAnalysis_ts_fx_fixed_q(
		q_cldfb = sub( q_cldfb, 2 );
		move16();

		gb = find_guarded_bits_fx( M1 );
		hr = L_norm_arr( iBuffer_fx, M1 );

		IF( LT_16( hr, gb ) )
		{
		scale_sig32( iBuffer_fx, M1, sub( hr, gb ) );
		}

		/* FFT of DCT IV */
		fft_cldfb_fx( iBuffer_fx, M2 );

		/* post modulation of DCT IV */
		IF( LT_16( hr, gb ) )
		{
		shift = sub( gb, hr );
		FOR( k = 0; k < M2; k++ )
		{
		/* do it inplace */
		/cplxMult(&imagBuffer[2k],&imagBuffer[M1-1-(2k)],iBuffer[2k],iBuffer[2k+1],rot_vctr_re[k],rot_vctr_im[k]);/
		imagBuffer_fx[2 * k] = L_shl( Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ), shift ); // q - 5
		imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_shl( Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ), shift ); // q - 5
		move32();
		move32();
		}
		}
		ELSE
		{
		FOR( k = 0; k < M2; k++ )
		{
		/* do it inplace */
		@@ -1084,6 +1107,7 @@ void cldfbAnalysis_ts_fx_fixed_q(
		move32();
		move32();
		}
		}

		IF( EQ_32( h_cldfb->prototype, CLDFB_PROTOTYPE_5_00MS ) )
		{