diff --git a/apps/encoder.c b/apps/encoder.c index 9e10a9c5c6774d5398b591801feadf8e9282d4f7..31d9b448c12086cf44d354d70b05f015bcdce377 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 diff --git a/apps/encoder_fmtsw.c b/apps/encoder_fmtsw.c index 12cc57349ebfe62d144ffb4d9320d9cf3b68d86f..036144175bb19bd589391fcfe777b7c8f725a8ed 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 79544c078cfc742923c9c3c5e874f2f5debe3b9f..6d1d513a2fdd79ddd2a0dd71f2afe9e1f70ac19d 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 ba6dc36fe690823d962cc454389efff9532bfaca..71f30f83ff4c007157d9413fd77104188ee90998 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 c75e0831246af5b7316ed8ee7af48948807c43bd..ba82aae4ba4c2b2bf13ab2ddd8fbd9347ee1f154 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 49a83bc7bba3971805ddde88e8584f9824c8c9a5..f86e66f60a549202713cca61951766ab3244ec92 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 eff398b330db5b5ab4b9b32bfb8f5537257b8a34..ef6d2d354aa8225a7d0cab9ff8f50563cccd17c2 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 96db4fb331317f6b16924f9b4ef919ba9ba65e6b..a6f0bdb381677b51e2f3e0421c453aa057c678d7 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 f74aea076c12bb762ec5a364a63e4d852ef22e07..431a509b1807a5a7375a1a58ab5c9f4e56b012f8 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 f968ccb9039e0b0e48468fdfa4c71cac64f846fa..946f770e8f47dec5f09ef005179bd0e5f831e321 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 0eb1456038091955fc4d7742efcd47a6e60747a5..00347cac7c4b6038b8d3af85a53d5b54754cca71 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 339826d531f793c24ee077b439cab50928d4ec4a..0f5f1ec579886b1a3bb94e76a6a530ce12b099ff 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 20f6e7f708cff4f64ab4d0d992eb4269eea9140e..ec330496f345b9a53a92758454345e392af0a769 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 7d25477b42aa76389d1197c65bac45ca7be3472c..a925373471b70fc0ee7859dca7ecec4a7c3beee1 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 60f22396ea4bd113e91eafb998228fbd351a5a72..7a6ba9ac4015b33dfddc09127555461619797cd0 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 74a1520032ca95876d8677172430d0b9694ec00a..f3414dc71815a5517a0e6e449d484d7bf7c32eb5 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 f9e2d919c9bb8b47922c61e8e44df86a632b54e3..eca622dd05bbd9ac9dc2c30563ca1b7fda869185 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 92b08554e2f772375c34d4974fa773d0ca7cc851..7b32f789e85ed9c52c694ce67a798ecdb87a644c 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 479781d27f81ada362100741eef47eb6c2d2915b..dafa4561cc7f403b224723e4bbfaca16e42d21f1 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 5e42145521b79d7ded9734a556cb8f8b2e3bf642..c98afa1ee0781b5a73a43cf362a980152864282d 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 45aba6a058e66b7eddb206ed568604586c346529..dbc7d44ec6a1a578f6690aaf41e525453a9b306d 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 4f0614fba3265c0e0f93e072eadf366dbe6c065f..14bd84b79506c56b9d297eca6c52dafa16c3f62a 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 b3bd7d112b850a0f708343296bd577beb645013b..44108f56c4753f1e3951837d82f1b9f62414dd60 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 5181a08ffc86760cf387885ed8b0953bc65bdbc7..7eaccfceab0254d815aaf85bf77de987d7577b46 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 f72a955a8e8b055e0ac0c7ea7c0b3e7c06d72bd7..c138f0e21b4ae72baabb061ea9a97b7ab6b7fac0 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 53cda71c19f689b630b1f9d6a9eebca739785d73..b81412ead1e24f0ad8fe67ab4cce67bc2183e966 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 56ea1e9dd3f4193c9f93447498e8eba77adad866..ef0f639a98d6c232f8aacd0da9400e10bcbe4c78 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 54e6148af0ae94641339d7b0a962c83cf7cfd116..ea810ab67df717a24556c908ace623c724c0c76d 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 57692bbefc0919f12b67ee156432804c8ae5b14f..e7a339af6fe5cd564088301a64658ffd9cc2f864 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 eab151d7eee9402996a00938f1026583efa5c115..9732239d30c31ece1cd7f75ab7a64989c7d0eb88 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 5779ea017816e2f036f63face051da59e5b019c7..8a957b2678f98d82861130fad233622c22ea1481 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 a587e816ac363ad5265a8b21420e5b31338d0840..3557f0a376dbc08b134b5aeeeb695d50ca70cbbe 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 bc502d49fe69a6ca5f7d5ec25f64af4c7795a54e..b6de7a5d236133b5347aae5cfae34309a1e27caf 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 ff6784c4e17bd0de3ca5515a6fe7d561510f36e1..f3373dc0183e71ee41e73be5294ea1fba27dec69 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 89bfadac57e2a19a230c9ce195b1d5134cff34c5..4b126e2dcdb9845c3bc5de1e16511e0a8a59c64d 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 9e8434cfc160e92ea6c00ba85b6e3a060e57e468..324c600a226d1d14d8c1c959c3b6c6fef8634469 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 6e9571442c42a0ad30931c3511d36f1c17164ac0..fa5f85f8ce0bd8570a59ba9d8edd98e38ab140bf 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 5d4d93fdfaf6d1aa6859cb40eb5f9a3835058d7c..ab6d62658f80002e093ac5067ff5ecdf3aec2868 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 78af3cda39a85549120dfe211d4fdcaf79a268de..b628ea0f5b1bc9a34b494fcff6a5d63f0078acd7 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 ba8838e05795761df22c46872e17effe7353ed1f..89102d926fb92e3e47b39ad97746efd25814e848 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 daf9048a4df248ddea1a4ef5fb511142632fcba0..7026f2603178044ff4e29c4ca7c454fc1103de18 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 4a549ffef8e0ddd11f52ffc3ff0ea5576cc2bfd9..c691af8ba3da056e8cd8a14b072fb6f169f286ef 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 60427f792b0877bc47e79a7bf6087f6161ca2fb2..baea8b4f91f3d9e800a4dc7e4fc66d9eff7c39ba 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 36880d3d5cd6d9f73b6536ee1949911bb1d385bd..6bc31dd0a66f18753e065a5f6dd43ab7776e2540 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 67476f993d40d0b86101138e67942b60fcb152df..e25e4d50c250291d5e8b2b90c69e463b5c380a25 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 b379f24ef12bf213da0b25001f10d716d6a2c5f9..b875a7ee400b8d52c74b353d57866b51953cccf2 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 3436a1d681e79b4d9822da261aa0f76414c293e3..c4a5705c254fd4698eb9f8093329d8f199dd40e6 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 b6ffbc7381b035a539d709a2d4de1b89db5018e6..eec0b656d67f40db5ce177b73c95073968229003 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 62469f3a7f522f8dcb9db781f9fdc334c46e5225..b3aac988cdd0e8c5ac0ad2e24322a311413c5aaa 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 32ab21877f844b8b1876a310dab6ee8ba590e645..780e0e89e843b816b03104391107bf99dac14352 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 461e15dc8cdfc24c55b7f45d2fe03ad566b286e5..6f469f48b270d8577c3ba5fdab08457752bdd1cf 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 793da7b9fba9404e05dfaec15cd1a8b85bd1b055..5ce87a91f3e63ed04bce08777a3ee9b296b3609b 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 9b33cc6537b7d3fe31df3a4e2ed1232b68b437dc..5b34a4ff3527a3fefd659717d56584eef8e856c3 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 b4047a750e6abc8e3907b19d5bbd0ec75475c1cb..8fb28c90bbeec89f4334db73e06150af43509268 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 7426c3688f649a43c7237a7f510588c0dda1269f..2a81e28a8bc4def811a50cb4c9e2733b5d440f02 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 */