Loading lib_enc/acelp_core_enc.c +3 −12 Original line number Diff line number Diff line Loading @@ -98,7 +98,7 @@ ivas_error acelp_core_enc( #endif // IVAS_FLOAT_FIXED_CONVERSIONS float exc2[L_FRAME16k]; /* enhanced excitation */ float Es_pred; /* predicited scaled innovation energy */ float tmp_noise; /* NB post-filter long-term noise energy*/ //float tmp_noise; /* NB post-filter long-term noise energy*/ Word16 tc_subfr; /* TC sub-frame indication */ float old_bwe_exc[( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2]; /* excitation buffer */ float *bwe_exc; /* excitation for SWB TBE */ Loading @@ -108,7 +108,7 @@ ivas_error acelp_core_enc( /* SC-VBR - back-up memories for LSF quantizer and synthesis filter */ Word16 pstreaklen; float mem_MA[M], mem_AR[M]/*, Bin_E[L_FFT], Bin_E_old[L_FFT / 2]*/, lsp_new_bck[M], lsp_mid_bck[M], mem_syn_bck[M]; float/* mem_MA[M], mem_AR[M], Bin_E[L_FFT], Bin_E_old[L_FFT / 2],*/ lsp_new_bck[M], lsp_mid_bck[M], mem_syn_bck[M]; float q_env[NUM_ENV_CNG]; Word16 sid_bw = -1; Loading @@ -121,7 +121,7 @@ ivas_error acelp_core_enc( // float tmpF; Word16 ppp_mode, nelp_mode; Word16 tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag; float *tdm_Pri_pitch_buf; //float *tdm_Pri_pitch_buf; /* bitstream */ BSTR_ENC_HANDLE hBstr = st->hBstr; Loading Loading @@ -323,7 +323,6 @@ ivas_error acelp_core_enc( move32(); } tmp_noise = 0; tmp_noise_fx = 0; move16(); tc_subfr = -1; Loading Loading @@ -369,7 +368,6 @@ ivas_error acelp_core_enc( tdm_lp_reuse_flag = hStereoTD->tdm_lp_reuse_flag; tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode; tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag; tdm_Pri_pitch_buf = hStereoTD->tdm_Pri_pitch_buf; tdm_Pri_pitch_buf_fx = hStereoTD->tdm_Pri_pitch_buf_fx; } ELSE Loading @@ -383,7 +381,6 @@ ivas_error acelp_core_enc( move16(); } tdm_Pitch_reuse_flag = 0; tdm_Pri_pitch_buf = NULL; tdm_Pri_pitch_buf_fx = NULL; } move16(); Loading Loading @@ -1140,11 +1137,6 @@ ivas_error acelp_core_enc( st->clip_var[4] = fix16_to_float(st->clip_var_fx[4], Q14); st->clip_var[5] = fix16_to_float(st->clip_var_fx[5], Q14); for (int ii = 0; ii < M; ii++) { mem_AR[ii] = (float)mem_AR_fx[ii] / 2.56f; mem_MA[ii] = (float)mem_MA_fx[ii] / 2.56f; } fixedToFloat_arr(lsp_new_bck_fx, lsp_new_bck, Q15, M); fixedToFloat_arr(lsp_mid_bck_fx, lsp_mid_bck, Q15, M); fixedToFloat_arr(mem_syn_bck_fx, mem_syn_bck, st->hLPDmem->mem_syn_q, M); Loading Loading @@ -1189,7 +1181,6 @@ ivas_error acelp_core_enc( fixedToFloat_arr(syn_fx, syn, Q_new /*Q_exc2*/, L_FRAME16k); fixedToFloat_arr(voice_factors_fx, voice_factors, Q15, NB_SUBFR16k); fixedToFloat_arr(pitch_buf_fx, pitch_buf, Q6, NB_SUBFR16k); tmp_noise = fix16_to_float(tmp_noise_fx, Q8); st->hLPDmem->tilt_code_flt = fix16_to_float(st->hLPDmem->tilt_code, Q15); st->hLPDmem->gc_threshold_flt = fix_to_float(st->hLPDmem->gc_threshold, Q16); IF(hStereoTD) Loading lib_enc/gaus_enc_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "prot.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" Loading Loading
lib_enc/acelp_core_enc.c +3 −12 Original line number Diff line number Diff line Loading @@ -98,7 +98,7 @@ ivas_error acelp_core_enc( #endif // IVAS_FLOAT_FIXED_CONVERSIONS float exc2[L_FRAME16k]; /* enhanced excitation */ float Es_pred; /* predicited scaled innovation energy */ float tmp_noise; /* NB post-filter long-term noise energy*/ //float tmp_noise; /* NB post-filter long-term noise energy*/ Word16 tc_subfr; /* TC sub-frame indication */ float old_bwe_exc[( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2]; /* excitation buffer */ float *bwe_exc; /* excitation for SWB TBE */ Loading @@ -108,7 +108,7 @@ ivas_error acelp_core_enc( /* SC-VBR - back-up memories for LSF quantizer and synthesis filter */ Word16 pstreaklen; float mem_MA[M], mem_AR[M]/*, Bin_E[L_FFT], Bin_E_old[L_FFT / 2]*/, lsp_new_bck[M], lsp_mid_bck[M], mem_syn_bck[M]; float/* mem_MA[M], mem_AR[M], Bin_E[L_FFT], Bin_E_old[L_FFT / 2],*/ lsp_new_bck[M], lsp_mid_bck[M], mem_syn_bck[M]; float q_env[NUM_ENV_CNG]; Word16 sid_bw = -1; Loading @@ -121,7 +121,7 @@ ivas_error acelp_core_enc( // float tmpF; Word16 ppp_mode, nelp_mode; Word16 tdm_lp_reuse_flag, tdm_low_rate_mode, tdm_Pitch_reuse_flag; float *tdm_Pri_pitch_buf; //float *tdm_Pri_pitch_buf; /* bitstream */ BSTR_ENC_HANDLE hBstr = st->hBstr; Loading Loading @@ -323,7 +323,6 @@ ivas_error acelp_core_enc( move32(); } tmp_noise = 0; tmp_noise_fx = 0; move16(); tc_subfr = -1; Loading Loading @@ -369,7 +368,6 @@ ivas_error acelp_core_enc( tdm_lp_reuse_flag = hStereoTD->tdm_lp_reuse_flag; tdm_low_rate_mode = hStereoTD->tdm_low_rate_mode; tdm_Pitch_reuse_flag = hStereoTD->tdm_Pitch_reuse_flag; tdm_Pri_pitch_buf = hStereoTD->tdm_Pri_pitch_buf; tdm_Pri_pitch_buf_fx = hStereoTD->tdm_Pri_pitch_buf_fx; } ELSE Loading @@ -383,7 +381,6 @@ ivas_error acelp_core_enc( move16(); } tdm_Pitch_reuse_flag = 0; tdm_Pri_pitch_buf = NULL; tdm_Pri_pitch_buf_fx = NULL; } move16(); Loading Loading @@ -1140,11 +1137,6 @@ ivas_error acelp_core_enc( st->clip_var[4] = fix16_to_float(st->clip_var_fx[4], Q14); st->clip_var[5] = fix16_to_float(st->clip_var_fx[5], Q14); for (int ii = 0; ii < M; ii++) { mem_AR[ii] = (float)mem_AR_fx[ii] / 2.56f; mem_MA[ii] = (float)mem_MA_fx[ii] / 2.56f; } fixedToFloat_arr(lsp_new_bck_fx, lsp_new_bck, Q15, M); fixedToFloat_arr(lsp_mid_bck_fx, lsp_mid_bck, Q15, M); fixedToFloat_arr(mem_syn_bck_fx, mem_syn_bck, st->hLPDmem->mem_syn_q, M); Loading Loading @@ -1189,7 +1181,6 @@ ivas_error acelp_core_enc( fixedToFloat_arr(syn_fx, syn, Q_new /*Q_exc2*/, L_FRAME16k); fixedToFloat_arr(voice_factors_fx, voice_factors, Q15, NB_SUBFR16k); fixedToFloat_arr(pitch_buf_fx, pitch_buf, Q6, NB_SUBFR16k); tmp_noise = fix16_to_float(tmp_noise_fx, Q8); st->hLPDmem->tilt_code_flt = fix16_to_float(st->hLPDmem->tilt_code, Q15); st->hLPDmem->gc_threshold_flt = fix_to_float(st->hLPDmem->gc_threshold, Q16); IF(hStereoTD) Loading
lib_enc/gaus_enc_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ #include "rom_com_fx.h" /* Static table prototypes */ #include "rom_com.h" /* Static table prototypes */ #include "rom_enc.h" /* Static table prototypes */ //#include "prot_fx.h" /* Function prototypes */ #include "prot.h" /* Function prototypes */ #include "prot_fx.h" /* Function prototypes */ #include "prot_fx_enc.h" /* Function prototypes */ //#include "basop_mpy.h" Loading