Commit eefa8f84 authored by vaclav's avatar vaclav
Browse files

formatting

parent 0d4d1ed9

lib_com/ivas_fb_mixer.c

+1 −0
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ void ivas_fb_mixer_get_windowed_fr( 
 *

 * FB Mixer cross fading

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



#ifndef FIX_SBA_VANISHING_RESIDUAL

static

#endif

lib_com/ivas_prot.h

+22 −20
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ int16_t ivas_spar_get_activeW_flag( 
    const int16_t nchan_inp,

	const int16_t nchan_transport,

	int16_t *res_ind,

	const int16_t *dmx_order);

	const int16_t *dmx_order

);

#endif



ivas_error ivas_sba_enc_reconfigure(
@@ -4516,12 +4517,13 @@ int16_t ivas_get_spar_dec_md_num_subframes( 
ivas_error ivas_spar_md_dec_matrix_open(

    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */

    const int16_t num_channels,                                 /* i  : number of internal channels             */

    const int16_t num_md_sub_frames );

    const int16_t num_md_sub_frames 

);



void ivas_spar_md_dec_matrix_close(

    ivas_spar_md_dec_state_t *hMdDecoder,                       /* i/o: SPAR MD decoder handle                  */

    const int16_t num_channels );            /* i  : number of internal channels */

    

    const int16_t num_channels                                  /* i  : number of internal channels             */

);

#endif



ivas_error ivas_spar_md_dec_open(

lib_com/ivas_spar_com.c

+3 −6
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ static void ivas_get_pred_coeffs( 
        float num_f, den_f, passive_g;

#ifdef FIX_SBA_VANISHING_RESIDUAL

        float activew_quad_thresh, g_th_sq;



        if ( dyn_active_w_flag == 1 )

        {

            activew_quad_thresh = 1.0f;
@@ -549,7 +550,6 @@ static void ivas_get_pred_coeffs( 
        float g_th_sq = IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH * IVAS_LIN_ACTIVEW_QUAD_ACTIVEW_THRESH;

#endif





        set_zero( dm_alpha, IVAS_MAX_NUM_BANDS );



        for ( i = 1; i < in_chans; i++ )
@@ -625,7 +625,6 @@ static void ivas_get_pred_coeffs( 
            }

#endif





#ifdef FIX_SBA_VANISHING_RESIDUAL

            if ( passive_g < activew_quad_thresh )

#else
@@ -1625,12 +1624,10 @@ void ivas_compute_spar_params( 
    int16_t b, i, ndm;



    ivas_get_pred_coeffs( cov_real, pred_coeffs_re, dm_fv_re, num_ch, start_band, end_band, active_w,

                          active_w_vlbr,

                          dtx_vad, from_dirac

                          active_w_vlbr, dtx_vad, from_dirac

#ifdef FIX_SBA_VANISHING_RESIDUAL

                          ,

                          dyn_active_w_flag,

                          hSparMd->res_ind

                          dyn_active_w_flag, hSparMd->res_ind

#endif

    );

lib_com/ivas_stat_com.h

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ typedef struct ivas_spar_md_t 
    int16_t res_ind;

    int16_t prior_dyn_active_w_flag;

#endif



} ivas_spar_md_t;



typedef struct ivas_spar_md_prev_t

lib_dec/ivas_spar_decoder.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ ivas_error ivas_spar_dec_open( 
#ifdef FIX_SBA_VANISHING_RESIDUAL

    hSpar->AGC_flag = 0;

#endif



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

     * Configuration - set SPAR high-level parameters

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