Commit 31742830 authored by vaillancour's avatar vaillancour
Browse files

simple cleaning or addition of comments

parent 3288f81e

lib_com/gs_preech_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void pre_echo_att_fx( 


        etmp_fx = sum2_fx( exc_fx, L_frame ); /*2*Q_new+1 */

#ifdef ADD_LRTD

        PMTE()

        PMTE()/*"division by 256 or 320 needed"*/

        etmp_fx = L_shr(etmp_fx, add(8 + 1 - 4, shl(Q_new, 1))); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/

#else

        etmp_fx = L_shr(etmp_fx,add(8+1-4, shl(Q_new,1))); /*2*Q_new+1 //INV_L_FRAME = 1/256 -> Q4*/

lib_com/int_lsp_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ void int_lsp4_fx( 
        {

            pt_int_coeffs = interpol_frac_mid_relaxprev_pred_12k8_fx;

        }

#ifdef IVAS_CODE

        ELSE IF (EQ_16(relax_prev_lsf_interp, -2))

        {

            pt_int_coeffs = interpol_frac2_mid_fx;

        }

#endif

        ELSE

        {

            pt_int_coeffs = interpol_frac_mid_fx;

lib_dec/amr_wb_dec_fx.c

+7 −11
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ ivas_error amr_wb_dec_fx( 
    st_fx->igf = 0;

    move16();



    st_fx->sr_core     = i_mult(st_fx->L_frame_fx,50);

    st_fx->sr_core     = i_mult(st_fx->L_frame_fx, FRAMES_PER_SEC);

    st_fx->fscale_old  = st_fx->fscale;

    st_fx->fscale      = sr2fscale(st_fx->sr_core);
@@ -330,7 +330,7 @@ ivas_error amr_wb_dec_fx( 
        move16();

    }

#ifdef _DIFF_FLOAT_FIX_

    PMT("the code below has been removed in IVAS float (or moved somewhere else), is it ok?")

    PMT("the code below has been removed in IVAS float (or moved somewhere else), TBV")

#endif

    IF( NE_16(st_fx->last_core_fx,AMR_WB_CORE))

    {
@@ -374,13 +374,6 @@ ivas_error amr_wb_dec_fx( 
            class_para_fx = 0;

            move16();



            // has been moved to updt_dec_common_fx()

            //if( st_fx->first_CNG_fx == 0 )

            //{

            //    st_fx->first_CNG_fx = 1;

            //    move16();

            //}

 

            delta_mem_scale = 3;

            move16();

            test();
@@ -743,7 +736,10 @@ ivas_error amr_wb_dec_fx( 
    Copy( syn_fx_tmp2, syn_fx, L_FRAME );



    /* TCX=Q-1, ACELP2 Q0 */

    IF (hTcxDec != NULL)

    {

        Copy_Scale_sig(syn_fx + L_FRAME / 2, hTcxDec->old_syn_Overl, L_FRAME / 2, sub(-1, st_fx->Q_syn)); /*Q_syn*/

    }

    Copy_Scale_sig( syn_fx + L_FRAME-M-1, st_fx->syn, M+1, sub(0,st_fx->Q_syn)); /*Q0*/



    /*------------------------------------------------------------------*
@@ -1070,7 +1066,7 @@ ivas_error amr_wb_dec_fx( 
    /* HP filter */

    Scale_sig32( st_fx->L_mem_hp_out_fx, 4, sub(st_fx->Q_syn2, st_fx->Qprev_synth_buffer_fx) );

    st_fx->Qprev_synth_buffer_fx = st_fx->Q_syn2;

    hp20( synth_out_fx, 1/*stride*/, output_frame, st_fx->L_mem_hp_out_fx, L_mult0(output_frame, 50) );

    hp20( synth_out_fx, 1/*stride*/, output_frame, st_fx->L_mem_hp_out_fx, L_mult0(output_frame, FRAMES_PER_SEC) );



    /* save synthesis for core switching */

    Copy_Scale_sig( synth_out_fx+NS2SA_fx2( st_fx->output_Fs_fx,ACELP_LOOK_NS+DELAY_BWE_TOTAL_NS), st_fx->old_synth_sw_fx, NS2SA_fx2(st_fx->output_Fs_fx,FRAME_SIZE_NS-ACELP_LOOK_NS-DELAY_BWE_TOTAL_NS), sub(hHQ_core->Q_old_postdec, st_fx->Q_syn2) );

lib_dec/core_dec_switch.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void mode_switch_decoder_LPD( 
        test();

        test();

        test();

        if ( ((GT_32(total_brate, 32000)) && (st->tcxonly==0)) || ((LE_32(total_brate,32000)) && (st->tcxonly!=0)))

        if ( ((GT_32(total_brate, 32000)) && (st->tcxonly==0)) || ((LE_32(total_brate,32000)) && (st->tcxonly!=0)))    /*st->tcxonly!=0  -> in float is == 1 */

        {

            switchWB = 1;

            move16();
@@ -207,7 +207,7 @@ void mode_switch_decoder_LPD( 
    test();

    IF( (EQ_16(bwidth, SWB))&& (EQ_32(total_brate, ACELP_16k40) || EQ_32(total_brate, ACELP_24k40)) && EQ_16(st->element_mode, EVS_MONO) )

    {

        IF (st->tec_tfa == 0)

        IF (st->tec_tfa == 0 /*&& st->hTECDec != NULL*/)

        {

            set16_fx(st->tecDec_fx.loBuffer, 0, MAX_TEC_SMOOTHING_DEG);

        }
@@ -230,7 +230,7 @@ void mode_switch_decoder_LPD( 
    move16();

    test();

    test();

    IF  ( GE_16(bwidth, WB) && EQ_32(total_brate, 24400) && EQ_16(st->element_mode, EVS_MONO) ) 

    IF  ( GE_16(bwidth, WB) && EQ_32(total_brate, ACELP_24k40) && EQ_16(st->element_mode, EVS_MONO) )

    {

        st->enableGplc = 1;

        move16();
@@ -240,7 +240,7 @@ void mode_switch_decoder_LPD( 
    test();

    test();

    test();

    IF (( EQ_32(total_brate, 9600) || EQ_32(total_brate,16400) || EQ_32(total_brate, 24400)) && EQ_16(st->element_mode, EVS_MONO) )

    IF (( EQ_32(total_brate, ACELP_9k60) || EQ_32(total_brate, ACELP_16k40) || EQ_32(total_brate, ACELP_24k40)) && EQ_16(st->element_mode, EVS_MONO) )

    {

        st->dec_glr = 1;

        move16();

lib_dec/core_switching_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -850,13 +850,13 @@ ivas_error core_switching_pre_dec_fx( 
            set16_fx(hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2);

        }



        IF( GE_32(st_fx->output_Fs_fx, 16000L) && st_fx->hBWE_zero != NULL)

        IF( GE_32(st_fx->output_Fs_fx, INT_FS_16k) && st_fx->hBWE_zero != NULL)

        {

            hf_synth_reset_fx(st_fx->hBWE_zero);

        }

        IF(hBWE_FD != NULL)

        {

            set16_fx(hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA(16000, DELAY_FD_BWE_ENC_NS));

            set16_fx(hBWE_FD->old_syn_12k8_16k_fx, 0, NS2SA(INT_FS_16k, DELAY_FD_BWE_ENC_NS));

        }

    }

#ifdef IVAS_CODE_SWITCHING