Merge branch 'main' into ms_decision_main (7449de00) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -831,7 +831,7 @@ build-codec-linux-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "10 minutes"
		timeout: "100 minutes"
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
		- *activate-Werror-linux
		@@ -848,7 +848,7 @@ build-codec-linux-instrumented-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "10 minutes"
		timeout: "100 minutes"
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		@@ -865,7 +865,7 @@ build-codec-linux-debugging-make:
		when: never
		extends:
		- .build-job-linux
		timeout: "10 minutes"
		timeout: "100 minutes"
		variables:
		BUILD_WITH_DEBUG_MODE_INFO: "true"
		script:

lib_com/gs_noisefill_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1418,7 +1418,8 @@ void highband_exc_dct_in_ivas_fx(
		envelop_modify_fx( exc_diffQ, seed_tcx, last_bin, Ener_per_bd_iQ, *Q_exc, &Q_hb_exc );
		#ifdef REMOVE_EVS_DUPLICATES
		test();
		IF( GT_16( *Q_exc, Q_hb_exc ) && GT_16( element_mode, EVS_MONO ) )
		test();
		IF( GT_16( *Q_exc, Q_hb_exc ) && GT_16( element_mode, EVS_MONO ) && exc_wo_nf != NULL )
		#else
		IF( GT_16( *Q_exc, Q_hb_exc ) )
		#endif

lib_com/lpc_tools_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1114,7 +1114,7 @@ static void lsp_reorder(
		{
		lsp[i] = s_max( lsp[i], lsp_min );
		move16();
		lsp_min = add( lsp[i], min_dist );
		lsp_min = add_sat( lsp[i], min_dist );
		}

		/* Reverify the LSF ordering and minimum GAP in the reverse order (security) */

lib_dec/swb_tbe_dec_fx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -6468,7 +6468,7 @@ void ivas_swb_tbe_dec_fx(
		exp_ener = norm_s( ener_fx );
		tmp = shl( ener_fx, exp_ener ); /Q(2+exp)/
		inv_ener = div_s( 16384, tmp ); /Q(15+14-2-exp)/
		prev_ener_ratio_fx = L_shr( L_mult0( st->prev_ener_shb_fx, inv_ener ), add( sub( 9, exp_ener ), 1 ) ); /Q: 1+27-exp-9+exp-1 = 18 /
		prev_ener_ratio_fx = L_shr_sat( L_mult0( st->prev_ener_shb_fx, inv_ener ), add( sub( 9, exp_ener ), 1 ) ); /Q: 1+27-exp-9+exp-1 = 18 /
		}

		IF( EQ_16( st->nbLostCmpt, 1 ) )

lib_dec/tonalMDCTconcealment_fx.c

+11 −32

Original line number	Diff line number	Diff line
		@@ -450,17 +450,16 @@ void TonalMDCTConceal_SaveFreqSignal_ivas_fx(
		IF( ( nNewSamples > 0 ) && ( LE_16( nNewSamples, 2 * L_FRAME_MAX ) ) )
		{
		/* Store new data */
		hTonalMDCTConc->last_block_nrg = 0;
		move32();

		Word64 W_tmp = 0;
		move64();
		FOR( i = 0; i < infoIGFStartLine; i++ )
		{
		Word16 tmp = extract_h( mdctSpectrum[i] );
		hTonalMDCTConc->last_block_nrg = L_add( hTonalMDCTConc->last_block_nrg,
		L_shr( L_mult0( tmp, tmp ), 16 ) ); // Q31-last_block_nrg_exp
		move32();
		W_tmp = W_mac_32_16( W_tmp, Mpy_32_32( mdctSpectrum[i], mdctSpectrum[i] ), 1 ); // exp: mdctSpectrum_exp + mdctSpectrum_exp - 1
		}
		hTonalMDCTConc->last_block_nrg_exp = sub( 31, sub( shl( sub( 15, mdctSpectrum_exp ), 1 ), 16 ) );
		s = W_norm( W_tmp );
		hTonalMDCTConc->last_block_nrg = W_extract_h( W_shl( W_tmp, s ) ); // exp:add( sub( shl( mdctSpectrum_exp, 1 ), s ), 31 )
		move32();
		hTonalMDCTConc->last_block_nrg_exp = add( sub( shl( mdctSpectrum_exp, 1 ), s ), 31 );
		move16();

		/* Store new data */
		@@ -1765,32 +1764,12 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
		test();
		IF( GT_32( hTonalMDCTConc->faded_signal_nrg, 0 ) && flag )
		{
		Word16 num_exp, den_exp;
		Word32 num, den;
		Word16 num_exp;
		Word32 num;

		num = BASOP_Util_Add_Mant32Exp( hTonalMDCTConc->last_block_nrg, hTonalMDCTConc->last_block_nrg_exp, L_negate( last_block_nrg_correct ), last_block_nrg_correct_e, &num_exp ); // Q31-num_exp

		den = hTonalMDCTConc->faded_signal_nrg; // Q31 - hTonalMDCTConc->faded_signal_nrg_exp
		move32();
		den_exp = hTonalMDCTConc->faded_signal_nrg_exp;
		move16();

		ld = norm_l( num );
		num = L_shl( num, ld ); // Q31-num_exp + ld
		num_exp = sub( num_exp, ld );

		ld = norm_l( den );
		den = L_shl( den, ld ); // Q31-den_exp + ld
		den_exp = sub( den_exp, ld );

		exp = sub( num_exp, den_exp );

		IF( GT_32( num, den ) )
		{
		num = L_shr( num, 1 ); // Q31- exp -1
		exp = add( exp, 1 );
		}
		tmp = div_l( num, extract_h( den ) );
		tmp = BASOP_Util_Divide3232_Scale( num, hTonalMDCTConc->faded_signal_nrg, &exp );
		exp = add( exp, sub( num_exp, hTonalMDCTConc->faded_signal_nrg_exp ) );
		tmp = Sqrt16( tmp, &exp );

		FOR( i = 0; i < crossOverFreq; i++ )