From 14b382208e1ad7f4304d83f53e28550978c5ee38 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Sun, 31 Mar 2024 16:29:26 +0530 Subject: [PATCH] Removes redundant flags/variables from td_bwe_dec_structure and fd_bwe_dec_structure --- lib_dec/cng_dec_fx.c | 2 +- lib_dec/core_switching_dec_fx.c | 16 ++++---- lib_dec/evs_dec_fx.c | 2 +- lib_dec/hq_hr_dec_fx.c | 4 +- lib_dec/ivas_core_dec.c | 64 ----------------------------- lib_dec/stat_dec.h | 36 ++++++++--------- lib_dec/swb_bwe_dec.c | 16 ++++---- lib_dec/swb_bwe_dec_fx.c | 38 ++++++++--------- lib_dec/swb_tbe_dec_fx.c | 72 ++++++++++++++++----------------- lib_dec/updt_dec_fx.c | 6 +-- 10 files changed, 96 insertions(+), 160 deletions(-) diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c index 8885879dc..7345b45d9 100644 --- a/lib_dec/cng_dec_fx.c +++ b/lib_dec/cng_dec_fx.c @@ -1025,7 +1025,7 @@ static void shb_CNG_decod_fx( } } - GenSHBSynth_fx( shb_syn16k_fx, shb_synth_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, st_fx->L_frame, &(hBWE_TD->syn_dm_phase_fx) ); + GenSHBSynth_fx( shb_syn16k_fx, shb_synth_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, st_fx->L_frame, &(hBWE_TD->syn_dm_phase) ); IF ( EQ_32(st_fx->output_Fs,48000)) { diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index 2825f54e5..dbb1ed21c 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -1373,15 +1373,15 @@ ivas_error core_switching_post_dec_fx( move16(); if( NE_16(st_fx->last_extl, WB_BWE)) { - hBWE_FD->prev_mode_fx = NORMAL; + hBWE_FD->prev_mode = NORMAL; move16(); } hBWE_FD->prev_Energy_fx = 0; move16(); - hBWE_FD->prev_L_swb_norm_fx = 8; + hBWE_FD->prev_L_swb_norm = 8; move16(); - hBWE_FD->prev_frica_flag_fx = 0; + hBWE_FD->prev_frica_flag = 0; move16(); set16_fx(hBWE_FD->mem_imdct_fx, 0, L_FRAME48k ); hBWE_FD->prev_td_energy_fx = 0; @@ -1401,15 +1401,15 @@ ivas_error core_switching_post_dec_fx( test(); if ( NE_16(st_fx->last_extl, SWB_BWE)&&NE_16(st_fx->last_extl,FB_BWE)) { - hBWE_FD->prev_mode_fx = NORMAL; + hBWE_FD->prev_mode = NORMAL; move16(); } hBWE_FD->prev_Energy_wb_fx = 0; move16(); - hBWE_FD->prev_L_swb_norm_fx = 8; + hBWE_FD->prev_L_swb_norm = 8; move16(); set16_fx(hBWE_FD->mem_imdct_fx, 0, L_FRAME48k ); - hBWE_FD->prev_flag_fx = 0; + hBWE_FD->prev_flag = 0; move16(); } @@ -1948,13 +1948,13 @@ ivas_error core_switching_post_dec_ivas_fx( move16(); IF( NE_16( st_fx->last_extl, WB_BWE ) ) { - hBWE_FD->prev_mode_fx = NORMAL; + hBWE_FD->prev_mode = NORMAL; move16(); } hBWE_FD->prev_Energy_fx = 0; move16(); - hBWE_FD->prev_L_swb_norm_fx = 8; + hBWE_FD->prev_L_swb_norm = 8; move16(); hBWE_FD->prev_frica_flag = 0; move16(); diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c index 626bf03b0..368eb3331 100644 --- a/lib_dec/evs_dec_fx.c +++ b/lib_dec/evs_dec_fx.c @@ -916,7 +916,7 @@ ivas_error evs_dec_fx( GenTransition_fx(hBWE_TD->syn_overlap_fx, hBWE_TD->old_tbe_synth_fx, 2*NS2SA(st_fx->output_Fs, DELAY_BWE_TOTAL_NS), hb_synth_fx, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, hBWE_TD->mem_resamp_HB_32k_fx, - &(hBWE_TD->syn_dm_phase_fx), st_fx->output_Fs, hBWE_TD->int_3_over_2_tbemem_dec_fx, st_fx->rf_flag, st_fx->total_brate ); + &(hBWE_TD->syn_dm_phase), st_fx->output_Fs, hBWE_TD->int_3_over_2_tbemem_dec_fx, st_fx->rf_flag, st_fx->total_brate ); hb_synth_fx_exp = st_fx->prev_Q_bwe_syn2; move16(); diff --git a/lib_dec/hq_hr_dec_fx.c b/lib_dec/hq_hr_dec_fx.c index 5511a70e8..b12d99ded 100644 --- a/lib_dec/hq_hr_dec_fx.c +++ b/lib_dec/hq_hr_dec_fx.c @@ -379,7 +379,7 @@ void ivas_hq_hr_dec_fx( &hHQ_core->no_att_hangover_fx, &hHQ_core->energy_lt_fx, &hHQ_core->hq_generic_seed_fx, hq_generic_exc_clas, core_sfm, *hqswb_clas, noise_level, st_fx->core_brate, hHQ_core->prev_noise_level_fx, &hHQ_core->prev_R_fx, hHQ_core->prev_coeff_out_fx, peak_idx, Npeaks, pulses, hHQ_core->old_is_transient_fx[0], hHQ_core->prev_normq_fx, hHQ_core->prev_env_fx, st_fx->prev_bfi, sfmsize, sfm_start, sfm_end, - &st_fx->hBWE_FD->prev_L_swb_norm_fx, hHQ_core->prev_hqswb_clas_fx, num_sfm, hHQ_core->prev_env_Q, num_env_bands, st_fx->element_mode ); + &st_fx->hBWE_FD->prev_L_swb_norm, hHQ_core->prev_hqswb_clas_fx, num_sfm, hHQ_core->prev_env_Q, num_env_bands, st_fx->element_mode ); enforce_zero_for_min_envelope_fx( *hqswb_clas, ynrm, t_audio_q, nb_sfm, sfm_start, sfm_end ); @@ -642,7 +642,7 @@ void hq_hr_dec_fx( &hHQ_core->no_att_hangover_fx, &hHQ_core->energy_lt_fx, &hHQ_core->hq_generic_seed_fx, hq_generic_exc_clas, core_sfm, *hqswb_clas, noise_level, st_fx->core_brate, hHQ_core->prev_noise_level_fx, &hHQ_core->prev_R_fx, hHQ_core->prev_coeff_out_fx, peak_idx, Npeaks, pulses, hHQ_core->old_is_transient_fx[0], hHQ_core->prev_normq_fx, hHQ_core->prev_env_fx, st_fx->prev_bfi, sfmsize, sfm_start, sfm_end, - &st_fx->hBWE_FD->prev_L_swb_norm_fx, hHQ_core->prev_hqswb_clas_fx, num_sfm, hHQ_core->prev_env_Q, num_env_bands + &st_fx->hBWE_FD->prev_L_swb_norm, hHQ_core->prev_hqswb_clas_fx, num_sfm, hHQ_core->prev_env_Q, num_env_bands ,st_fx->element_mode); enforce_zero_for_min_envelope_fx( *hqswb_clas, ynrm, t_audio_q, nb_sfm, sfm_start, sfm_end ); diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c index e837afa77..6d7cd107d 100644 --- a/lib_dec/ivas_core_dec.c +++ b/lib_dec/ivas_core_dec.c @@ -889,7 +889,6 @@ ivas_error ivas_core_dec( hHQ_core->wmold_hb_fx = (Word16) floatToFixed( hHQ_core->wmold_hb, Q15 ); hHQ_core->mean_prev_hb_fx = floatToFixed( hHQ_core->mean_prev_hb, 0 ); hHQ_core->memfilt_lb_fx = (Word16) floatToFixed( hHQ_core->memfilt_lb, 0 ); - st->hBWE_FD->prev_L_swb_norm_fx = st->hBWE_FD->prev_L_swb_norm; hHQ_core->HqVoicing_fx = hHQ_core->HqVoicing; hHQ_core->ph_ecu_HqVoicing_fx = hHQ_core->ph_ecu_HqVoicing; hHQ_core->prev_hqswb_clas_fx = hHQ_core->prev_hqswb_clas; @@ -956,7 +955,6 @@ ivas_error ivas_core_dec( hHQ_core->wmold_hb = fixedToFloat( hHQ_core->wmold_hb_fx, Q15 ); hHQ_core->mean_prev_hb = fixedToFloat( hHQ_core->mean_prev_hb_fx, 0 ); hHQ_core->memfilt_lb = fixedToFloat( hHQ_core->memfilt_lb_fx, 0 ); - st->hBWE_FD->prev_L_swb_norm = st->hBWE_FD->prev_L_swb_norm_fx; hHQ_core->HqVoicing = hHQ_core->HqVoicing_fx; hHQ_core->ph_ecu_HqVoicing = hHQ_core->ph_ecu_HqVoicing_fx; hHQ_core->prev_hqswb_clas = hHQ_core->prev_hqswb_clas_fx; @@ -1615,14 +1613,7 @@ ivas_error ivas_core_dec( { fixedToFloat_arrL( st->hBWE_FD->L_old_wtda_swb_fx, st->hBWE_FD->old_wtda_swb, 0, output_frame ); - IF( NE_16( st->last_extl, WB_BWE ) ) - { - st->hBWE_FD->prev_mode = st->hBWE_FD->prev_mode_fx; - } - st->hBWE_FD->prev_Energy = fixedToFloat( st->hBWE_FD->prev_Energy_fx, 0 ); // setting to zero - st->hBWE_FD->prev_L_swb_norm = st->hBWE_FD->prev_L_swb_norm_fx; // fixed - st->hBWE_FD->prev_frica_flag = st->hBWE_FD->prev_frica_flag; // fixed st->hBWE_FD->prev_td_energy = st->hBWE_FD->prev_td_energy_fx; // setting to zero st->hBWE_FD->prev_weight = fixedToFloat( st->hBWE_FD->prev_weight_fx, 15 ); // 6554; /*0.2 in Q15*/ st->hBWE_FD->prev_fb_ener_adjust = fixedToFloat( st->prev_fb_ener_adjust_fx, 0 ); // setting to zero @@ -1636,13 +1627,7 @@ ivas_error ivas_core_dec( // set16_fx( st->hBWE_FD->L_old_wtda_swb_fx, 0, output_frame ); fixedToFloat_arrL( st->hBWE_FD->L_old_wtda_swb_fx, st->hBWE_FD->old_wtda_swb, 0, output_frame ); - IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( st->last_extl, FB_BWE ) ) - { - st->hBWE_FD->prev_mode = st->hBWE_FD->prev_mode; - } st->hBWE_FD->prev_Energy_wb = st->hBWE_FD->prev_Energy_wb_fx; - st->hBWE_FD->prev_L_swb_norm = st->hBWE_FD->prev_L_swb_norm; - st->hBWE_FD->prev_flag = st->hBWE_FD->prev_flag; fixedToFloat_arr( st->hBWE_FD->mem_imdct_fx, st->hBWE_FD->mem_imdct, 0, L_FRAME48k ); // setting to zero } @@ -1867,11 +1852,9 @@ ivas_error ivas_core_dec( floatToFixed_arr( synth[n], synth_fx_16[n], st->Q_syn, L_FRAME48k ); st->prev_tilt_code_dec_fx = (Word16) floatToFixed( st->prev_tilt_code_dec, Q15 ); - st->bws_cnt = st->bws_cnt; floatToFixed_arr( pitch_buf[n], pitch_buf_fx[n], Q6, NB_SUBFR16k ); - st->prev_coder_type = st->prev_coder_type; st->tilt_wb_fx = (Word16) floatToFixed( st->tilt_wb, Q11 ); } @@ -1879,21 +1862,6 @@ ivas_error ivas_core_dec( { floatToFixed_arr( hBWE_TD->lsp_prevfrm, hBWE_TD->lsp_prevfrm_fx, Q15, LPC_SHB_ORDER ); hBWE_TD->GainFrame_prevfrm_fx = floatToFixed( hBWE_TD->GainFrame_prevfrm, Q18 ); - hBWE_TD->gFrame_WB_fx = hBWE_TD->gFrame_WB; - hBWE_TD->idxSubGains_fx = hBWE_TD->idxSubGains; - hBWE_TD->idxFrameGain_fx = hBWE_TD->idxFrameGain; - hBWE_TD->idx_shb_fr_gain_fx = hBWE_TD->idx_shb_fr_gain; - FOR( i = 0; i < NB_SUBFR16k; ++i ) - { - hBWE_TD->idx_res_gs_fx[i] = hBWE_TD->idx_res_gs[i]; - } - hBWE_TD->idx_mixFac_fx = hBWE_TD->idx_mixFac; - FOR( i = 0; i < NUM_Q_LSF; ++i ) - { - hBWE_TD->lsf_idx_fx[i] = hBWE_TD->lsf_idx[i]; - } - hBWE_TD->m_idx_fx = hBWE_TD->m_idx; - hBWE_TD->grid_idx_fx = hBWE_TD->grid_idx; hBWE_TD->GainAttn_fx = (Word16) floatToFixed( hBWE_TD->GainAttn, Q15 ); floatToFixed_arr( hBWE_TD->state_syn_shbexc, hBWE_TD->state_syn_shbexc_fx, ( st->prev_Q_bwe_exc - 16 ), L_SHB_LAHEAD / 4 ); floatToFixed_arr( hBWE_TD->old_bwe_exc_extended, hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET ); @@ -1901,10 +1869,6 @@ ivas_error ivas_core_dec( floatToFixed_arr( hBWE_TD->mem_genSHBexc_filt_down_wb2, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, ( st->prev_Q_bwe_exc - 16 ), 2 * ALLPASSSECTIONS_STEEP + 1 ); floatToFixed_arr( hBWE_TD->mem_genSHBexc_filt_down_wb3, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx, ( st->prev_Q_bwe_exc - 16 ), 2 * ALLPASSSECTIONS_STEEP + 1 ); floatToFixed_arrL( hBWE_TD->mem_csfilt, hBWE_TD->mem_csfilt_fx, st->prev_Q_bwe_exc, 2 ); - FOR( i = 0; i < 2; ++i ) - { - hBWE_TD->bwe_seed_fx[i] = hBWE_TD->bwe_seed[i]; - } floatToFixed_arr( hBWE_TD->syn_overlap, hBWE_TD->syn_overlap_fx, st->Q_syn, L_SHB_LAHEAD ); hBWE_TD->prev_wb_bwe_frame_pow_fx = floatToFixed( hBWE_TD->prev_wb_bwe_frame_pow, Q22 ); floatToFixed_arr( hBWE_TD->state_lsyn_filt_shb, hBWE_TD->state_lsyn_filt_shb_fx, st->prev_Qx, 2 * ALLPASSSECTIONS_STEEP ); @@ -1923,10 +1887,6 @@ ivas_error ivas_core_dec( floatToFixed_arr( hBWE_FD->prev_SWB_fenv, st->prev_SWB_fenv_fx, Q1, SWB_FENV ); floatToFixed_arr( hBWE_FD->mem_imdct, hBWE_FD->mem_imdct_fx, hBWE_FD->mem_imdct_exp_fx, L_FRAME48k ); hBWE_FD->prev_Energy_wb_fx = floatToFixed( hBWE_FD->prev_Energy_wb, st->prev_Q_synth ); - hBWE_FD->prev_L_swb_norm_fx = hBWE_FD->prev_L_swb_norm; - hBWE_FD->Seed_fx = hBWE_FD->Seed; - hBWE_FD->prev_flag_fx = hBWE_FD->prev_flag; - st->coder_type = st->coder_type; } #endif test(); @@ -1962,7 +1922,6 @@ ivas_error ivas_core_dec( st->prev_tilt_code_dec = fixedToFloat( st->prev_tilt_code_dec_fx, Q15 ); fixedToFloat_arr( pitch_buf_fx[n], pitch_buf[n], Q6, NB_SUBFR16k ); - st->prev_coder_type = st->prev_coder_type; st->tilt_wb = fixedToFloat( st->tilt_wb_fx, Q11 ); } @@ -1972,10 +1931,6 @@ ivas_error ivas_core_dec( hBWE_TD->GainAttn = fixedToFloat( hBWE_TD->GainAttn_fx, Q15); hBWE_TD->prev_wb_bwe_frame_pow = fixedToFloat( hBWE_TD->prev_wb_bwe_frame_pow_fx, Q22 ); fixedToFloat_arrL( hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_csfilt, st->prev_Q_bwe_exc, 2 ); - FOR( i = 0; i < 2; ++i ) - { - hBWE_TD->bwe_seed[i] = hBWE_TD->bwe_seed_fx[i]; - } fixedToFloat_arr( hBWE_TD->syn_overlap_fx, hBWE_TD->syn_overlap, st->Q_syn, L_SHB_LAHEAD ); fixedToFloat_arr( hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_shb, ( st->prev_Q_bwe_exc - 16 ), 2 * ALLPASSSECTIONS_STEEP + 1 ); @@ -1997,13 +1952,9 @@ ivas_error ivas_core_dec( { hBWE_FD->last_wb_bwe_ener = fixedToFloat( st->last_wb_bwe_ener_fx, Q3 ); fixedToFloat_arr( st->prev_SWB_fenv_fx, hBWE_FD->prev_SWB_fenv, Q1, SWB_FENV ); - hBWE_FD->prev_L_swb_norm = hBWE_FD->prev_L_swb_norm_fx; - hBWE_FD->Seed = hBWE_FD->Seed_fx; - hBWE_FD->prev_flag = hBWE_FD->prev_flag_fx; fixedToFloat_arr( hBWE_FD->mem_imdct_fx, hBWE_FD->mem_imdct, hBWE_FD->mem_imdct_exp_fx, L_FRAME48k ); fixedToFloat_arr( hBWE_FD->L_old_wtda_swb_fx, hBWE_FD->old_wtda_swb, hBWE_FD->old_wtda_swb_fx_exp, L_FRAME48k ); hBWE_FD->prev_Energy_wb = fixedToFloat( hBWE_FD->prev_Energy_wb_fx, st->prev_Q_synth ); - st->coder_type = st->coder_type; } #endif #else @@ -2072,7 +2023,6 @@ ivas_error ivas_core_dec( hBWE_TD->fbbwe_hpf_mem_fx_Q[1] = norm_arr_l(hBWE_TD->fbbwe_hpf_mem[1], 4); hBWE_TD->fbbwe_hpf_mem_fx_Q[2] = norm_arr_l(hBWE_TD->fbbwe_hpf_mem[2], 4); hBWE_TD->fbbwe_hpf_mem_fx_Q[3] = norm_arr_l(hBWE_TD->fbbwe_hpf_mem[3], 4); - hBWE_TD->idxGain_fx = hBWE_TD->idxGain; hBWE_TD->prev_fbbwe_ratio_fx = floatToFixed( hBWE_TD->prev_fbbwe_ratio, 0 ); floatToFixed_arrL( hBWE_TD->fbbwe_hpf_mem[0], hBWE_TD->fbbwe_hpf_mem_fx[0], hBWE_TD->fbbwe_hpf_mem_fx_Q[0], 4 ); floatToFixed_arrL( hBWE_TD->fbbwe_hpf_mem[1], hBWE_TD->fbbwe_hpf_mem_fx[1], hBWE_TD->fbbwe_hpf_mem_fx_Q[1], 4 ); @@ -2091,7 +2041,6 @@ ivas_error ivas_core_dec( fixedToFloat_arrL( hb_synth_32[n], hb_synth[n], st->Q_syn, L_FRAME48k ); if ( hBWE_TD != NULL ) { - hBWE_TD->idxGain = hBWE_TD->idxGain_fx; hBWE_TD->prev_fbbwe_ratio = fixedToFloat(hBWE_TD->prev_fbbwe_ratio_fx, 0); for ( int lp = 0; lp < 4; lp++ ) { @@ -2135,15 +2084,9 @@ ivas_error ivas_core_dec( for (int i = 0; i < 14; i++) st->hBWE_FD->prev_SWB_fenv_fx[i] = (Word16)(st->hBWE_FD->prev_SWB_fenv[i] * (1 << 1)); - st->bws_cnt = st->bws_cnt; - st->bws_cnt1 = st->bws_cnt1; - st->hBWE_FD->prev_mode_fx = st->hBWE_FD->prev_mode; st->hBWE_FD->prev_Energy_fx = (Word16)(st->hBWE_FD->prev_Energy * (1 << 3)); - st->hBWE_FD->prev_L_swb_norm_fx = st->hBWE_FD->prev_L_swb_norm; st->tilt_wb_fx = (Word16)(st->tilt_wb * (1 << 11)); - st->hBWE_FD->Seed_fx = st->hBWE_FD->Seed; st->hBWE_FD->prev_weight_fx = (Word16)(st->hBWE_FD->prev_weight*(1 << 15)); - st->hBWE_FD->prev_frica_flag_fx = st->hBWE_FD->prev_frica_flag; st->hBWE_FD->prev_td_energy_fx = (Word16)st->hBWE_FD->prev_td_energy; st->attenu_fx = (Word16)(st->attenu1 * (1 << 15)); @@ -2154,19 +2097,12 @@ ivas_error ivas_core_dec( st->prev_ener_shb = (float)st->prev_ener_shb_fx / 2; st->attenu1 = (float)st->attenu_fx / (1 << 15); - st->hBWE_FD->prev_frica_flag = st->hBWE_FD->prev_frica_flag_fx; - st->hBWE_FD->prev_mode = st->hBWE_FD->prev_mode_fx; - - st->hBWE_FD->prev_Energy = ((float)st->hBWE_FD->prev_Energy_fx / (1 << 3)); - st->hBWE_FD->prev_L_swb_norm = st->hBWE_FD->prev_L_swb_norm_fx; st->tilt_wb = ((float)st->tilt_wb_fx / (1 << 11)); - st->hBWE_FD->Seed = st->hBWE_FD->Seed_fx; st->hBWE_FD->prev_weight = ((float)st->hBWE_FD->prev_weight_fx / (1 << 15)); st->hBWE_FD->prev_td_energy_fx = (Word16)st->hBWE_FD->prev_td_energy; - for (int i = 0; i < 14; i++) st->hBWE_FD->prev_SWB_fenv[i] = ((float)st->hBWE_FD->prev_SWB_fenv_fx[i] / (1 << 1)); diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h index 1717aa9a5..b4f4d6b24 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -1387,7 +1387,7 @@ typedef struct td_bwe_dec_structure Word32 old_bwe_exc_fx_32[PIT16k_MAX * 2]; /*Q_exc*/ int16_t bwe_seed[2]; - Word16 bwe_seed_fx[2]; /*Q0*/ + //Word16 bwe_seed[2]; /*Q0*/ float bwe_non_lin_prev_scale; Word32 bwe_non_lin_prev_scale_fx; @@ -1438,7 +1438,7 @@ typedef struct td_bwe_dec_structure Word16 prev_mix_factor_fx; /* mixing factor in the previous frame */ int16_t syn_dm_phase; - Word16 syn_dm_phase_fx; + //Word16 syn_dm_phase; float fbbwe_hpf_mem[4][4]; Word32 fbbwe_hpf_mem_fx[4][4]; @@ -1513,37 +1513,37 @@ typedef struct td_bwe_dec_structure /* quantized data */ int16_t lsf_idx[NUM_Q_LSF]; - Word16 lsf_idx_fx[NUM_Q_LSF]; + //Word16 lsf_idx[NUM_Q_LSF]; int16_t m_idx; - Word16 m_idx_fx; + //Word16 m_idx; int16_t grid_idx; - Word16 grid_idx_fx; + //Word16 grid_idx; int16_t idxSubGains; - Word16 idxSubGains_fx; + //Word16 idxSubGains; int16_t idxFrameGain; - Word16 idxFrameGain_fx; + //Word16 idxFrameGain; int16_t idx_shb_fr_gain; - Word16 idx_shb_fr_gain_fx; + //Word16 idx_shb_fr_gain; int16_t idx_res_gs[NB_SUBFR16k]; - Word16 idx_res_gs_fx[NB_SUBFR16k]; + //Word16 idx_res_gs[NB_SUBFR16k]; int16_t idx_mixFac; - Word16 idx_mixFac_fx; + //Word16 idx_mixFac; int16_t lsf_WB; - Word16 lsf_WB_fx; + //Word16 lsf_WB; int16_t gFrame_WB; - Word16 gFrame_WB_fx; + //Word16 gFrame_WB; int16_t idxGain; - Word16 idxGain_fx; + //Word16 idxGain; float old_core_synth[L_FRAME16k]; Word16 old_core_synth_fx[L_FRAME16k]; @@ -1588,7 +1588,7 @@ typedef struct fd_bwe_dec_structure Word16 mem_deemph_old_syn_fx; int16_t prev_mode; - Word16 prev_mode_fx; + //Word16 prev_mode; float prev_SWB_fenv[SWB_FENV]; Word16 prev_SWB_fenv_fx[SWB_FENV]; @@ -1600,15 +1600,15 @@ typedef struct fd_bwe_dec_structure Word32 prev_Energy_wb_fx; int16_t prev_L_swb_norm; - Word16 prev_L_swb_norm_fx; + //Word16 prev_L_swb_norm; int16_t Seed; - Word16 Seed_fx; + //Word16 Seed; Word16 memExp1; int16_t prev_frica_flag; - Word16 prev_frica_flag_fx; + //Word16 prev_frica_flag; float mem_imdct[L_FRAME48k]; Word16 mem_imdct_fx[L_FRAME48k]; @@ -1622,7 +1622,7 @@ typedef struct fd_bwe_dec_structure Word16 prev_weight_fx; int16_t prev_flag; - Word16 prev_flag_fx; + //Word16 prev_flag; float last_wb_bwe_ener; Word16 last_wb_bwe_ener_fx; diff --git a/lib_dec/swb_bwe_dec.c b/lib_dec/swb_bwe_dec.c index e71e1ed98..a89f9c831 100644 --- a/lib_dec/swb_bwe_dec.c +++ b/lib_dec/swb_bwe_dec.c @@ -1177,9 +1177,9 @@ Word16 swb_bwe_dec_fx32( { /* SHB FEC */ - IF(NE_16(hBWE_FD->prev_mode_fx, TRANSIENT)) + IF(NE_16(hBWE_FD->prev_mode, TRANSIENT)) { - mode = hBWE_FD->prev_mode_fx; + mode = hBWE_FD->prev_mode; } ELSE { @@ -1194,15 +1194,15 @@ Word16 swb_bwe_dec_fx32( IF(EQ_16(st_fx->L_frame, L_FRAME16k)) { - SWB_BWE_decoding_fx(ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm_fx, st_fx->tilt_wb_fx, &hBWE_FD->Seed_fx, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl); + SWB_BWE_decoding_fx(ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl); } ELSE { - SWB_BWE_decoding_fx(ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm_fx, st_fx->tilt_wb_fx, &hBWE_FD->Seed_fx, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl); + SWB_BWE_decoding_fx(ysynth_fx, SWB_fenv_fx, yerror_fx, L_FRAME32k - 80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, hBWE_FD->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl); } - IF(EQ_16(hBWE_FD->prev_frica_flag_fx, 1) && frica_flag == 0) + IF(EQ_16(hBWE_FD->prev_frica_flag, 1) && frica_flag == 0) { FOR (i = 0; i < L_SUBFR; i++) { @@ -1293,7 +1293,7 @@ Word16 swb_bwe_dec_fx32( hBWE_FD->prev_td_energy_fx = SWB_tenv_fx[3]; } - ELSE IF (EQ_16(frica_flag, 1) && EQ_16(hBWE_FD->prev_frica_flag_fx, 0)) + ELSE IF (EQ_16(frica_flag, 1) && EQ_16(hBWE_FD->prev_frica_flag, 0)) { Qsynth_fx16 = Find_Max_Norm32(synth_fx, output_frame); Qsynth_fx16 = sub(Qsynth_fx16, shr(add(sub(15, norm_s(l_subfr)),1),1)); @@ -1339,8 +1339,8 @@ Word16 swb_bwe_dec_fx32( v_add_16(hb_synth_fx16, synth_fx16, hb_synth_fx16, output_frame); } - hBWE_FD->prev_mode_fx = mode; - hBWE_FD->prev_frica_flag_fx = frica_flag; + hBWE_FD->prev_mode = mode; + hBWE_FD->prev_frica_flag = frica_flag; FOR(i = 0; i < output_frame; i++) { hb_synth_fx[i] = L_deposit_l(hb_synth_fx16[i]); diff --git a/lib_dec/swb_bwe_dec_fx.c b/lib_dec/swb_bwe_dec_fx.c index a35ee72a0..085e52221 100644 --- a/lib_dec/swb_bwe_dec_fx.c +++ b/lib_dec/swb_bwe_dec_fx.c @@ -470,8 +470,8 @@ Word16 ivas_wb_bwe_dec_fx( hBWE_FD->prev_Energy_wb_fx = L_shl( hBWE_FD->prev_Energy_wb_fx, exp ); } WB_BWE_decoding_fx( ysynth_fx, WB_fenv_fx, ysynth_32, L_FRAME16k, mode, - st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm_fx, - st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed_fx, &hBWE_FD->prev_flag_fx, + st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, + st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed, &hBWE_FD->prev_flag, st_fx->prev_coder_type, Q_syn, &Q_syn_hb ); IF( EQ_32( st_fx->output_Fs, 32000 ) ) { @@ -491,7 +491,7 @@ Word16 ivas_wb_bwe_dec_fx( /* add HB synth from hf_synth() */ v_add_16( hb_synth_fx, synth_fx, hb_synth_fx, output_frame ); } - hBWE_FD->prev_mode_fx = mode; + hBWE_FD->prev_mode = mode; st_fx->prev_Q_synth = Q_syn; return Q_syn_hb; } @@ -631,8 +631,8 @@ Word16 wb_bwe_dec_fx( hBWE_FD->prev_Energy_wb_fx = L_shl(hBWE_FD->prev_Energy_wb_fx, exp); } WB_BWE_decoding_fx( ysynth_fx, WB_fenv_fx, ysynth_32, L_FRAME16k, mode, - st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm_fx, - st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed_fx, &hBWE_FD->prev_flag_fx, + st_fx->last_extl, &hBWE_FD->prev_Energy_wb_fx, st_fx->prev_SWB_fenv_fx, &hBWE_FD->prev_L_swb_norm, + st_fx->extl, coder_type, st_fx->total_brate, &hBWE_FD->Seed, &hBWE_FD->prev_flag, st_fx->prev_coder_type, Q_syn, &Q_syn_hb ); IF ( EQ_32(st_fx->output_Fs, 32000)) { @@ -654,7 +654,7 @@ Word16 wb_bwe_dec_fx( v_add(hb_synth, synth, hb_synth, output_frame); } #endif - hBWE_FD->prev_mode_fx = mode; + hBWE_FD->prev_mode = mode; st_fx->prev_Q_synth = Q_syn; return Q_syn_hb; } @@ -1029,9 +1029,9 @@ Word16 swb_bwe_dec_fx( ELSE { /* SHB FEC */ - IF( NE_16(hBWE_FD->prev_mode_fx, TRANSIENT)) + IF( NE_16(hBWE_FD->prev_mode, TRANSIENT)) { - mode = hBWE_FD->prev_mode_fx; + mode = hBWE_FD->prev_mode; move16(); } ELSE @@ -1048,18 +1048,18 @@ Word16 swb_bwe_dec_fx( IF ( EQ_16(st_fx->L_frame, L_FRAME16k)) { SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k-80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, - &hBWE_FD->prev_L_swb_norm_fx, st_fx->tilt_wb_fx, &hBWE_FD->Seed_fx, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn + &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 80, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn ,st_fx->last_extl); } ELSE { SWB_BWE_decoding_fx( ysynth_fx, SWB_fenv_fx, ysynth_32, L_FRAME32k-80, mode, &frica_flag, &hBWE_FD->prev_Energy_fx, st_fx->prev_SWB_fenv_fx, - &hBWE_FD->prev_L_swb_norm_fx, st_fx->tilt_wb_fx, &hBWE_FD->Seed_fx, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, + &hBWE_FD->prev_L_swb_norm, st_fx->tilt_wb_fx, &hBWE_FD->Seed, 6, &hBWE_FD->prev_weight_fx, st_fx->extl, Q_syn, st_fx->last_extl); } test(); - IF ( EQ_16(hBWE_FD->prev_frica_flag_fx, 1) && frica_flag==0) + IF ( EQ_16(hBWE_FD->prev_frica_flag, 1) && frica_flag==0) { FOR( i = 0; i < L_SUBFR; i++ ) { @@ -1168,7 +1168,7 @@ Word16 swb_bwe_dec_fx( hBWE_FD->prev_td_energy_fx = SWB_tenv_fx[3]; move16(); } - ELSE IF( EQ_16(frica_flag, 1) && hBWE_FD->prev_frica_flag_fx==0) + ELSE IF( EQ_16(frica_flag, 1) && hBWE_FD->prev_frica_flag==0) { time_reduce_pre_echo_fx( synth_fx, hb_synth_fx, hBWE_FD->prev_td_energy_fx, l_subfr, *Qpost, Q_syn_hb ); } @@ -1208,9 +1208,9 @@ Word16 swb_bwe_dec_fx( v_add(hb_synth, synth, hb_synth, output_frame); } #endif - hBWE_FD->prev_frica_flag_fx = frica_flag; + hBWE_FD->prev_frica_flag = frica_flag; move16(); - hBWE_FD->prev_mode_fx = mode; + hBWE_FD->prev_mode = mode; move16(); return Q_syn_hb; @@ -1237,22 +1237,22 @@ void fd_bwe_dec_init( hBWE_FD->mem_imdct_exp_fx = 0; move16(); - hBWE_FD->prev_mode_fx = NORMAL; + hBWE_FD->prev_mode = NORMAL; move16(); set16_fx(st_fx->prev_SWB_fenv_fx, 0, SWB_FENV); hBWE_FD->prev_Energy_fx = 0; move16(); - hBWE_FD->prev_L_swb_norm_fx = 8; + hBWE_FD->prev_L_swb_norm = 8; move16(); - hBWE_FD->Seed_fx = 21211; + hBWE_FD->Seed = 21211; move16(); - hBWE_FD->prev_frica_flag_fx = 0; + hBWE_FD->prev_frica_flag = 0; move16(); set16_fx(hBWE_FD->mem_imdct_fx, 0, L_FRAME48k); hBWE_FD->prev_td_energy_fx = 0; move16(); hBWE_FD->prev_weight_fx = 6554; /*0.2 in Q15*/ move16(); - hBWE_FD->prev_flag_fx = 0; + hBWE_FD->prev_flag = 0; move16(); st_fx->last_wb_bwe_ener_fx = 0; move16(); diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c index 17dc79be0..e77f59f87 100644 --- a/lib_dec/swb_tbe_dec_fx.c +++ b/lib_dec/swb_tbe_dec_fx.c @@ -394,9 +394,9 @@ void InitSWBdecBuffer_fx( hBWE_TD = st_fx->hBWE_TD; set16_fx(hBWE_TD->old_bwe_exc_fx, 0, ( PIT16k_MAX * 2 ) ); - hBWE_TD->bwe_seed_fx[0] = 23; + hBWE_TD->bwe_seed[0] = 23; move16(); - hBWE_TD->bwe_seed_fx[1] = 59; + hBWE_TD->bwe_seed[1] = 59; move16(); set16_fx(hBWE_TD->old_bwe_exc_extended_fx, 0, NL_BUFF_OFFSET ); @@ -406,7 +406,7 @@ void InitSWBdecBuffer_fx( set32_fx(hBWE_TD->genSHBsynth_Hilbert_Mem_fx, 0, HILBERT_MEM_SIZE ); set16_fx(hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, 0, 2*ALLPASSSECTIONS_STEEP); /* Interp all pass memory */ - hBWE_TD->syn_dm_phase_fx = 0; + hBWE_TD->syn_dm_phase = 0; move16(); hBWE_TD->prev_fbbwe_ratio_fx = 32767/*1.0f Q15*/; @@ -801,7 +801,7 @@ void ivas_wb_tbe_dec_fx( ivas_GenShapedWBExcitation_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx, hBWE_TD->state_lpc_syn_fx, coder_type, - bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed_fx, vf_modified, uv_flag, st_fx->igf ); + bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed, vf_modified, uv_flag, st_fx->igf ); curr_pow = 0; FOR( i = 0; i < L_SHB_LAHEAD / 4; i++ ) @@ -1386,7 +1386,7 @@ void wb_tbe_dec_fx( GenShapedWBExcitation_fx( shaped_wb_excitation + L_SHB_LAHEAD / 4, lpc_wb, exc4kWhtnd, hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx, hBWE_TD->state_lpc_syn_fx, coder_type, - bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed_fx, vf_modified, uv_flag + bwe_exc_extended_16, Q_bwe_exc_ext, hBWE_TD->bwe_seed, vf_modified, uv_flag , st_fx->igf ); @@ -2470,7 +2470,7 @@ void swb_tbe_dec_fx( /* Calculate the 6 to 14 kHz (or 7.5 - 15.5 kHz) SHB excitation signal from the low band ACELP core excitation */ GenShapedSHBExcitation_fx( shaped_shb_excitation + L_SHB_LAHEAD, lpc_shb, White_exc16k, hBWE_TD->mem_csfilt_fx, hBWE_TD->mem_genSHBexc_filt_down_shb_fx, hBWE_TD->state_lpc_syn_fx, - coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed_fx, vf_modified, st_fx->extl, + coder_type, bwe_exc_extended_16, hBWE_TD->bwe_seed, vf_modified, st_fx->extl, &(hBWE_TD->tbe_demph_fx ), &(hBWE_TD->tbe_premph_fx ), lpc_shb_sf, shb_ener_sf_32, shb_res_gshape, shb_res_dummy, &vind, formant_fac, hBWE_TD->fb_state_lpc_syn_fx, &(hBWE_TD->fb_tbe_demph_fx), &Q_bwe_exc, &Q_bwe_exc_fb,Q_shb, n_mem2, st_fx->prev_Q_bwe_syn, st_fx->total_brate, st_fx->prev_bfi ); @@ -3269,7 +3269,7 @@ void swb_tbe_dec_fx( /* i/o: st_fx->genSHBsynth_state_lsyn_filt_shb_local_fx in (Q_bwe_exc) */ /* o: error in (Qx) */ GenSHBSynth_fx( shaped_shb_excitation, error, hBWE_TD->genSHBsynth_Hilbert_Mem_fx, - hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, st_fx->L_frame, &(hBWE_TD->syn_dm_phase_fx ) ); + hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx, st_fx->L_frame, &(hBWE_TD->syn_dm_phase ) ); Copy( error + L_FRAME32k - L_SHB_TRANSITION_LENGTH, hBWE_TD->old_tbe_synth_fx, L_SHB_TRANSITION_LENGTH ); @@ -3845,7 +3845,7 @@ void ivas_dequantizeSHBparams_fx_9_1( { IF(EQ_16(st_fx->codec_mode, MODE2)) { - idx_res_gs[i] = hBWE_TD->idx_res_gs_fx[i]; + idx_res_gs[i] = hBWE_TD->idx_res_gs[i]; move16(); } ELSE @@ -4044,7 +4044,7 @@ void ivas_dequantizeSHBparams_fx_9_1( ELSE { set16_fx(lsf_idx, 0, 5); - Copy(hBWE_TD->lsf_idx_fx, lsf_idx, 5); + Copy(hBWE_TD->lsf_idx, lsf_idx, 5); grid_idx = 0; m_idx = 0; Copy(swb_tbe_lsfvq_cbook_8b + lsf_idx[0] * LPC_SHB_ORDER, Q_lsf, LPC_SHB_ORDER); @@ -4149,8 +4149,8 @@ static void dequantizeSHBparams_fx_9_1( { IF( EQ_32( extl_brate, WB_TBE_0k35 )) { - idxFrameGain = hBWE_TD->gFrame_WB_fx; - idxLSF = hBWE_TD->lsf_WB_fx; + idxFrameGain = hBWE_TD->gFrame_WB; + idxLSF = hBWE_TD->lsf_WB; Copy( lbr_wb_bwe_lsfvq_cbook_2bit_fx + idxLSF * LPC_SHB_ORDER_LBR_WB, Q_lsf, LPC_SHB_ORDER_LBR_WB ); set16_fx( Q_subgain, RECIP_ROOT_EIGHT_FX, NUM_SHB_SUBFR / 2 ); @@ -4196,8 +4196,8 @@ static void dequantizeSHBparams_fx_9_1( { IF(EQ_16(st_fx->codec_mode,MODE2)) { - idxSubGain = hBWE_TD->idxSubGains_fx; - idxFrameGain = hBWE_TD->idxFrameGain_fx; + idxSubGain = hBWE_TD->idxSubGains; + idxFrameGain = hBWE_TD->idxFrameGain; } ELSE { @@ -4210,7 +4210,7 @@ static void dequantizeSHBparams_fx_9_1( { IF(EQ_16(st_fx->codec_mode,MODE2)) { - idx_shb_fr_gain = hBWE_TD->idx_shb_fr_gain_fx; + idx_shb_fr_gain = hBWE_TD->idx_shb_fr_gain; } ELSE { @@ -4231,7 +4231,7 @@ static void dequantizeSHBparams_fx_9_1( { IF(EQ_16(st_fx->codec_mode,MODE2)) { - idx_res_gs[i] = hBWE_TD->idx_res_gs_fx[i]; + idx_res_gs[i] = hBWE_TD->idx_res_gs[i]; move16(); } ELSE @@ -4249,7 +4249,7 @@ static void dequantizeSHBparams_fx_9_1( IF(EQ_16(st_fx->codec_mode,MODE2)) { - idx_mixFac = hBWE_TD->idx_mixFac_fx; + idx_mixFac = hBWE_TD->idx_mixFac; move16(); } ELSE @@ -4289,7 +4289,7 @@ static void dequantizeSHBparams_fx_9_1( { FOR (i = 0; i < NUM_Q_LSF; i++) { - lsf_idx[i] = hBWE_TD->lsf_idx_fx[i]; + lsf_idx[i] = hBWE_TD->lsf_idx[i]; move16(); } @@ -4307,7 +4307,7 @@ static void dequantizeSHBparams_fx_9_1( IF(EQ_16(st_fx->codec_mode,MODE2)) { - m_idx = hBWE_TD->m_idx_fx; + m_idx = hBWE_TD->m_idx; } ELSE { @@ -4326,7 +4326,7 @@ static void dequantizeSHBparams_fx_9_1( IF(EQ_16(st_fx->codec_mode,MODE2)) { - grid_idx = hBWE_TD->grid_idx_fx; + grid_idx = hBWE_TD->grid_idx; } ELSE { @@ -4351,7 +4351,7 @@ static void dequantizeSHBparams_fx_9_1( ELSE { set16_fx(lsf_idx, 0, 5); - Copy(hBWE_TD->lsf_idx_fx, lsf_idx, 5); + Copy(hBWE_TD->lsf_idx, lsf_idx, 5); grid_idx = 0; m_idx = 0; Copy(swb_tbe_lsfvq_cbook_8b + lsf_idx[0]*LPC_SHB_ORDER, Q_lsf, LPC_SHB_ORDER); @@ -4421,7 +4421,7 @@ void fb_tbe_dec_fx( { IF( EQ_16(st->codec_mode,MODE2)) { - i = hBWE_TD->idxGain_fx; + i = hBWE_TD->idxGain; move16(); } ELSE @@ -4483,7 +4483,7 @@ void fb_tbe_dec_ivas_fx( { IF( EQ_16( st->codec_mode, MODE2 ) ) { - i = hBWE_TD->idxGain_fx; + i = hBWE_TD->idxGain; move16(); } ELSE @@ -4547,10 +4547,10 @@ void tbe_read_bitstream_fx( IF ( (EQ_16(st_fx->rf_flag,1)||EQ_32(st_fx->total_brate,ACELP_9k60))&&EQ_16(st_fx->bwidth,WB)) { /* WB LSF */ - hBWE_TD->lsf_WB_fx = get_next_indice(st_fx, NUM_BITS_LBR_WB_LSF); + hBWE_TD->lsf_WB = get_next_indice(st_fx, NUM_BITS_LBR_WB_LSF); /* WB frame gain */ - hBWE_TD->gFrame_WB_fx = get_next_indice(st_fx, NUM_BITS_SHB_FrameGain_LBR_WB); + hBWE_TD->gFrame_WB = get_next_indice(st_fx, NUM_BITS_SHB_FrameGain_LBR_WB); } ELSE IF ( ( GE_32( st_fx->total_brate, ACELP_9k60 ))&&(LE_32(st_fx->total_brate,ACELP_32k))&& ( ( EQ_16( st_fx->bwidth, SWB ) ) || ( EQ_16( st_fx->bwidth, FB ) ) ) ) @@ -4560,45 +4560,45 @@ void tbe_read_bitstream_fx( { FOR (i = 0; i < NUM_Q_LSF; i++) { - hBWE_TD->lsf_idx_fx[i] = get_next_indice(st_fx, lsf_q_num_bits[i]); + hBWE_TD->lsf_idx[i] = get_next_indice(st_fx, lsf_q_num_bits[i]); move16(); } - hBWE_TD->m_idx_fx = get_next_indice(st_fx, MIRROR_POINT_BITS); + hBWE_TD->m_idx = get_next_indice(st_fx, MIRROR_POINT_BITS); - hBWE_TD->grid_idx_fx = get_next_indice(st_fx, NUM_LSF_GRID_BITS); + hBWE_TD->grid_idx = get_next_indice(st_fx, NUM_LSF_GRID_BITS); } ELSE { - hBWE_TD->lsf_idx_fx[0] = get_next_indice(st_fx, 8); + hBWE_TD->lsf_idx[0] = get_next_indice(st_fx, 8); move16(); - hBWE_TD->m_idx_fx = 0; + hBWE_TD->m_idx = 0; move16(); - hBWE_TD->grid_idx_fx = 0; + hBWE_TD->grid_idx = 0; move16(); } /* shape gains */ - hBWE_TD->idxSubGains_fx = get_next_indice(st_fx, NUM_BITS_SHB_SUBGAINS); + hBWE_TD->idxSubGains = get_next_indice(st_fx, NUM_BITS_SHB_SUBGAINS); /* frame gain */ - hBWE_TD->idxFrameGain_fx = get_next_indice(st_fx, NUM_BITS_SHB_FRAMEGAIN); + hBWE_TD->idxFrameGain = get_next_indice(st_fx, NUM_BITS_SHB_FRAMEGAIN); IF ( GE_32( st_fx->total_brate, ACELP_24k40 )) { /* sub frame energy*/ - hBWE_TD->idx_shb_fr_gain_fx = get_next_indice(st_fx, NUM_BITS_SHB_ENER_SF); + hBWE_TD->idx_shb_fr_gain = get_next_indice(st_fx, NUM_BITS_SHB_ENER_SF); /* gain shapes residual */ FOR (i = 0; i < NB_SUBFR16k; i++) { - hBWE_TD->idx_res_gs_fx[i] = get_next_indice(st_fx, NUM_BITS_SHB_RES_GS); + hBWE_TD->idx_res_gs[i] = get_next_indice(st_fx, NUM_BITS_SHB_RES_GS); move16(); } /* voicing factor */ - hBWE_TD->idx_mixFac_fx = get_next_indice(st_fx, NUM_BITS_SHB_VF); + hBWE_TD->idx_mixFac = get_next_indice(st_fx, NUM_BITS_SHB_VF); } IF (EQ_16(st_fx->tec_tfa, 1)) @@ -4625,7 +4625,7 @@ void tbe_read_bitstream_fx( IF ( EQ_16( st_fx->bwidth, FB )) { - hBWE_TD->idxGain_fx = get_next_indice(st_fx, 4); + hBWE_TD->idxGain = get_next_indice(st_fx, 4); } } diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c index 2bee4fa0a..e01f907cc 100644 --- a/lib_dec/updt_dec_fx.c +++ b/lib_dec/updt_dec_fx.c @@ -268,13 +268,13 @@ void updt_IO_switch_dec_fx( IF(hBWE_FD != NULL) { /* reset FD BWE buffers */ - hBWE_FD->prev_mode_fx = NORMAL; + hBWE_FD->prev_mode = NORMAL; move16(); hBWE_FD->prev_Energy_fx = 0; move16(); - hBWE_FD->prev_L_swb_norm_fx = 8; + hBWE_FD->prev_L_swb_norm = 8; move16(); - hBWE_FD->prev_frica_flag_fx = 0; + hBWE_FD->prev_frica_flag = 0; move16(); set16_fx(hBWE_FD->mem_imdct_fx, 0, L_FRAME48k); hBWE_FD->prev_td_energy_fx = 0; -- GitLab