diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c index 9486566ece889f82b82e0d6b43f9e0cb9e886520..37977473e27b67fb8c936b6d193c68c15d64f330 100644 --- a/lib_com/fd_cng_com_fx.c +++ b/lib_com/fd_cng_com_fx.c @@ -2461,9 +2461,11 @@ void SynthesisSTFT ( scale = 0; BASOP_rfft(fftBuffer, hFdCngCom->fftlen, &scale, 1); fftBufferExp = add(fftBufferExp, scale); +#ifdef EVS_FLOAT #ifdef IVAS_FLOAT_FIXED hFdCngCom->fftBuffer_exp = fftBufferExp; #endif +#endif // EVS_FLOAT fftBufferExp = add(fftBufferExp, hFdCngCom->fftlenShift); /* Perform overlap-add */ diff --git a/lib_com/prot_fx2.h b/lib_com/prot_fx2.h index bd35315f6071526bfbc2ae3aef5a9ff30dbe4d8f..31012bd6e1c7e28cdd67ef103570a687b2593284 100644 --- a/lib_com/prot_fx2.h +++ b/lib_com/prot_fx2.h @@ -7401,6 +7401,10 @@ void generate_comfort_noise_dec_hf_ivas_fx( Decoder_State *st_fx /* i/o: encoder state structure */ ); + void bandwidth_switching_detect_ivas_fx( + Decoder_State *st_fx /* i/o: encoder state structure */ + ); + void bw_switching_pre_proc_fx( const Word16 *old_syn_12k8_16k_fx, /* i : ACELP core synthesis at 12.8kHz or 16kHz */ Decoder_State *st_fx /* i/o: decoder state structure */ diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c index 705a8b205271b1aaba064b8f8583783e1a0c3992..93ebde8f827d40b1709292b3dd77281dad0b5262 100644 --- a/lib_dec/FEC_pitch_estim_fx.c +++ b/lib_dec/FEC_pitch_estim_fx.c @@ -63,12 +63,16 @@ void FEC_pitch_estim_fx( #else tmp16k2 = shl(tmp16k1,1); /*Q6 1.4f * old_pitch_buf[2*NB_SUBFR16k-1]*/ #endif +#ifdef EVS_FLOAT #if 1//def IVAS_CODE test(); test(); IF (EQ_16(last_core, HQ_CORE) || EQ_16(last_core, TCX_20_CORE) || EQ_16(last_core, TCX_10_CORE)) #else IF( EQ_16(last_core,HQ_CORE)) #endif +#else + IF( EQ_16( last_core, HQ_CORE ) ) +#endif // EVS_FLOAT { *bfi_pitch = pitch_buf[shr(L_frame,6)-1]; move16(); diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c index 7798bf609902d49efdb7f63d48cf9017076c14da..e92b6cb045b847f27fa5f0160c3e79f257ccac1b 100644 --- a/lib_dec/LD_music_post_filter_fx.c +++ b/lib_dec/LD_music_post_filter_fx.c @@ -783,11 +783,15 @@ void Prep_music_postP_fx( /*------------------------------------------------------------* * Resetting some memories in case of switching *------------------------------------------------------------*/ +#ifdef EVS_FLOAT #if 1//def _DIFF_FLOAT_FIX_ IF( EQ_16(last_core,HQ_CORE) || EQ_16(last_core, TCX_20_CORE) || EQ_16(last_core, TCX_10_CORE) ) #else IF(EQ_16(last_core, HQ_CORE)) #endif +#else + IF( EQ_16( last_core, HQ_CORE ) ) +#endif // EVS_FLOAT { set16_fx( filt_lfE, 4096, DCT_L_POST ); set16_fx( LDm_enh_lp_gbin, 16384, VOIC_BINS_HR ); diff --git a/lib_dec/TonalComponentDetection_fx.c b/lib_dec/TonalComponentDetection_fx.c index a63be1eb9e9790081ce47daad0aa205c5304032a..c7357cc7d342f8ae4e16d5d58824e0e0081dcc3e 100644 --- a/lib_dec/TonalComponentDetection_fx.c +++ b/lib_dec/TonalComponentDetection_fx.c @@ -1029,8 +1029,11 @@ static void findTonalComponents( } /* Side lobe increase must be 2 times smaller than the decrease to the foot */ /* Eq. to 2.0f*powerSpectrum[lowerIdx-1]/powerSpectrum[lowerIdx] > powerSpectrum[lowerIdx]/powerSpectrum[j] */ - /*IF (GT_32( Mpy_32_32(L_shl(powerSpectrum[upperIdx+1], 1), powerSpectrum[j]), Mpy_32_32(powerSpectrum[upperIdx], powerSpectrum[upperIdx])))*/ +#ifdef EVS_FLOAT IF( GT_64( W_mult_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), W_mult_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) ) +#else + IF( GT_32( Mpy_32_32( L_shl( powerSpectrum[upperIdx + 1], 1 ), powerSpectrum[j] ), Mpy_32_32( powerSpectrum[upperIdx], powerSpectrum[upperIdx] ) ) ) +#endif // EVS_FLOAT { BREAK; } diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index add4d21473b8197b24fd6dca64f4cc4a3aa755d3..6706f35894f73b4d1d54e49ac854d7458faba14b 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -1838,7 +1838,7 @@ void bandwidth_switching_detect_ivas_fx( move16(); } ELSE IF( GT_32(st_fx->total_brate, ACELP_9k60)&<_32(st_fx->last_core_brate,ACELP_9k60) - && EQ_16(st_fx->bwidth, SWB) && EQ_16(st_fx->last_bwidth, WB) ) + && EQ_16(st_fx->bwidth, SWB) && EQ_16(st_fx->last_bwidth, WB) && EQ_16(st_fx->last_low_rate_mode , 0)) { st_fx->bws_cnt1 = add(st_fx->bws_cnt1,1); move16(); diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index e5e716a3b8ee3801fb26f93fa34972d8da1ca679..8789cbd88ba5de18d4fc38275344190a5a9f8980 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -1355,7 +1355,7 @@ ivas_error core_switching_post_dec_fx( test(); test(); test(); - IF(st_fx->prev_bws_cnt == 0 || (st_fx->prev_bws_cnt > 0 && NE_16(st_fx->coder_type, INACTIVE)&&NE_16(st_fx->coder_type,AUDIO))) + IF(st_fx->bws_cnt == 0 || (st_fx->bws_cnt > 0 && NE_16(st_fx->coder_type, INACTIVE)&&NE_16(st_fx->coder_type,AUDIO))) { st_fx->attenu_fx = 3277; move16(); @@ -1365,7 +1365,7 @@ ivas_error core_switching_post_dec_fx( ((EQ_16(st_fx->last_core, HQ_CORE) || EQ_16(st_fx->last_extl, SWB_TBE) ) && st_fx->extl < 0 && NE_16(st_fx->core, HQ_CORE) ) || (EQ_16(st_fx->last_core,ACELP_CORE) && EQ_16(st_fx->core,ACELP_CORE) && ((NE_16(st_fx->prev_coder_type,INACTIVE) && EQ_16(st_fx->coder_type,INACTIVE) ) || (NE_16(st_fx->prev_coder_type,AUDIO) && EQ_16(st_fx->coder_type,AUDIO) )) - && st_fx->prev_bws_cnt > 0) + && st_fx->bws_cnt > 0) ) { set16_fx(hBWE_FD->L_old_wtda_swb_fx, 0, output_frame ); @@ -1432,8 +1432,8 @@ ivas_error core_switching_post_dec_fx( IF( (( EQ_16(st_fx->extl, SWB_TBE)||EQ_16(st_fx->extl,FB_TBE)||EQ_16(st_fx->extl,SWB_CNG))&& ( NE_16(st_fx->L_frame, st_fx->last_L_frame) || ( NE_16(st_fx->last_extl, SWB_TBE) && NE_16(st_fx->last_extl, FB_TBE) ) || EQ_16(st_fx->last_core, HQ_CORE) )) || ( LT_16(st_fx->bwidth, st_fx->last_bwidth) && NE_16(st_fx->last_extl, SWB_TBE) ) || st_fx->old_ppp_mode_fx - || ((EQ_16(st_fx->prev_coder_type, AUDIO) || EQ_16(st_fx->prev_coder_type, INACTIVE) ) && st_fx->prev_bws_cnt > 0) - || (st_fx->prev_bws_cnt == 0 && EQ_16(st_fx->prev_bws_cnt, N_WS2N_FRAMES)) ) + || ((EQ_16(st_fx->prev_coder_type, AUDIO) || EQ_16(st_fx->prev_coder_type, INACTIVE) ) && st_fx->bws_cnt > 0) + || (st_fx->bws_cnt == 0 && EQ_16(st_fx->prev_bws_cnt, N_WS2N_FRAMES)) ) { swb_tbe_reset_fx(hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx, hBWE_TD->syn_overlap_fx, hBWE_TD->state_syn_shbexc_fx, &(hBWE_TD->tbe_demph_fx), &(hBWE_TD->tbe_premph_fx) diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c index 47b5c3a94777092917e6b142611c199554cb834e..d53ab6b2bafdc9920f433f5997bdd544186362b1 100644 --- a/lib_dec/dec_tran_fx.c +++ b/lib_dec/dec_tran_fx.c @@ -155,7 +155,14 @@ void decod_tran_fx( /* update LP filtered gains for the case of frame erasures */ lp_gain_updt_fx( i_subfr, gain_pit_fx, L_add(norm_gain_code_fx,norm_gain_preQ_fx), &st_fx->lp_gainp_fx, &st_fx->lp_gainc_fx, L_frame_fx ); - st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx+i_subfr, gain_pit_fx, code_fx, gain_code_fx,&voice_fac_fx,st_fx->Q_exc, L_SUBFR, 0); + IF ( st_fx->element_mode == EVS_MONO ) + { + st_fx->tilt_code_fx = est_tilt_fx( exc_fx + i_subfr, gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, st_fx->Q_exc ); + } + else + { + st_fx->tilt_code_fx = est_tilt_ivas_fx( exc_fx+i_subfr, gain_pit_fx, code_fx, gain_code_fx,&voice_fac_fx,st_fx->Q_exc, L_SUBFR, 0); + } /*----------------------------------------------------------------------* * Find the total excitation diff --git a/lib_dec/gain_dec_fx.c b/lib_dec/gain_dec_fx.c index 5ce86f9524a220cdd4d606b9b469ad4b2b428a0f..5b3bf8d56677392c136c6dabbcd42ba371a867a6 100644 --- a/lib_dec/gain_dec_fx.c +++ b/lib_dec/gain_dec_fx.c @@ -39,9 +39,11 @@ void Es_pred_dec_fx( #ifdef IVAS_GAIN_MOD PMT("Verify if Es_pred_dec_fx should use noltp parameters") #endif +#ifdef EVS_FLOAT #if 1//def IVAS_GAIN_MOD IF(no_ltp == 0) #endif +#endif // EVS_FLOAT { SWITCH(nb_bits) { @@ -53,23 +55,27 @@ void Es_pred_dec_fx( *Es_pred = Es_pred_qua_4b_fx[enr_idx]; move16(); BREAK; +#ifdef EVS_FLOAT #if 1//def IVAS_GAIN_MOD case 3: *Es_pred = Es_pred_qua_3b_fx[enr_idx]; break; #endif +#endif // EVS_FLOAT default: *Es_pred = Es_pred_qua_5b_fx[enr_idx]; move16(); BREAK; } } +#ifdef EVS_FLOAT #if 1//def IVAS_GAIN_MOD ELSE { *Es_pred = Es_pred_qua_4b_no_ltp_fx[enr_idx]; } #endif +#endif } /*======================================================================================*/ /* FUNCTION : void gain_dec_tc_fx () */ @@ -816,12 +822,14 @@ void gain_dec_lbr_fx( move16(); cdbk_fx = gp_gamma_3sfr_6b_fx; +#ifdef EVS_FLOAT #if 1//def IVAS_GAIN_MOD IF(EQ_16(nBits, 7)) { cdbk_fx = gp_gamma_3sfr_7b_fx; //PMT("verify if gp_gamma_3sfr_7b_fx is correct") } +#endif #endif move16(); /* Q14/Q9*/ diff --git a/lib_dec/inov_dec_fx.c b/lib_dec/inov_dec_fx.c index cc5ae4c6f8233c2de7756c62cb581fa034d661e8..84900512024ec38d60a970aa2a1051f4d02b1ca1 100644 --- a/lib_dec/inov_dec_fx.c +++ b/lib_dec/inov_dec_fx.c @@ -70,6 +70,7 @@ void inov_decode_fx( IF ( !Opt_AMR_WB ) { +#ifdef EVS_FLOAT #if 1//def IVAS_CODE if (st_fx->acelp_cfg.fcb_mode) { @@ -129,6 +130,7 @@ void inov_decode_fx( } } else +#endif #endif { nBits = st_fx->acelp_cfg.fixed_cdk_index[i_subfr / L_SUBFR]; diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index 80c921da151acdf3a9ff83aa1b97a0c9423d12f2..45b8e339fb40ab9465611567e75b48f0e7d6a930 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -47,19 +47,6 @@ #include "ivas_prot_fx.h" #endif -int16_t dbgwrite2_txt( - const float *buffer, /* i : Write buffer */ - const int16_t count, /* i : Number of elements */ - const char *const filename ) -{ - FILE *fp = fopen( filename, "a" ); - for ( int i = 0; i < count; i++ ) - { - fprintf( fp, "%f\n", buffer[i] ); - } - fclose( fp ); - return 0; -} #ifdef IVAS_FLOAT_FIXED static Word16 norm_arr_l(float *arr, int size); @@ -527,7 +514,7 @@ ivas_error ivas_core_dec( * Detect bandwidth switching *---------------------------------------------------------------------*/ - bandwidth_switching_detect( st ); + bandwidth_switching_detect_ivas_fx( st ); /*---------------------------------------------------------------------* * Preprocessing (preparing) for ACELP/HQ core switching @@ -1767,15 +1754,11 @@ ivas_error ivas_core_dec( free( output_mem_fx ); #endif } - //dbgwrite2_txt(output[n],L_FRAME48k,"../output_n.txt"); - //dbgwrite2_txt(synth[n],L_FRAME48k,"../synth_n.txt"); #else if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, ( st_ivas != NULL ) ? st_ivas->ivas_format : UNDEFINED_FORMAT, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK ) { return error; } - dbgwrite2_txt(output[n],L_FRAME48k,"../output_n_flt.txt"); - dbgwrite2_txt(synth[n],L_FRAME48k,"../synth_n_flt.txt"); #endif /* for FD-CNG we need the delay compensation in the synth, so do this afterwards */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 5cb1108914f7f01add99f883b93deeedd4fe73e1..0e84489234f2f7db17579a3a9f920620e73ccd7c 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -2790,8 +2790,18 @@ ivas_error ivas_jbm_dec_render( else if ( st_ivas->hTcBuffer->tc_buffer_mode == TC_BUFFER_MODE_BUFFER ) { #ifdef IVAS_FLOAT_FIXED + Word16 slot_size, slots_to_render, tmp, e, slots_rendered, nSamplesRendered_tmp; + + slot_size = st_ivas->hTcBuffer->n_samples_granularity; + + /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ + tmp = BASOP_Util_Divide1616_Scale( nSamplesAsked, slot_size, &e ); + tmp = shr( tmp, sub( 15, e ) ); + slots_to_render = s_min( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), tmp ); + slots_rendered = add( st_ivas->hTcBuffer->slots_rendered, slots_to_render ); + nSamplesRendered_tmp = (UWord16) L_mult0( slots_to_render, slot_size ); FOR(Word16 ind = 0; ind < st_ivas->hTcBuffer->nchan_transport_jbm; ind++) { - floatToFixed_arrL(st_ivas->hTcBuffer->tc[ind] + st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hTcBuffer->tc_fx[ind] + st_ivas->hTcBuffer->n_samples_rendered, Q11, s_max(*nSamplesRendered, nSamplesAskedLocal)); + floatToFixed_arrL(st_ivas->hTcBuffer->tc[ind] + st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hTcBuffer->tc_fx[ind] + st_ivas->hTcBuffer->n_samples_rendered, Q11, nSamplesRendered_tmp); p_output_fx[ind] = malloc(sizeof(Word32) * 960); floatToFixed_arrL(p_output[ind], p_output_fx[ind], Q11, s_max(*nSamplesRendered, nSamplesAskedLocal)); } diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c index ab96ede1b35a8d11b51a8d3251fbb3bbdaf4404c..640c322839b08adf39bb2415763186c5079230d5 100644 --- a/lib_dec/jbm_jb4sb.c +++ b/lib_dec/jbm_jb4sb.c @@ -862,12 +862,21 @@ static void JB4_adaptActivePlayout( { IF ( convertToLateLoss ) { +#ifdef EVS_FLOAT JB4_dropFromBuffer( h ); +#else + JB4_dropFromBuffer( h ); + h->nLostOrStretched = L_add( h->nLostOrStretched, 1 ); +#endif // EVS_FLOAT } ELSE IF ( dropEarly ) { +#ifdef EVS_FLOAT JB4_dropFromBuffer( h ); ++h->nLostOrStretched; +#else + JB4_dropFromBuffer( h ); +#endif } ELSE { diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c index 08bc3c3633a987470db1e221bcafbe5ab9f5378c..1164e7b07c31c9af71b5660b30609a966c7af0df 100644 --- a/lib_dec/jbm_pcmdsp_apa.c +++ b/lib_dec/jbm_pcmdsp_apa.c @@ -338,7 +338,7 @@ bool apa_set_rate( /* (the resulting maximum pitch is then p_min+l_search = 240 samples at 16 kHz) */ ps->l_search = ( ps->rate / 80 ) * ps->num_channels; -#ifndef EVS_FLOAT_FIXED +#ifndef EVS_FLOAT ps->win_fx = pcmdsp_window_hann_640; move16(); ps->l_halfwin_fx = 320; diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c index 0546e4ec618d875f19cf3d85f71604d6fae53eb4..23ed76bd7dd7ca597ac790cff5a1792ca10d1372 100644 --- a/lib_dec/lsf_dec_fx.c +++ b/lib_dec/lsf_dec_fx.c @@ -284,6 +284,7 @@ void lsf_dec_fx( Copy( lsp_mid, st_fx->lsp_old_fx, M ); lsp2lsf_fx( lsp_mid, st_fx->lsf_old_fx, M, st_fx->sr_core); } +#ifdef EVS_FLOAT #if 1//def ADD_LRTD IF (EQ_16(tdm_low_rate_mode, 1) && GT_16(coder_type, UNVOICED)) { @@ -299,6 +300,7 @@ void lsf_dec_fx( int_lsp4_fx(st_fx->L_frame, st_fx->lsp_old_fx, lsp_mid, lsp_new, Aq, M, -2); } ELSE +#endif #endif { /* LSP interpolation and conversion of LSPs to A(z) */ @@ -876,6 +878,7 @@ void lsf_mid_dec_fx( ratio = tbl_mid_gen_wb_5b_fx; BREAK; } +#ifdef EVS_FLOAT #if 1//def IVAS_CODE case 4: { @@ -883,6 +886,15 @@ void lsf_mid_dec_fx( break; } #endif +#else +#if IVAS_CODE + case 4: + { + ratio = tbl_mid_gen_wb_4b_fx; + break; + } +#endif +#endif // EVS_FLOAT case 2: { ratio = tbl_mid_gen_wb_2b_fx; diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c index 115b2270bc782d05b426c860147fbf27afd18444..e15203cab89a810ce80ee7cb73faf8d1cdd050ad 100644 --- a/lib_dec/swb_tbe_dec_fx.c +++ b/lib_dec/swb_tbe_dec_fx.c @@ -2238,7 +2238,7 @@ void swb_tbe_dec_fx( test(); test(); test(); - IF( st_fx->prev_bws_cnt == 0 && st_fx->bws_cnt1 == 0 && st_fx->prev_use_partial_copy == 0 && st_fx->use_partial_copy == 0 ) + IF( st_fx->bws_cnt == 0 && st_fx->bws_cnt1 == 0 && st_fx->prev_use_partial_copy == 0 && st_fx->use_partial_copy == 0 ) { lsf_diff[0] = 16384; move16(); /*Q15*/ diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 999679228df21b3cf2cd0e24c164fe5c8e6c92a6..0b9aa64c7d4daa395bee4c4b442d6a291b236c87 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -1061,14 +1061,15 @@ ivas_error ivas_init_encoder_fx( st_ivas->nCPE = 0; st_ivas->nchan_transport = 1; sce_id = 0; - IF ((error = create_sce_enc_fx(st_ivas, sce_id, ivas_total_brate)) != IVAS_ERR_OK) +#ifndef EVS_FLOAT_ENC + if ( ( error = create_evs_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK ) { - return error; + return error; } -#ifndef EVS_FLOAT_ENC - if ((error = create_evs_sce_enc(st_ivas, sce_id)) != IVAS_ERR_OK) +#else + IF( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK ) { - return error; + return error; } #endif diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index d1605a17e277f99c4e4e15a86e1f4321bfeff4ed..09c79945b6b3ba8e7a9644c1c8818be06d25c42e 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1324,9 +1324,9 @@ static ivas_error configureEncoder_fx( IF (EQ_16(hEncoderConfig->ivas_format, MONO_FORMAT)) { hIvasEnc->hCoreCoder = st_ivas->hSCE[0]->hCoreCoder[0]; /* Note: this is needed for switching in EVS mono */ -#ifndef EVS_FLOAT_ENC - hIvasEnc->hCoreCoder_fx = st_ivas->hSCE[0]->hCoreCoder_fx[0]; -#endif +//#ifndef EVS_FLOAT_ENC +// hIvasEnc->hCoreCoder_fx = st_ivas->hSCE[0]->hCoreCoder_fx[0]; +//#endif } ELSE {