Merge branch 'ci/improve-basop-clang-format' into 'main' (e764e9dc) · Commits · SA4 / Audio / IVAS BASOP

.clang-format

+9 −0

Original line number	Diff line number	Diff line
		@@ -84,5 +84,14 @@ SpacesInCStyleCastParentheses: false
		SpacesInParentheses: true
		SpacesInSquareBrackets: false
		Standard: Cpp11
		StatementMacros:
		- IF
		# - ELSE IF
		# - ELSE # Note that ELSE cannot be used here as it would break ELSE IF into two lines.
		- SWITCH
		- CASE
		- FOR
		- WHILE
		- DO
		TabWidth: 8
		UseTab: Never

+359 −357

Original line number	Diff line number	Diff line
		@@ -147,9 +147,11 @@ void CNG_exc_fx(
		move16();
		}
		}
		ELSE{
		ELSE
		{
		/* normal CNG update */
		IF( *last_allow_cn_step == 0 ){
		IF( *last_allow_cn_step == 0 )
		{
		/*lp_ener = (float)(A2 Enew + (1-A2) lp_ener);/
		L_tmp_ener = Mult_32_16( *Enew, A2 );
		L_tmp_ener = Madd_32_16( L_tmp_ener, *lp_ener, OmA2 );

+78 −76

Original line number	Diff line number	Diff line
		@@ -334,8 +334,10 @@ void hq2_core_configure_fx(
		}
		ELSE /* (frame_length == SWB) */
		{
		IF( is_transient ){
		IF( LE_32( L_bwe_br, ACELP_13k20 ) ){
		IF( is_transient )
		{
		IF( LE_32( L_bwe_br, ACELP_13k20 ) )
		{
		xcore_config_fx = &xcore_config_32kHz_013200bps_short;
		move16();
		}

+55 −46

Original line number	Diff line number	Diff line
		@@ -278,9 +278,12 @@ Word16 quantize_phi_fx(
		{
		id_phi = add( id_phi, ( n % 2 ) );
		}
		ELSE{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){
		IF( n % 2 ){
		ELSE
		{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )
		{
		IF( n % 2 )
		{
		id_phi = sub( id_phi, 1 );
		}
		ELSE
		@@ -356,9 +359,12 @@ Word16 quantize_phi_enc_fx(
		{
		id_phi = add( id_phi, ( n % 2 ) );
		}
		ELSE{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){
		IF( n % 2 ){
		ELSE
		{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )
		{
		IF( n % 2 )
		{
		id_phi = sub( id_phi, 1 );
		}
		ELSE
		@@ -677,9 +683,12 @@ Word16 quantize_phi_chan_compand_fx(
		{
		id_phi = add( id_phi, ( n % 2 ) );
		}
		ELSE{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) ){
		IF( n % 2 ){
		ELSE
		{
		IF( EQ_16( id_phi, add( shr( n, 1 ), ( n % 2 ) ) ) )
		{
		IF( n % 2 )
		{
		id_phi = sub( id_phi, 1 );
		}
		ELSE

+26 −24

Original line number	Diff line number	Diff line
		@@ -519,8 +519,10 @@ void tdm_bit_alloc(
		move16();
		idx = sub( NB_RATE_POSS, 2 );

		FOR( i = 0; i < NB_RATE_POSS; i++ ){
		IF( LE_16( tmp_rate, fast_FCB_rates_2sfr[i] ) ){
		FOR( i = 0; i < NB_RATE_POSS; i++ )
		{
		IF( LE_16( tmp_rate, fast_FCB_rates_2sfr[i] ) )
		{
		idx = i;
		move16();
		BREAK;