Commit 1df39a6b authored by vaclav's avatar vaclav
Browse files

harmonize est_tilt_ivas_fx(), under CLEANUP_ACELP_ENC

parent 3113ee25

lib_com/est_tilt_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
/* RETURN ARGUMENTS :                                                    */

/* _ (Word16) tolt_code :  tilt of the code           Q15                */

/*=======================================================================*/

#ifndef CLEANUP_ACELP_ENC

Word16 est_tilt_fx(                         /* o  : tilt of the code              Q15      */

                    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */

                    const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */
@@ -111,9 +112,14 @@ Word16 est_tilt_fx( /* o : tilt of the code 
/* RETURN ARGUMENTS :                                                    */

/* _ (Word16) tolt_code :  tilt of the code           Q15                */

/*=======================================================================*/

#endif



/* o  : tilt of the code Q15 */

#ifdef CLEANUP_ACELP_ENC

Word16 est_tilt_fx(

#else

Word16 est_tilt_ivas_fx(

#endif

    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */

    const Word16 gain_pit,  /* i  : adaptive gain                   Q14 */

    const Word16 *code,     /* i  : algebraic excitation vector    Q9  */

lib_com/prot_fx.h

+8 −2
Original line number Diff line number Diff line
@@ -4840,9 +4840,15 @@ Word16 est_tilt_fx( 
    const Word16 *code,     /* i  : algebraic exctitation vector    Q9  */

    const Word32 gain_code, /* i  : algebraic code gain             Q16 */

    Word16 *voice_fac,      /* o  : voicing factor                  Q15 */

#ifdef CLEANUP_ACELP_ENC

    const Word16 Q_exc,     /* i  : Scaling factor of excitation    Q0  */

    const Word16 L_subfr    /* i  : Sub frame length                    */

#else

    const Word16 Q_exc   /* i  : Scaling factor of excitation    Q0  */

#endif

);













#ifndef CLEANUP_ACELP_ENC















/* o  : tilt of the code Q15 */















Word16 est_tilt_ivas_fx(















    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */









@@ -4857,7 +4863,7 @@ Word16 est_tilt_ivas_fx(













    const Word16 flag_tilt /* i  : flag for special tilt        */















#endif















);

























#endif















/* o  : tilt of the code                    */















Word16 Est_tilt2(















    const Word16 *exc,      /* i  : adaptive excitation vector      Qx  */

































lib_dec/acelp_core_switch_dec_fx.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -940,7 +940,11 @@ static void decod_gen_voic_core_switch_fx(













    /* _ (Word32*) gain_code : quantized codebook gain (Q16)                               */















    /* _ (Word16*) gain_inov : gain of the innovation (used for normalization) (Q12)       */















    /* _ (Word32*) norm_gain_code : norm. gain of the codebook excitation (Q16)            */













#ifdef CLEANUP_ACELP_ENC













    st_fx->tilt_code_fx = est_tilt_fx( exc, gain_pit, code, gain_code, &voice_fac, *Q_exc, L_SUBFR ); /*Q15*/













#else















    st_fx->tilt_code_fx = est_tilt_fx( exc, gain_pit, code, gain_code, &voice_fac, *Q_exc ); /*Q15*/













#endif















    move16();































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

































lib_dec/dec_amr_wb_fx.c



+5
−0




























Original line number
Diff line number
Diff line








@@ -84,6 +84,7 @@ void decod_amr_wb_fx(













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































        lp_filt_exc_dec_fx( st_fx, MODE1, i_subfr, L_SUBFR, L_FRAME, lp_flag, exc_fx );





























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















         * Innovation decoding















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









@@ -100,7 +101,11 @@ void decod_amr_wb_fx(













        /* update LP filtered gains for the case of frame erasures */















        lp_gain_updt_fx( i_subfr, gain_pit_fx, L_norm_gain_code_fx, &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_FRAME );





























#ifdef CLEANUP_ACELP_ENC













        st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr, gain_pit_fx, code_fx, L_gain_code_fx, &voice_fac_fx, st_fx->Q_exc, L_SUBFR );













#else















        st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr, gain_pit_fx, code_fx, L_gain_code_fx, &voice_fac_fx, st_fx->Q_exc );













#endif















        move16();































        Rescale_exc( hMusicPF->dct_post_old_exc_fx, &exc_fx[i_subfr], NULL, st_fx->hGSCDec->last_exc_dct_in_fx, L_SUBFR, 0,

































lib_dec/dec_gen_voic_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -218,7 +218,7 @@ ivas_error decod_gen_voic_fx(













        }































#ifdef CLEANUP_ACELP_ENC













        st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, st_fx->Q_exc, L_SUBFR ); // Q15













        st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, st_fx->Q_exc, L_SUBFR ); // Q15















#else















        st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx + i_subfr_fx, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, st_fx->Q_exc, L_SUBFR, 0 ); // Q15















#endif