Commit 4927a323 authored by gaoyuy's avatar gaoyuy
Browse files

moved variable first_frm_flag to hStereoDft & clang format

parent 2d858703

lib_enc/ivas_stat_enc.h

+3 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ typedef struct stereo_dft_enc_data_struct 
    float res_cod_NRG_S[STEREO_DFT_BAND_MAX];

    float res_cod_SNR_M[STEREO_DFT_BAND_MAX];

    float old_snr;

#ifdef ADAP_OPT

    int16_t first_frm_flag; /* ADAP first frame flag */

#endif



    /* flags and data for adaptive wideband residual coding */

    float res_dmx_ratio_lt;                /* long term energy ratio between RES and DMX */

lib_enc/ivas_stereo_dft_enc.c

+10 −6
Original line number Diff line number Diff line
@@ -520,6 +520,10 @@ void stereo_dft_enc_reset( 
    hStereoDft->hItd->prev_itd1 = 0;

    hStereoDft->hItd->prev_itd2 = 0;



#ifdef ADAP_OPT

    hStereoDft->first_frm_flag = 1;

#endif



#ifdef DEBUG_MODE_DFT

    hStereoDft->verbose = 1;

#endif
@@ -1734,9 +1738,7 @@ static void stereo_dft_enc_get_res_cod_mode_flag( 
    float dmx_res_all, g;

    int16_t fast_update_flag;

    int16_t prev_res_cod_mode_flag, res_cod_mode_flag;

#ifdef ADAP_OPT

    static int first_frm_flag = 1;

#endif



    k_offset = STEREO_DFT_OFFSET; /*Add an offset at encoder*/



    /*Calculate energy ratio between residual signal and downmix signal */
@@ -1799,11 +1801,13 @@ static void stereo_dft_enc_get_res_cod_mode_flag( 


    /* Get the residual signal coding flag */

#ifdef ADAP_OPT

    if (first_frm_flag) {

    if ( hStereoDft->first_frm_flag )

    {

        prev_res_cod_mode_flag = res_cod_mode_flag;

        first_frm_flag = 0;

        hStereoDft->first_frm_flag = 0;

    }

    else {

    else

    {

        prev_res_cod_mode_flag = hStereoDft->res_cod_mode[STEREO_DFT_OFFSET - 1];

    }

#else