Commit 11945c10 authored by vaclav's avatar vaclav
Browse files

editorial improvements

parent ea249edf

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
#define FIX_2404_HARM_SIGNAL_CLAS                       /* VA: basop-2404, harmonize signal_clas and signa_ivas_clas */

#define HARMONIZE_ACELP_ENC                             /* VA: basop issue 2400: Remove duplicated main ACELP encoder function */

#define FIX_2392_MSAN_DESTROY_DEC                       /* VA: basop issue 2392: fix MSAN in ivas_destroy_dec_fx() */

#define HARMONIZE_TBE2

#define HARMONIZE_TBE2                                  /* VA: basop issue 2399: Remove duplicated code: TBE, step 2 */



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+5 −2
Original line number Diff line number Diff line
@@ -2989,9 +2989,11 @@ void GenShapedSHBExcitation_fx( 
    const Word32 bitrate,

    const Word16 prev_bfi );













void GenShapedSHBExcitation_ivas_enc_fx(















#ifdef HARMONIZE_TBE2













void GenShapedSHBExcitation_ivas_fx(















    const Word16 enc_dec, /* i  : encoder/decoder flag */













#else













void GenShapedSHBExcitation_ivas_enc_fx(















#endif















    Word16 *excSHB,                      /* o  : synthesized shaped shb excitation Q_bwe_exc*/















    const Word16 *lpc_shb,               /* i  : lpc coefficients Q12*/










@@ -3037,6 +3039,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(













    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */















);



























#ifndef HARMONIZE_TBE2















void GenShapedSHBExcitation_ivas_dec_fx(















    Word16 *excSHB,                      /* o : synthesized shaped shb excitation Q_bwe_exc*/















    const Word16 *lpc_shb,               /* i : lpc coefficients Q12*/










@@ -3078,7 +3081,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(













    Word16 *Env_error,            /* o  : error in SHB residual envelope modelling*/















    Word16 Env_error_part[]       /* o  : per-segment error in SHB residual envelope modelling */















);

























#endif















void GenSHBSynth_fx(















    const Word16 *shb_target_speech,  /* i  : i   synthesized speech                */















    Word16 *shb_syn_speech_32k,       /* o  : output highband component               */

































lib_com/swb_tbe_com_fx.c



+5
−1




























Original line number
Diff line number
Diff line








@@ -2618,9 +2618,11 @@ static void synthesis_enc_dec(













}















#endif





























void GenShapedSHBExcitation_ivas_enc_fx(















#ifdef HARMONIZE_TBE2













void GenShapedSHBExcitation_ivas_fx(















    const Word16 enc_dec, /* i  : encoder/decoder flag */













#else













void GenShapedSHBExcitation_ivas_enc_fx(















#endif















    Word16 *excSHB,                      /* o : synthesized shaped shb excitation Q_bwe_exc*/















    const Word16 *lpc_shb,               /* i : lpc coefficients Q12*/










@@ -3926,6 +3928,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(













    return;















}





























#ifndef HARMONIZE_TBE2















void GenShapedSHBExcitation_ivas_dec_fx(















    Word16 *excSHB,                      /* o : synthesized shaped shb excitation Q_bwe_exc*/















    const Word16 *lpc_shb,               /* i : lpc coefficients Q12*/










@@ -4946,6 +4949,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(













    *prev_mix_factor = mix_factor;















    return;















}













#endif































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















/* FUNCTION : void GenSHBSynth_fx() */

































lib_dec/swb_tbe_dec_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -6413,7 +6413,7 @@ void swb_tbe_dec_ivas_fx(













    Copy( hBWE_TD->state_syn_shbexc_fx, shaped_shb_excitation_fx, L_SHB_LAHEAD );































#ifdef HARMONIZE_TBE2













    GenShapedSHBExcitation_ivas_enc_fx( DEC, shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx,













    GenShapedSHBExcitation_ivas_fx( DEC, shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx,















                                        hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx,















                                        st->coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified_fx, st->extl,















                                        &( hBWE_TD->tbe_demph_fx ), &( hBWE_TD->tbe_premph_fx ), lpc_shb_sf_fx, shb_ener_sf_32,

































lib_enc/swb_tbe_enc_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -3950,7 +3950,7 @@ void swb_tbe_enc_ivas_fx(













    move16();































#ifdef HARMONIZE_TBE2













    GenShapedSHBExcitation_ivas_enc_fx( ENC, shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,













    GenShapedSHBExcitation_ivas_fx( ENC, shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,















#else















    GenShapedSHBExcitation_ivas_enc_fx( shaped_shb_excitation_fx + L_SHB_LAHEAD, lpc_shb_fx, White_exc16k_fx, hBWE_TD->mem_csfilt_fx,















#endif