Commit e95117da authored by malenov's avatar malenov
Browse files

rewrite #ifdef ... #endif statements in a way that is compliant with the WMC tool

parent c1f418b3

lib_lc3plus/ltpf_coder.c

+3 −2
Original line number Diff line number Diff line
@@ -74,10 +74,11 @@ void process_ltpf_coder_fl(LC3_FLOAT* xin, LC3_INT xLen, LC3_INT ltpf_enable, LC 
    pitch_search_L_interpol1 = 4;



#ifdef CR9_K_REDUCE_NORM_CORR_TH

    if (pitch_ol_norm_corr > normCorrTh) {

    if (pitch_ol_norm_corr > normCorrTh)

#else

    if (pitch_ol_norm_corr > 0.6) {

    if (pitch_ol_norm_corr > 0.6)

#endif

    {

        /* Search Bounds */

        t0_min = pitch_ol - pitch_search_delta;

        t0_max = pitch_ol + pitch_search_delta;

lib_lc3plus/near_nyquist_detector.c

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ void processNearNyquistdetector_fl(LC3_INT16* near_nyquist_flag, const LC3_INT f 
{

    *near_nyquist_flag = 0;

#ifdef CR8_E_TONE_DETECTOR

    if (hrmode == 0){

    if (hrmode == 0)

#endif

    {

        if (fs_idx < 4)

        { 

            LC3_INT   i = 0;
@@ -43,8 +44,8 @@ void processNearNyquistdetector_fl(LC3_INT16* near_nyquist_flag, const LC3_INT f 
                *near_nyquist_flag = 1;

            }

        }

#ifdef CR8_E_TONE_DETECTOR

    } 

#ifdef CR8_E_TONE_DETECTOR

    else // hrmode == 1 

    {

        // inverse spectral flatness = mean(energy) ./ 2^(mean(log2(energy)));

lib_rend/ivas_dirac_dec_binaural_functions.c

+6 −4
Original line number Diff line number Diff line
@@ -3374,10 +3374,11 @@ static void ivas_masa_ext_rend_parambin_internal( 
    const int16_t subframe,

    const SPLIT_REND_WRAPPER *hSplitRendWrapper,

    float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] )

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]

#else

    const int16_t subframe )

    const int16_t subframe 

#endif

    )

{

    DIRAC_DEC_BIN_HANDLE hDiracDecBin;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
@@ -3620,10 +3621,11 @@ void ivas_masa_ext_rend_parambin_render( 
    const int16_t num_subframes,                                      /* i  : number of subframes to render                            */

    const SPLIT_REND_WRAPPER *hSplitRendWrapper,                      /* i  : split rendering orientation data                         */

    float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],  /* o  : rendered orientations for split rend. real part of cldfb */

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] ) /* o  : rendered orientations for split rend. imag part of cldfb */

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]   /* o  : rendered orientations for split rend. imag part of cldfb */

#else

    const int16_t num_subframes ) /* i  : number of subframes to render                            */

    const int16_t num_subframes  /* i  : number of subframes to render                            */

#endif

    )

{

    int16_t subframe;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;