From 3520b90794e8d8ff7b5784cb2e3561df1e73bd86 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 27 Feb 2026 13:11:57 +0100 Subject: [PATCH 1/4] apply formatting to one file --- apps/encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/encoder.c b/apps/encoder.c index 9e10a9c5c..31d9b448c 100644 --- a/apps/encoder.c +++ b/apps/encoder.c @@ -55,10 +55,10 @@ rather than just defining _S_IFMT, _S_IFREG, and _S_IFDIR as it normally does. */ #include #if !defined( S_ISREG ) && defined( S_IFMT ) && defined( S_IFREG ) -#define S_ISREG( m ) ( ( (m) &S_IFMT ) == S_IFREG ) +#define S_ISREG( m ) ( ( ( m ) & S_IFMT ) == S_IFREG ) #endif #if !defined( S_ISDIR ) && defined( S_IFMT ) && defined( S_IFDIR ) -#define S_ISDIR( m ) ( ( (m) &S_IFMT ) == S_IFDIR ) +#define S_ISDIR( m ) ( ( ( m ) & S_IFMT ) == S_IFDIR ) #endif #endif -- GitLab From 67e2f83a1b6a27031304cea60d9f8bcadc3e5e07 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 27 Feb 2026 13:14:46 +0100 Subject: [PATCH 2/4] apply formatting --- apps/encoder_fmtsw.c | 4 ++-- lib_com/basop_settings.h | 4 ++-- lib_com/lsf_tools_fx.c | 12 ++++++------ lib_com/prot_fx.h | 2 +- lib_com/pvq_com_fx.c | 2 +- lib_com/rom_com_fx.c | 6 +++--- lib_com/swb_tbe_com_fx.c | 2 +- lib_com/tcq_position_arith_fx.c | 2 +- lib_dec/FEC_clas_estim_fx.c | 2 +- lib_dec/amr_wb_dec_fx.c | 4 ++-- lib_dec/dec_tcx_fx.c | 2 +- lib_dec/evs_dec_fx.c | 2 +- lib_dec/ivas_dirac_dec_fx.c | 4 ++-- lib_dec/swb_tbe_dec_fx.c | 2 +- lib_dec/vlpc_2st_dec_fx.c | 2 +- lib_enc/ACcontextMapping_enc_fx.c | 4 ++-- lib_enc/cod_ace_fx.c | 2 +- lib_enc/comvad_decision_fx.c | 2 +- lib_enc/cor_shif_fx.c | 2 +- lib_enc/core_enc_2div_fx.c | 2 +- lib_enc/corr_xh_fx.c | 2 +- lib_enc/enc_acelp_tcx_main_fx.c | 2 +- lib_enc/enc_nelp_fx.c | 2 +- lib_enc/enc_prm_fx.c | 2 +- lib_enc/energy_fx.c | 2 +- lib_enc/find_tilt_fx.c | 2 +- lib_enc/frame_spec_dif_cor_rate_fx.c | 2 +- lib_enc/hvq_enc_fx.c | 2 +- lib_enc/igf_scf_enc_fx.c | 2 +- lib_enc/ivas_masa_enc_fx.c | 2 +- lib_enc/lsf_msvq_ma_enc_fx.c | 22 +++++++++++----------- lib_enc/ltd_stable_fx.c | 2 +- lib_enc/mdct_classifier_fx.c | 2 +- lib_enc/mdct_selector_fx.c | 2 +- lib_enc/nois_est_fx.c | 2 +- lib_enc/normalizecoefs_fx.c | 4 ++-- lib_enc/pitch_ol_fx.c | 6 +++--- lib_enc/plc_enc_ext_fx.c | 2 +- lib_enc/qlpc_avq_fx.c | 2 +- lib_enc/spec_center_fx.c | 2 +- lib_enc/spec_flatness_fx.c | 2 +- lib_enc/subband_fft_fx.c | 2 +- lib_enc/swb_bwe_enc_lr_fx.c | 2 +- lib_enc/tfa_enc_fx.c | 2 +- lib_enc/tns_base_enc_fx.c | 2 +- lib_enc/update_decision_fx.c | 2 +- lib_enc/updt_tar_fx.c | 2 +- lib_enc/vad_basop_fx.c | 2 +- lib_enc/vad_fx.c | 4 ++-- lib_enc/vad_proc_fx.c | 2 +- lib_enc/vlpc_2st_cod_fx.c | 2 +- lib_isar/isar_lc3plus_dec.h | 2 +- lib_isar/isar_lc3plus_enc.h | 2 +- lib_isar/isar_lcld_encoder.c | 6 +++--- lib_isar/isar_splitRend_lcld_dec.c | 2 +- lib_rend/ivas_objectRenderer_hrFilt_fx.c | 4 ++-- 56 files changed, 85 insertions(+), 85 deletions(-) diff --git a/apps/encoder_fmtsw.c b/apps/encoder_fmtsw.c index 12cc57349..036144175 100644 --- a/apps/encoder_fmtsw.c +++ b/apps/encoder_fmtsw.c @@ -55,10 +55,10 @@ rather than just defining _S_IFMT, _S_IFREG, and _S_IFDIR as it normally does. */ #include #if !defined( S_ISREG ) && defined( S_IFMT ) && defined( S_IFREG ) -#define S_ISREG( m ) ( ( (m) &S_IFMT ) == S_IFREG ) +#define S_ISREG( m ) ( ( ( m ) & S_IFMT ) == S_IFREG ) #endif #if !defined( S_ISDIR ) && defined( S_IFMT ) && defined( S_IFDIR ) -#define S_ISDIR( m ) ( ( (m) &S_IFMT ) == S_IFDIR ) +#define S_ISDIR( m ) ( ( ( m ) & S_IFMT ) == S_IFDIR ) #endif #endif diff --git a/lib_com/basop_settings.h b/lib_com/basop_settings.h index 79544c078..6d1d513a2 100644 --- a/lib_com/basop_settings.h +++ b/lib_com/basop_settings.h @@ -59,13 +59,13 @@ \def Macro converts a float < 1 to Word32 fixed point with saturation and rounding */ #define FL2WORD32( val ) \ - ( Word32 )( ( ( val ) >= 0 ) ? ( ( ( (double) ( val ) * ( WORD32_FIX_SCALE ) + 0.5 ) >= (double) ( MAXVAL_WORD32 ) ) ? (int32_t) ( MAXVAL_WORD32 ) : (int32_t) ( (double) ( val ) * (double) ( WORD32_FIX_SCALE ) + 0.5 ) ) : ( ( ( (double) ( val ) * (WORD32_FIX_SCALE) -0.5 ) <= (double) ( MINVAL_WORD32 ) ) ? (int32_t) ( MINVAL_WORD32 ) : (int32_t) ( (double) ( val ) * (double) (WORD32_FIX_SCALE) -0.5 ) ) ) + ( Word32 )( ( ( val ) >= 0 ) ? ( ( ( (double) ( val ) * ( WORD32_FIX_SCALE ) + 0.5 ) >= (double) ( MAXVAL_WORD32 ) ) ? (int32_t) ( MAXVAL_WORD32 ) : (int32_t) ( (double) ( val ) * (double) ( WORD32_FIX_SCALE ) + 0.5 ) ) : ( ( ( (double) ( val ) * ( WORD32_FIX_SCALE ) - 0.5 ) <= (double) ( MINVAL_WORD32 ) ) ? (int32_t) ( MINVAL_WORD32 ) : (int32_t) ( (double) ( val ) * (double) ( WORD32_FIX_SCALE ) - 0.5 ) ) ) /*! \def Macro converts a float < 1 to Word16 fixed point with saturation and rounding */ #define FL2WORD16( val ) \ - ( Word16 )( ( ( val ) >= 0 ) ? ( ( ( (double) ( val ) * ( WORD16_FIX_SCALE ) + 0.5 ) >= (double) ( MAXVAL_WORD16 ) ) ? (int32_t) ( MAXVAL_WORD16 ) : (int32_t) ( (double) ( val ) * (double) ( WORD16_FIX_SCALE ) + 0.5 ) ) : ( ( ( (double) ( val ) * (WORD16_FIX_SCALE) -0.5 ) <= (double) ( MINVAL_WORD16 ) ) ? (int32_t) ( MINVAL_WORD16 ) : (int32_t) ( (double) ( val ) * (double) (WORD16_FIX_SCALE) -0.5 ) ) ) + ( Word16 )( ( ( val ) >= 0 ) ? ( ( ( (double) ( val ) * ( WORD16_FIX_SCALE ) + 0.5 ) >= (double) ( MAXVAL_WORD16 ) ) ? (int32_t) ( MAXVAL_WORD16 ) : (int32_t) ( (double) ( val ) * (double) ( WORD16_FIX_SCALE ) + 0.5 ) ) : ( ( ( (double) ( val ) * ( WORD16_FIX_SCALE ) - 0.5 ) <= (double) ( MINVAL_WORD16 ) ) ? (int32_t) ( MINVAL_WORD16 ) : (int32_t) ( (double) ( val ) * (double) ( WORD16_FIX_SCALE ) - 0.5 ) ) ) /*! \def Macro converts a Word32 fixed point to Word16 fixed point <1 with saturation diff --git a/lib_com/lsf_tools_fx.c b/lib_com/lsf_tools_fx.c index ba6dc36fe..71f30f83f 100644 --- a/lib_com/lsf_tools_fx.c +++ b/lib_com/lsf_tools_fx.c @@ -584,8 +584,8 @@ Word16 lpc2lsp_fx( tfreq[rc] = rt; rc = add( rc, 2 ); } /* end else, find Q root */ - } /* end for */ - } /* end else */ + } /* end for */ + } /* end else */ FOR( i = 0; i < order; i++ ) { @@ -729,8 +729,8 @@ Word16 lpc2lsp_ivas_fx( tfreq[rc] = rt; rc = add( rc, 2 ); } /* end else, find Q root */ - } /* end for */ - } /* end else */ + } /* end for */ + } /* end else */ FOR( i = 0; i < order; i++ ) { @@ -3567,7 +3567,7 @@ Word32 poscos_fx( Lacc = L_sub( Lacc, L_shl( Ltemp, 1 ) ); /* Lacc=cos( w) in Q30 */ return L_negate( Lacc ); /* return -cos( w), Q30 */ - } /* end else */ + } /* end else */ } @@ -3683,7 +3683,7 @@ Word16 root_search_fx( move16(); return ( add( round_fx( Ltemp ), shl( low, 6 ) ) ); } /* end else ( root in interval) */ - } /* end else ( exact root at high) */ + } /* end else ( exact root at high) */ /* find the exact root */ *v_low = v_high; diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h index c75e08312..ba82aae4b 100644 --- a/lib_com/prot_fx.h +++ b/lib_com/prot_fx.h @@ -10717,7 +10717,7 @@ void UnmapIndex_fx( Word32 *Lag /* Q0 */ ); -//#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) ) +// #define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) ) #define GET_ADJ2( T, L, F ) ( sub( shl( L, F ), T ) ) Word32 tcx_hm_render_fx( diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c index 49a83bc7b..f86e66f60 100644 --- a/lib_com/pvq_com_fx.c +++ b/lib_com/pvq_com_fx.c @@ -440,7 +440,7 @@ void NearOppSplitAdjustment_fx( QuantaPerDsDirac_fx( Nhead, Midx, hBitsN, &qmin ); qskew = sub( qavg, qmin ); /* Q0 */ qskew = s_max( 0, qskew ); /* Q0 */ - } /* end of skew calc code*/ + } /* end of skew calc code*/ QIa = add( extract_l( intLimCDivPos_fx( (UWord32) L_deposit_l( Nopp ), Nnear ) ), 1 ); /* always positive Word16 out Q0*/ L_qnum = L_sub( L_deposit_l( sub( sub( add( qband, qzero ), qac ), qskew ) ), L_mult0( Nopp, oppRQ3 ) ); /* Q0 */ diff --git a/lib_com/rom_com_fx.c b/lib_com/rom_com_fx.c index eff398b33..ef6d2d354 100644 --- a/lib_com/rom_com_fx.c +++ b/lib_com/rom_com_fx.c @@ -25785,9 +25785,9 @@ const Word16 band_len_ener_shift[8] = { 1, 2, 2, 2, 3, 3, 4 /*sfm==80*/, 4 /*sfm /*% sfms=[8,16,24,32,48,64,80,96], round(sqrt(sfms)*2^11) */ const Word16 fine_gain_pred_sqrt_bw[8] = { 5793, 8192, 10033, 11585, 14189, 16384, 18318, 20066 }; /* (Q11) */ const Word16 ivas_band_len_idx[1 + ( MAX_SFM_LEN_FX / 8 )] = { - /*sfm/8*/ /*1*/ /*2 */ /*3 */ /*4 */ /*6 */ /*8 */ /*10*/ /*12*/ - -1, 0 /*8*/, 1 /*16*/, 2 /*24*/, 3 /*32*/, 4 /*40*/, 5 /*48 */, -1, 6 /*64 */, -1, 7 /*80*/, -1, 8 /*96*/ -}; // Q0 + /*sfm/8*/ /*1*/ /*2 */ /*3 */ /*4 */ /*6 */ /*8 */ /*10*/ /*12*/ + -1, 0 /*8*/, 1 /*16*/, 2 /*24*/, 3 /*32*/, 4 /*40*/, 5 /*48 */, -1, 6 /*64 */, -1, 7 /*80*/, -1, 8 /*96*/ +}; // Q0 const Word16 ivas_band_len_ener_shift[9] = { 1, 2, 2, 2, 3, 3, 3, 4 /*sfm==80*/, 4 /*sfm==96*/ }; // Q0 /* 96 requires 1 bit more than 48 */ const Word16 ivas_fine_gain_pred_sqrt_bw[9] = { 5793, 8192, 10033, 11585, 12953, 14189, 16384, 18318, 20066 }; /* (Q11) */ /*% sfms=[8,16,24,32,40,48,64,80,96], round(sqrt(sfms)*2^11) */ diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c index 96db4fb33..a6f0bdb38 100644 --- a/lib_com/swb_tbe_com_fx.c +++ b/lib_com/swb_tbe_com_fx.c @@ -1460,7 +1460,7 @@ void GenShapedWBExcitation_ivas_fx( #ifdef HARMONIZE_TBE2 pow22 = L_add( pow22, L_shr( L_tmp, Q_pow ) ); /* Q22 */ #else - pow22 = L_add( pow22, L_shr( L_tmp, 10 ) ); /* Q22 */ + pow22 = L_add( pow22, L_shr( L_tmp, 10 ) ); /* Q22 */ #endif } } diff --git a/lib_com/tcq_position_arith_fx.c b/lib_com/tcq_position_arith_fx.c index f74aea076..431a509b1 100644 --- a/lib_com/tcq_position_arith_fx.c +++ b/lib_com/tcq_position_arith_fx.c @@ -1237,7 +1237,7 @@ Word32 GetISCScale_fx( *nzpout = nzposcurr; move16(); } /*magnitude coding */ - } /*TCQ */ + } /*TCQ */ IF( actualt_fx == 0 ) { diff --git a/lib_dec/FEC_clas_estim_fx.c b/lib_dec/FEC_clas_estim_fx.c index f968ccb90..946f770e8 100644 --- a/lib_dec/FEC_clas_estim_fx.c +++ b/lib_dec/FEC_clas_estim_fx.c @@ -731,7 +731,7 @@ void FEC_clas_estim_fx( } } } /*if (Opt_AMR_WB)*/ - } /*if (codec_mode==MODE1)*/ + } /*if (codec_mode==MODE1)*/ } /* Do the classification only diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c index 0eb145603..00347cac7 100644 --- a/lib_dec/amr_wb_dec_fx.c +++ b/lib_dec/amr_wb_dec_fx.c @@ -21,8 +21,8 @@ ivas_error amr_wb_dec_fx( Word16 output_sp[], /* o : synthesis output */ Word32 *mem_hp20_in_fx /* i/o: hp20 filter memory Qx*/ #else - Word16 output_sp[], /* o : synthesis output Q_syn2*/ - Decoder_State *st_fx /* o : Decoder static variables structure */ + Word16 output_sp[], /* o : synthesis output Q_syn2*/ + Decoder_State *st_fx /* o : Decoder static variables structure */ #endif ) { diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c index 339826d53..0f5f1ec57 100644 --- a/lib_dec/dec_tcx_fx.c +++ b/lib_dec/dec_tcx_fx.c @@ -2267,7 +2267,7 @@ void IMDCT_fx( Word32 *x, Word16 x_e, Word16 *old_syn_overl, Word16 *syn_Overl_T tmp8, fullbandScale ); } /* TRANSITION_OVERLAP */ - } /* TCX-20 and TCX-only */ + } /* TCX-20 and TCX-only */ /* Window and overlap-add past frame if past frame is TCX */ test(); diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c index 20f6e7f70..ec330496f 100644 --- a/lib_dec/evs_dec_fx.c +++ b/lib_dec/evs_dec_fx.c @@ -1352,7 +1352,7 @@ ivas_error evs_dec_fx( Scale_sig32( mem_hp20_in_fx, 4, sub( Qpostd, Qpostd_prev ) ); /*Qpostd*/ hp20( synth_fx, 1 /*stride*/, output_frame, mem_hp20_in_fx, st_fx->output_Fs ); #else - Scale_sig32( st_fx->L_mem_hp_out_fx, 4, sub( Qpostd, Qpostd_prev ) ); /*Qpostd*/ + Scale_sig32( st_fx->L_mem_hp_out_fx, 4, sub( Qpostd, Qpostd_prev ) ); /*Qpostd*/ hp20( synth_fx, 1 /*stride*/, output_frame, st_fx->L_mem_hp_out_fx, L_mult0( output_frame, 50 ) ); #endif diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c index 7d25477b4..a92537347 100644 --- a/lib_dec/ivas_dirac_dec_fx.c +++ b/lib_dec/ivas_dirac_dec_fx.c @@ -1895,8 +1895,8 @@ void ivas_qmetadata_to_dirac_fx( } /* for ( block =...) */ - } /* for ( band = ...) */ - } /* for ( idx_sec = ...)*/ + } /* for ( band = ...) */ + } /* for ( idx_sec = ...)*/ /* Bands not transmitted -> zeroed*/ FOR( b = band_grouping[band]; b < hSpatParamRendCom->num_freq_bands; b++ ) diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c index 60f22396e..7a6ba9ac4 100644 --- a/lib_dec/swb_tbe_dec_fx.c +++ b/lib_dec/swb_tbe_dec_fx.c @@ -3763,7 +3763,7 @@ static void dequantizeSHBparams_fx( { *Q_framegrain = L_mac( SHB_GAIN_QLOW_FX, idxFrameGain, SHB_GAIN_QDELTA_FX ); move32(); - } /*Q18*/ + } /*Q18*/ L_tmp = Mult_32_16( *Q_framegrain, 27213 ); /*Q16*/ /* 3.321928 in Q13 */ frac = L_Extract_lc( L_tmp, &exp ); L_tmp = Pow2( 30, frac ); diff --git a/lib_dec/vlpc_2st_dec_fx.c b/lib_dec/vlpc_2st_dec_fx.c index 74a152003..f3414dc71 100644 --- a/lib_dec/vlpc_2st_dec_fx.c +++ b/lib_dec/vlpc_2st_dec_fx.c @@ -33,7 +33,7 @@ void vlpc_2st_dec( FOR( i = 0; i < M; i++ ) { assert( abs_s( xq[i] ) <= 32 ); /* If xq > 32 for IVAS, we might need a different loop implementation */ - //#endif + // #endif lsfq[i] = add( lsfq[i], shl( mult_r( w[i], shl_sat( xq[i], 10 ) ), 2 ) ); /*14Q1*1.28*/ move16(); } diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c index f9e2d919c..eca622dd0 100644 --- a/lib_enc/ACcontextMapping_enc_fx.c +++ b/lib_enc/ACcontextMapping_enc_fx.c @@ -1419,7 +1419,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx( } } - } /*end of the 2-tuples loop*/ + } /*end of the 2-tuples loop*/ total_output_bits = round_fx( W_shl_sat_l( bit_estimate_fx, -Q7 ) ); /* Q23 -> Q16 -> Q0 */ IF( *stop ) { @@ -1794,7 +1794,7 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx( hContextMem->ctx = add( i_mult( s_and( hContextMem->ctx, 0xf ), 16 ), t ); /* Q0 */ move16(); - } /*end of the 2-tuples loop*/ + } /*end of the 2-tuples loop*/ total_output_bits = round_fx( W_shl_sat_l( hContextMem->bit_estimate_fx, -Q7 ) ); /* Q0 */ // total_output_bits = (Word16) ( hContextMem->bit_estimate + 0.5f ); diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c index 92b08554e..7b32f789e 100644 --- a/lib_enc/cod_ace_fx.c +++ b/lib_enc/cod_ace_fx.c @@ -6,7 +6,7 @@ #include #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "basop_util.h" #include "options.h" #include "rom_basop_util.h" diff --git a/lib_enc/comvad_decision_fx.c b/lib_enc/comvad_decision_fx.c index 479781d27..dafa4561c 100644 --- a/lib_enc/comvad_decision_fx.c +++ b/lib_enc/comvad_decision_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" /* Common constants */ #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_enc.h" /* Encoder static table prototypes */ #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/cor_shif_fx.c b/lib_enc/cor_shif_fx.c index 5e4214552..c98afa1ee 100644 --- a/lib_enc/cor_shif_fx.c +++ b/lib_enc/cor_shif_fx.c @@ -4,7 +4,7 @@ #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -//#include "prot_fx.h" /* Function prototypes */ +// #include "prot_fx.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/core_enc_2div_fx.c b/lib_enc/core_enc_2div_fx.c index 45aba6a05..dbc7d44ec 100644 --- a/lib_enc/core_enc_2div_fx.c +++ b/lib_enc/core_enc_2div_fx.c @@ -8,7 +8,7 @@ #include "options.h" #include "cnst.h" /* Common constants */ #include "ivas_cnst.h" /* Common constants */ -//#include "prot_fx.h" +// #include "prot_fx.h" #include "basop_util.h" #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c index 4f0614fba..14bd84b79 100644 --- a/lib_enc/corr_xh_fx.c +++ b/lib_enc/corr_xh_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_acelp_tcx_main_fx.c b/lib_enc/enc_acelp_tcx_main_fx.c index b3bd7d112..44108f56c 100644 --- a/lib_enc/enc_acelp_tcx_main_fx.c +++ b/lib_enc/enc_acelp_tcx_main_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "cnst.h" /* Common constants */ #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ diff --git a/lib_enc/enc_nelp_fx.c b/lib_enc/enc_nelp_fx.c index 5181a08ff..7eaccfcea 100644 --- a/lib_enc/enc_nelp_fx.c +++ b/lib_enc/enc_nelp_fx.c @@ -5,7 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -//#include "prot_fx.h" /* Function prototypes */ +// #include "prot_fx.h" /* Function prototypes */ #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c index f72a955a8..c138f0e21 100644 --- a/lib_enc/enc_prm_fx.c +++ b/lib_enc/enc_prm_fx.c @@ -686,7 +686,7 @@ void enc_prm_fx( n = ACELP_GAINS_BITS[st->acelp_cfg.gains_mode[sfr]]; push_next_indice( hBstr, prm[j++], n ); } /*end of for(sfr)*/ - } /*end of mode[0]==0*/ + } /*end of mode[0]==0*/ /*--------------------------------------------------------------------------------* diff --git a/lib_enc/energy_fx.c b/lib_enc/energy_fx.c index 53cda71c1..b81412ead 100644 --- a/lib_enc/energy_fx.c +++ b/lib_enc/energy_fx.c @@ -8,7 +8,7 @@ #include "basop_util.h" #include "rom_enc.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c index 56ea1e9dd..ef0f639a9 100644 --- a/lib_enc/find_tilt_fx.c +++ b/lib_enc/find_tilt_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -//#include "prot_fx.h" /* Function prototypes */ +// #include "prot_fx.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/frame_spec_dif_cor_rate_fx.c b/lib_enc/frame_spec_dif_cor_rate_fx.c index 54e6148af..ea810ab67 100644 --- a/lib_enc/frame_spec_dif_cor_rate_fx.c +++ b/lib_enc/frame_spec_dif_cor_rate_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c index 57692bbef..e7a339af6 100644 --- a/lib_enc/hvq_enc_fx.c +++ b/lib_enc/hvq_enc_fx.c @@ -5,7 +5,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/igf_scf_enc_fx.c b/lib_enc/igf_scf_enc_fx.c index eab151d7e..9732239d3 100644 --- a/lib_enc/igf_scf_enc_fx.c +++ b/lib_enc/igf_scf_enc_fx.c @@ -5,7 +5,7 @@ #include #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "stat_enc.h" #include "stat_com.h" #include "basop_util.h" diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c index 5779ea017..8a957b267 100644 --- a/lib_enc/ivas_masa_enc_fx.c +++ b/lib_enc/ivas_masa_enc_fx.c @@ -3792,7 +3792,7 @@ static void masa_metadata_direction_alignment_fx( move16(); } } /* sf */ - } /* band */ + } /* band */ return; } diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c index a587e816a..3557f0a37 100644 --- a/lib_enc/lsf_msvq_ma_enc_fx.c +++ b/lib_enc/lsf_msvq_ma_enc_fx.c @@ -835,8 +835,8 @@ void msvq_enc_fx( p_max = ( *func_ptr )( dist[1] ); } /*IF (L_sub(tmp,dist[1][p_max]) < 0) */ - } /* FOR (c=0; c #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/mdct_selector_fx.c b/lib_enc/mdct_selector_fx.c index bc502d49f..b6de7a5d2 100644 --- a/lib_enc/mdct_selector_fx.c +++ b/lib_enc/mdct_selector_fx.c @@ -5,7 +5,7 @@ #include #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c index ff6784c4e..f3373dc01 100644 --- a/lib_enc/nois_est_fx.c +++ b/lib_enc/nois_est_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "cnst.h" #include "rom_com.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c index 89bfadac5..4b126e2dc 100644 --- a/lib_enc/normalizecoefs_fx.c +++ b/lib_enc/normalizecoefs_fx.c @@ -4,8 +4,8 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" /* Common constants */ -//#include "basop_mpy.h" -//#include "prot_fx.h" +// #include "basop_mpy.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c index 9e8434cfc..324c600a2 100644 --- a/lib_enc/pitch_ol_fx.c +++ b/lib_enc/pitch_ol_fx.c @@ -774,7 +774,7 @@ void pitch_ol_fx( exp_sect1[j] = ind1; move16(); } /* IF (k >= 0) */ - } /* FOR (j = subsect0; ... */ + } /* FOR (j = subsect0; ... */ } ELSE /* 3rd half-frame (look-ahead) */ { @@ -1118,7 +1118,7 @@ void pitch_ol_fx( offset1 = add( offset1, sec_length1[j] ); } /* FOR j < NSECT */ - } /* FOR i < NHFR */ + } /* FOR i < NHFR */ pitch_ol_resolve_fx( pitch, voicing, old_pitch, old_corr, old_thres, delta_pit, EVS_MONO, corr_shift, relE, Opt_SC_VBR, pitchX, corX, scaledX, sect0, pit_max, pit_min_coding ); @@ -1832,7 +1832,7 @@ void pitch_ol_ivas_fx( offset1 = add( offset1, sec_length1[j] ); } /* FOR j < NSECT */ - } /* FOR i < NHFR */ + } /* FOR i < NHFR */ pitch_ol_resolve_fx( pitch, voicing, old_pitch, old_corr, old_thres, delta_pit, IVAS_SCE, corr_shift, relE, Opt_SC_VBR, pitchX, corX, scaledX, sect0, pit_max, pit_min_coding ); /* any element mode other than EVS_MONO is OK here */ return; diff --git a/lib_enc/plc_enc_ext_fx.c b/lib_enc/plc_enc_ext_fx.c index 6e9571442..fa5f85f8c 100644 --- a/lib_enc/plc_enc_ext_fx.c +++ b/lib_enc/plc_enc_ext_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "cnst.h" #include "stat_enc.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" /* Common constants */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/qlpc_avq_fx.c b/lib_enc/qlpc_avq_fx.c index 5d4d93fdf..ab6d62658 100644 --- a/lib_enc/qlpc_avq_fx.c +++ b/lib_enc/qlpc_avq_fx.c @@ -7,7 +7,7 @@ #include #include "options.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_com.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/spec_center_fx.c b/lib_enc/spec_center_fx.c index 78af3cda3..b628ea0f5 100644 --- a/lib_enc/spec_center_fx.c +++ b/lib_enc/spec_center_fx.c @@ -6,7 +6,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_enc.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/spec_flatness_fx.c b/lib_enc/spec_flatness_fx.c index ba8838e05..89102d926 100644 --- a/lib_enc/spec_flatness_fx.c +++ b/lib_enc/spec_flatness_fx.c @@ -8,7 +8,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/subband_fft_fx.c b/lib_enc/subband_fft_fx.c index daf9048a4..7026f2603 100644 --- a/lib_enc/subband_fft_fx.c +++ b/lib_enc/subband_fft_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "rom_enc.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c index 4a549ffef..c691af8ba 100644 --- a/lib_enc/swb_bwe_enc_lr_fx.c +++ b/lib_enc/swb_bwe_enc_lr_fx.c @@ -875,7 +875,7 @@ static void EncodeSWBSubbands_fx( Word16 ss_min_fx; /* Qss */ Word32 L_th_g[NB_SWB_SUBBANDS]; Word16 QbeL; - GainItem_fx pk_sf_fx[(NB_SWB_SUBBANDS) *8]; + GainItem_fx pk_sf_fx[( NB_SWB_SUBBANDS ) * 8]; Word16 pul_res_fx[NB_SWB_SUBBANDS]; GainItem_fx Nbiggest_fx[NB_SWB_SUBBANDS * N_NBIGGEST_PULSEARCH]; diff --git a/lib_enc/tfa_enc_fx.c b/lib_enc/tfa_enc_fx.c index 60427f792..baea8b4f9 100644 --- a/lib_enc/tfa_enc_fx.c +++ b/lib_enc/tfa_enc_fx.c @@ -6,7 +6,7 @@ #include "options.h" #include "basop_util.h" #include "cnst.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c index 36880d3d5..6bc31dd0a 100644 --- a/lib_enc/tns_base_enc_fx.c +++ b/lib_enc/tns_base_enc_fx.c @@ -5,7 +5,7 @@ #include "options.h" #include "cnst.h" #include "stl.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "basop_util.h" #include "stl.h" #include diff --git a/lib_enc/update_decision_fx.c b/lib_enc/update_decision_fx.c index 67476f993..e25e4d50c 100644 --- a/lib_enc/update_decision_fx.c +++ b/lib_enc/update_decision_fx.c @@ -7,7 +7,7 @@ #include "options.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ /*-------------------------------------------------------------------* diff --git a/lib_enc/updt_tar_fx.c b/lib_enc/updt_tar_fx.c index b379f24ef..b875a7ee4 100644 --- a/lib_enc/updt_tar_fx.c +++ b/lib_enc/updt_tar_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" /* Compilation switches */ #include "cnst.h" -//#include "prot_fx.h" /* Function prototypes */ +// #include "prot_fx.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ diff --git a/lib_enc/vad_basop_fx.c b/lib_enc/vad_basop_fx.c index 3436a1d68..c4a5705c2 100644 --- a/lib_enc/vad_basop_fx.c +++ b/lib_enc/vad_basop_fx.c @@ -4,7 +4,7 @@ #include #include "options.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "vad_basop.h" diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c index b6ffbc738..eec0b656d 100644 --- a/lib_enc/vad_fx.c +++ b/lib_enc/vad_fx.c @@ -1534,7 +1534,7 @@ Word16 wb_vad_fx( } thr1 = thr1_nb_mod; move16(); /* needed for st_fx->vadnoise_fx update below */ - } /* end of NB */ + } /* end of NB */ /* *flag_noisy_speech_snr is a Word8 parameter */ @@ -2809,7 +2809,7 @@ Word16 wb_vad_ivas_fx( } thr1 = thr1_nb_mod; move16(); /* needed for st_fx->vadnoise_fx update below */ - } /* end of NB */ + } /* end of NB */ /* *flag_noisy_speech_snr is a Word8 parameter */ diff --git a/lib_enc/vad_proc_fx.c b/lib_enc/vad_proc_fx.c index 62469f3a7..b3aac988c 100644 --- a/lib_enc/vad_proc_fx.c +++ b/lib_enc/vad_proc_fx.c @@ -8,7 +8,7 @@ #include "cnst.h" #include "basop_util.h" #include "vad_basop.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "stat_enc.h" #include "rom_enc.h" #include "rom_com.h" /* Common constants */ diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c index 32ab21877..780e0e89e 100644 --- a/lib_enc/vlpc_2st_cod_fx.c +++ b/lib_enc/vlpc_2st_cod_fx.c @@ -6,7 +6,7 @@ #include "options.h" #include "cnst.h" #include "options.h" -//#include "prot_fx.h" +// #include "prot_fx.h" #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ #include "basop_util.h" diff --git a/lib_isar/isar_lc3plus_dec.h b/lib_isar/isar_lc3plus_dec.h index 461e15dc8..6f469f48b 100644 --- a/lib_isar/isar_lc3plus_dec.h +++ b/lib_isar/isar_lc3plus_dec.h @@ -76,7 +76,7 @@ typedef struct ISAR_LC3PLUS_DEC_HANDLE int16_t *pcm_conversion_buffer; uint8_t *scratch; LC3PLUS_CONFIG config; -} * ISAR_LC3PLUS_DEC_HANDLE; +} *ISAR_LC3PLUS_DEC_HANDLE; ivas_error ISAR_LC3PLUS_DEC_Open( const LC3PLUS_CONFIG config, /* i : decoder configuration */ diff --git a/lib_isar/isar_lc3plus_enc.h b/lib_isar/isar_lc3plus_enc.h index 793da7b9f..5ce87a91f 100644 --- a/lib_isar/isar_lc3plus_enc.h +++ b/lib_isar/isar_lc3plus_enc.h @@ -51,7 +51,7 @@ typedef struct ISAR_LC3PLUS_ENC_HANDLE int32_t num_ftds; LC3PLUS_RTP_FDL fdl_request; uint8_t *scratch; -} * ISAR_LC3PLUS_ENC_HANDLE; +} *ISAR_LC3PLUS_ENC_HANDLE; ivas_error ISAR_LC3PLUS_ENC_Open( const LC3PLUS_CONFIG config, /* i : encoder configuration */ diff --git a/lib_isar/isar_lcld_encoder.c b/lib_isar/isar_lcld_encoder.c index 9b33cc653..5b34a4ff3 100644 --- a/lib_isar/isar_lcld_encoder.c +++ b/lib_isar/isar_lcld_encoder.c @@ -1431,7 +1431,7 @@ static void QuantizeSpectrumDPCM_Opt( fImag_fx ); iBlockOffset++; } /* group length */ - } /* groups */ + } /* groups */ pfPredStateReal_fx[iFBOffset] = fPrevReal_fx; move32(); pfPredStateImag_fx[iFBOffset] = fPrevImag_fx; @@ -1466,8 +1466,8 @@ static void QuantizeSpectrumDPCM_Opt( iBlockOffset++; } /* group length */ - } /* groups */ - } /* predEnable */ + } /* groups */ + } /* predEnable */ iFBOffset++; } /* bandwidth */ } diff --git a/lib_isar/isar_splitRend_lcld_dec.c b/lib_isar/isar_splitRend_lcld_dec.c index b4047a750..8fb28c90b 100644 --- a/lib_isar/isar_splitRend_lcld_dec.c +++ b/lib_isar/isar_splitRend_lcld_dec.c @@ -36,7 +36,7 @@ #include "ivas_prot_fx.h" #include "prot_fx.h" #include "prot_fx.h" -//#include "control.h" +// #include "control.h" #ifdef DEBUGGING #include "debug.h" #endif diff --git a/lib_rend/ivas_objectRenderer_hrFilt_fx.c b/lib_rend/ivas_objectRenderer_hrFilt_fx.c index 7426c3688..2a81e28a8 100644 --- a/lib_rend/ivas_objectRenderer_hrFilt_fx.c +++ b/lib_rend/ivas_objectRenderer_hrFilt_fx.c @@ -663,7 +663,7 @@ static void getPeriodicBSplineSampVec_fx( #ifdef FIX_2235_TD_RENDERER_WORD16 const Word16 *azimBsShape_fx, /* i : Basis shape Q15 */ #else - const Word32 *azimBsShape_fx, /* i : Basis shape Q30 */ + const Word32 *azimBsShape_fx, /* i : Basis shape Q30 */ #endif const Word16 subSampFactor /* i : Subsampling factor */ ) @@ -755,7 +755,7 @@ static void getStandardBSplineSampVec_fx( const Word16 *KSeq_fx, /* i : knot sequence including multiplicities Q KSeq_Q_fx */ const Word16 KSeq_Q_fx, /* i : Q-value of knot sequence */ #else - const Word32 *KSeq_fx, /* i : knot sequence including multiplicities Q22 */ + const Word32 *KSeq_fx, /* i : knot sequence including multiplicities Q22 */ #endif const Word16 SegSamples, /* i : samples per segment */ const Word16 *BsLen, /* i : lengths of basis shapes */ -- GitLab From a295c4d92bad22b921e1aa503c4e11b7e9548c15 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 27 Feb 2026 14:35:06 +0100 Subject: [PATCH 3/4] [revert-me] change CI ref --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f84bc99f..16772b81a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci-revision-and-upgrades-for-platform-upgrade # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo -- GitLab From bba4299613d968faa7f1ca6249c308aa9ab2fb0a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 27 Feb 2026 15:11:40 +0100 Subject: [PATCH 4/4] Revert "[revert-me] change CI ref" This reverts commit a295c4d92bad22b921e1aa503c4e11b7e9548c15. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16772b81a..3f84bc99f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci-revision-and-upgrades-for-platform-upgrade + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF main # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo -- GitLab