Commit af28c61f authored by multrus's avatar multrus
Browse files

formatting

parent f7c54110

lib_com/ivas_cov_smooth.c

+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ static void ivas_set_up_cov_smoothing( 
    const int16_t min_pool_size,

    const int16_t nchan_inp /* i  : number of input channels       */

    ,

    const int32_t ivas_total_brate

)

    const int32_t ivas_total_brate )

{

    int16_t j, k;

    if ( ivas_total_brate < IVAS_24k4 )
@@ -91,8 +90,7 @@ static void ivas_set_up_cov_smoothing( 
            }

        }

    }

    else

        if ( nchan_inp <= FOA_CHANNELS )

    else if ( nchan_inp <= FOA_CHANNELS )

    {

        for ( j = 0; j < pFb->filterbank_num_bands; j++ )

        {

lib_com/ivas_sba_config.c

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ 
 *-------------------------------------------------------------------*/



/*! r: SBA format mode */

SBA_MODE ivas_sba_mode_select(

)

SBA_MODE ivas_sba_mode_select()

{

    return SBA_MODE_SPAR;

}

lib_com/ivas_spar_com.c

+7 −14
Original line number Diff line number Diff line
@@ -77,16 +77,11 @@ 
 *------------------------------------------------------------------------------------------*/





static void ivas_get_pred_coeffs( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ppPred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ppDM_Fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t start_band, const int16_t end_band, const int16_t active_w,

                                  const int16_t active_w_vlbr,

                                  const int16_t dtx_vad,

                                  const int16_t from_dirac );

static void ivas_get_pred_coeffs( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ppPred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ppDM_Fv_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t start_band, const int16_t end_band, const int16_t active_w, const int16_t active_w_vlbr, const int16_t dtx_vad, const int16_t from_dirac );



static void ivas_reorder_array( float in_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS], const int16_t in_chans, const int16_t order[IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t start_band, const int16_t end_band );



static void ivas_get_Wscaling_factor( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ***mixer_mat, const int16_t start_band, const int16_t end_band, const int16_t dtx_vad, const int16_t num_ch, const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w,

                                      const int16_t active_w_vlbr,

                                      float *pWscale );

static void ivas_get_Wscaling_factor( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ***mixer_mat, const int16_t start_band, const int16_t end_band, const int16_t dtx_vad, const int16_t num_ch, const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, const int16_t active_w_vlbr, float *pWscale );



static void ivas_calc_post_pred_per_band( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t num_ch, const int16_t num_dmx, const int16_t band_idx, float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] );
@@ -1668,11 +1663,9 @@ void ivas_get_spar_md_from_dirac( 
    const int16_t end_band,

    const int16_t order,

    const int16_t dtx_vad,

    float Wscale_d[IVAS_MAX_NUM_BANDS]

    ,

    float Wscale_d[IVAS_MAX_NUM_BANDS],

    const uint8_t useLowerRes,

    const int16_t active_w_vlbr

)

    const int16_t active_w_vlbr )

{

    int16_t num_ch, band, i, j;

    int16_t block, ch;

lib_com/ivas_stereo_td_bit_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ void tdm_SCh_LSF_intra_pred( 
}







/*-------------------------------------------------------------------*

 * tdm_SCh_LSF_intra_pred_one_bit_dec()

 *
@@ -726,4 +725,3 @@ void tdm_SCh_lsf_reuse( 


    return;

}

lib_com/lsf_tools.c

+9 −11
Original line number Diff line number Diff line
@@ -2614,5 +2614,3 @@ void create_IDCT_N_Matrix( float *inv_matrixFloatQ, const int16_t N, const int16 
        }

    }

}