Commit c07a7641 authored by vaclav's avatar vaclav
Browse files

GenShapedSHBExcitation_ivas_enc_fx() in decoder

parent acc49d42

lib_com/swb_tbe_com_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -3959,9 +3959,12 @@ void GenShapedSHBExcitation_ivas_dec_fx( 
    const Word16 flag_ACELP16k,   /* i  : ACELP@16kHz flag                                           */

    Word16 *nlExc16k,             /* i/o: NL exc for IC-BWE                                          */

    Word16 *mixExc16k,            /* i/o: exc spreading for IC-BWE                                   */

    

    

    const Word32 extl_brate,      /* i  : extension layer bitarte                                    */

    const Word16 MSFlag,          /* i  : Multi Source flag                                          */

    Word16 EnvSHBres_4k[],        /* i/o: TD envelope of the SHB residual signal                     */

    

    Word32 *prev_pow_exc16kWhtnd, /* i/o: power of the LB excitation signal in the previous frame    */

    Word16 *prev_mix_factor,      /* i/o: mixing factor in the previous frame                        */

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

lib_dec/swb_tbe_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -6411,6 +6411,17 @@ void swb_tbe_dec_ivas_fx( 
    move16();



    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,

                                        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,

                                        shb_res_gshape_fx, shb_res_dummy_fx, &vind, formant_fac_fx, hBWE_TD->fb_state_lpc_syn_fx,

                                        &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, hBWE_TD->prev_Q_bwe_syn, st->total_brate, st->prev_bfi,

                                        st->element_mode, st->flag_ACELP16k, nlExc16k_fx, mixExc16k_fx, NULL, NULL, st->extl_brate, MSFlag,

                                        NULL, 0, &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), NULL, NULL );

#else

    GenShapedSHBExcitation_ivas_dec_fx( 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,
@@ -6419,6 +6430,7 @@ void swb_tbe_dec_ivas_fx( 
                                        &( hBWE_TD->fb_tbe_demph_fx ), &Q_bwe_exc, &Q_bwe_exc_fb, Q_shb, n_mem2, hBWE_TD->prev_Q_bwe_syn, st->total_brate, st->prev_bfi,

                                        st->element_mode, st->flag_ACELP16k, nlExc16k_fx, mixExc16k_fx, st->extl_brate, MSFlag,

                                        NULL, &( hBWE_TD->prev_pow_exc16kWhtnd_fx32 ), &( hBWE_TD->prev_mix_factor_fx ), NULL, NULL );

#endif



    *Q_white_exc = Q_bwe_exc_fb;

    move16();