Loading lib_com/basop_util.c +2 −2 Original line number Diff line number Diff line Loading @@ -49,8 +49,8 @@ #define WMC_TOOL_SKIP extern const Word32 SqrtTable[32]; extern const Word16 SqrtDiffTable[32]; extern const Word32 SqrtTable[32]; // Q31 extern const Word16 SqrtDiffTable[32]; /* Q15 */ extern const Word32 ISqrtTable[32]; extern const Word16 ISqrtDiffTable[32]; Loading lib_com/lpc_tools_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -1281,7 +1281,7 @@ Word32 E_LPC_schur( Word32 r[] /*Qr*/, Word16 reflCoeff[] /*Q15*/, Word32 epsP[] } extern const PWord16 *w_a[7]; extern const PWord16 *w_a[7]; // Q15 extern const PWord16 w19N[127]; extern const PWord16 w18N[127]; extern void BASOP_getTables( const PWord16 **ptwiddle, const PWord16 **sin_twiddle, Word16 *psin_step, Word16 length ); Loading lib_com/prot.h +3 −3 Original line number Diff line number Diff line Loading @@ -1153,11 +1153,11 @@ void residu( #ifdef IVAS_FLOAT_FIXED void residu_ivas_fx( const Word16 *a, /* i : LP filter coefficients */ const Word16 *a, /* i : LP filter coefficients Q31-a_exp*/ const Word16 a_exp, const Word16 m, /* i : order of LP filter */ const Word32 *x, /* i : input signal (usually speech) */ Word32 *y, /* o : output signal (usually residual) */ const Word32 *x, /* i : input signal (usually speech) Qx*/ Word32 *y, /* o : output signal (usually residual) Qx*/ const Word16 l /* i : size of filtering */ ); #endif Loading lib_com/prot_fx.h +46 −47 Original line number Diff line number Diff line Loading @@ -1336,16 +1336,16 @@ scale_mem_fx.c /========================================================================================================*/ Word16 Rescale_exc( Word16 dct_post_old_exc_fx[], /* i/o: Music post processing memory */ Word16 dct_post_old_exc_fx[], /* i/o: Music post processing memory Q_exc*/ Word16 exc[], /* i/o: excitation to rescale Q_exc */ Word16 bwe_exc[], Word16 *last_exc_dct_in, Word16 bwe_exc[], /* Q_exc */ Word16 *last_exc_dct_in, /* Q_exc */ Word16 lg, /* i : frame size */ Word16 lg32, Word32 L_gain_code, /* i : decoded codebook gain Q16 */ Word16 *sQ_exc, /* i/o: Excitation scaling factor */ Word16 *sQsubfr, /* i/o: Past excitation scaling factors */ Word16 exc2[], /* o : local excitation vector */ Word16 exc2[], /* o : local excitation vector Q_exc */ Word16 i_subfr, /* i : subframe number */ const Word16 coder_type ); Loading @@ -1353,13 +1353,13 @@ void Rescale_mem( const Word16 Q_exc, /* i : current excitation scaling (>=0) */ Word16 *prev_Q_syn, /* i/o : scaling factor of previous frame */ Word16 *Q_syn, /* i/o : scaling factor of frame */ Word16 *mem_syn2, /* i/o : modified synthesis memory */ Word16 *mem_syn_clas_estim_fx, /* i/o : old 12k8 core memory for classification */ Word16 *mem_syn2, /* i/o : modified synthesis memory Qexp_scale */ Word16 *mem_syn_clas_estim_fx, /* i/o : old 12k8 core memory for classification Qexp_scale*/ const Word16 MaxScaling, /* i: Minimal difference between excitation scaling and synthesis scaling */ Word16 *mem_deemph, /* i/o: speech deemph filter memory */ Word16 *pst_old_syn, /* i/o: psfiler */ Word16 *pst_mem_deemp_err, /* i/o: psfiler */ Word16 *mem_agc, Word16 *mem_deemph, /* i/o: speech deemph filter memory Qexp_scale */ Word16 *pst_old_syn, /* i/o: psfiler Qexp_scale*/ Word16 *pst_mem_deemp_err, /* i/o: psfiler Qexp_scale */ Word16 *mem_agc, /*Qexp_scale*/ PFSTAT_HANDLE hPFstat, /* i/o: All memories related to NB post filter */ const Word16 Vad_flag, const Word16 Cna_flag, Loading Loading @@ -2192,7 +2192,7 @@ Word32 hq2_bit_alloc_fx( ); void reordvct_fx( Word16 *y, /* i/o: vector to rearrange */ Word16 *y, /* i/o: vector to rearrange Q0*/ const Word16 N, /* i : dimensions */ Word16 *idx /* o : reordered vector index */ ); Loading Loading @@ -2477,9 +2477,9 @@ void Residu3_fx( void calc_residu_fx( Encoder_State *st, /* i/o: state structure */ const Word16 *speech, /* i : weighted speech signal */ Word16 *res, /* o : residual signal */ const Word16 *p_Aq /* i : quantized LP filter coefficients */ const Word16 *speech, /* i : weighted speech signal Qx*/ Word16 *res, /* o : residual signal Qx+1*/ const Word16 *p_Aq /* i : quantized LP filter coefficients Q12*/ ); // inerpol_lc.c Word32 Interpol_lc_fx( /* o : interpolated value Q15 */ Loading Loading @@ -5482,12 +5482,12 @@ void bitallocsum_fx( // stab_est_fx.c Word16 stab_est_fx( Word16 etot, /* i : Total energy of the current frame */ Word16 *lt_diff_etot, /* i/o : Long term total energy variation */ Word16 *mem_etot, /* i/o : Total energy memory */ Word16 etot, /* i : Total energy of the current frame Q8*/ Word16 *lt_diff_etot, /* i/o : Long term total energy variation Q8*/ Word16 *mem_etot, /* i/o : Total energy memory Q8*/ Word16 *nb_thr_3, /* i/o : Number of consecutives frames of level 3 */ Word16 *nb_thr_1, /* i/o : Number of consecutives frames of level 1 */ Word16 *thresh, /* i/o : Detection thresold */ Word16 *thresh, /* i/o : Detection thresold Q11*/ Word16 *last_music_flag, /* i/o : Previous music detection ouptut */ const Word16 vad_flag /* i : VAD flag */ ); Loading Loading @@ -8362,23 +8362,23 @@ void stat_noise_uv_dec_fx( // stat_noise_uv_mod_fx.c void stat_noise_uv_mod_fx( const Word16 coder_type, /* i : Coder type */ Word16 noisiness, /* i : noisiness parameter */ const Word16 *lsp_old, /* i : old LSP vector at 4th sfr */ const Word16 *lsp_new, /* i : LSP vector at 4th sfr */ const Word16 *lsp_mid, /* i : LSP vector at 2nd sfr */ Word16 *Aq, /* o : A(z) quantized for the 4 subframes */ Word16 *exc2, /* i/o: excitation buffer */ Word16 noisiness, /* i : noisiness parameter Q0 */ const Word16 *lsp_old, /* i : old LSP vector at 4th sfr Q15 */ const Word16 *lsp_new, /* i : LSP vector at 4th sfr Q15 */ const Word16 *lsp_mid, /* i : LSP vector at 2nd sfr Q15 */ Word16 *Aq, /* o : A(z) quantized for the 4 subframes Q12 */ Word16 *exc2, /* i/o: excitation buffer Q_exc */ Word16 Q_exc, /* i : Q of exc2 excitation buffer [11..-1] expected */ const Word16 bfi, /* i : Bad frame indicator */ Word32 *ge_sm, /* i/o: smoothed excitation gain */ Word32 *ge_sm, /* i/o: smoothed excitation gain Q_ge */ Word16 *uv_count, /* i/o: unvoiced counter */ Word16 *act_count, /* i/o: activation counter */ Word16 lspold_s[], /* i/o: old LSP */ Word16 *noimix_seed, /* i/o: mixture seed */ Word16 *st_min_alpha, /* i/o: minimum alpha */ Word16 *exc_pe, /* i/o: scale Q_stat_noise */ Word16 lspold_s[], /* i/o: old LSP Q15 */ Word16 *noimix_seed, /* i/o: mixture seed Q0 */ Word16 *st_min_alpha, /* i/o: minimum alpha Q15 */ Word16 *exc_pe, /* i/o: scale Q_stat_noise Q_stat_noise */ const Word32 bitrate, /* i : core bitrate */ const Word16 bwidth_fx, /* i : i bandwidth */ const Word16 bwidth_fx, /* i : input bandwidth */ Word16 *Q_stat_noise, /* i/o: noise scaling */ Word16 *Q_stat_noise_ge /* i/o: noise scaling */ ); Loading @@ -8397,7 +8397,7 @@ void stat_noise_uv_mod_ivas_fx( Word16 *uv_count, /* i/o: unvoiced counter */ Word16 *act_count, /* i/o: activation counter */ Word16 lspold_s[], /* i/o: old LSP Q=15*/ Word16 *noimix_seed, /* i/o: mixture seed */ Word16 *noimix_seed, /* i/o: mixture seed Q0 */ Word16 *st_min_alpha, /* i/o: minimum alpha Q=15*/ Word16 *exc_pe, /* i/o: scale Q_stat_noise Q=Q_stat_noise*/ const Word32 bitrate, /* i : core bitrate */ Loading Loading @@ -10719,9 +10719,8 @@ void swb_pre_proc_ivas_fx( Encoder_State *st, /* i/o: encoder state structure */ Word16 *new_swb_speech, /* o : original input signal at 32kHz - Q0 */ Word32 *new_swb_speech_fx, /* o : original input signal at 32kHz - Q - q_reImBuffer */ Word16 *shb_speech, /* o : SHB target signal (6-14kHz) at 16kHz- Q0 */ Word32 *shb_speech_32, /* o : SHB target signal (6-14kHz) at 16kHz- Q - q_reImBuffer */ Word16 *use_shb32, /* o : flags valid data in 32-bit shb buffer for better precision. */ Word16 *shb_speech, /* o : SHB target signal (6-14kHz) at 16kHz- Q(Q_shb_spch) */ Word16 *Q_shb_spch, Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : real buffer Q - q_reImbuffer */ Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : imag buffer Q - q_reImbuffer */ Word16 q_reImBuffer, /* i : scale data of real and imag CLDFB buffers */ lib_com/reordvct_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -42,7 +42,7 @@ *--------------------------------------------------------------------------*/ void reordvct_fx( Word16 *y, /* i/o: vector to rearrange */ Word16 *y, /* i/o: vector to rearrange Q0*/ const Word16 N, /* i : dimensions */ Word16 *idx /* o : reordered vector index */ ) Loading Loading
lib_com/basop_util.c +2 −2 Original line number Diff line number Diff line Loading @@ -49,8 +49,8 @@ #define WMC_TOOL_SKIP extern const Word32 SqrtTable[32]; extern const Word16 SqrtDiffTable[32]; extern const Word32 SqrtTable[32]; // Q31 extern const Word16 SqrtDiffTable[32]; /* Q15 */ extern const Word32 ISqrtTable[32]; extern const Word16 ISqrtDiffTable[32]; Loading
lib_com/lpc_tools_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -1281,7 +1281,7 @@ Word32 E_LPC_schur( Word32 r[] /*Qr*/, Word16 reflCoeff[] /*Q15*/, Word32 epsP[] } extern const PWord16 *w_a[7]; extern const PWord16 *w_a[7]; // Q15 extern const PWord16 w19N[127]; extern const PWord16 w18N[127]; extern void BASOP_getTables( const PWord16 **ptwiddle, const PWord16 **sin_twiddle, Word16 *psin_step, Word16 length ); Loading
lib_com/prot.h +3 −3 Original line number Diff line number Diff line Loading @@ -1153,11 +1153,11 @@ void residu( #ifdef IVAS_FLOAT_FIXED void residu_ivas_fx( const Word16 *a, /* i : LP filter coefficients */ const Word16 *a, /* i : LP filter coefficients Q31-a_exp*/ const Word16 a_exp, const Word16 m, /* i : order of LP filter */ const Word32 *x, /* i : input signal (usually speech) */ Word32 *y, /* o : output signal (usually residual) */ const Word32 *x, /* i : input signal (usually speech) Qx*/ Word32 *y, /* o : output signal (usually residual) Qx*/ const Word16 l /* i : size of filtering */ ); #endif Loading
lib_com/prot_fx.h +46 −47 Original line number Diff line number Diff line Loading @@ -1336,16 +1336,16 @@ scale_mem_fx.c /========================================================================================================*/ Word16 Rescale_exc( Word16 dct_post_old_exc_fx[], /* i/o: Music post processing memory */ Word16 dct_post_old_exc_fx[], /* i/o: Music post processing memory Q_exc*/ Word16 exc[], /* i/o: excitation to rescale Q_exc */ Word16 bwe_exc[], Word16 *last_exc_dct_in, Word16 bwe_exc[], /* Q_exc */ Word16 *last_exc_dct_in, /* Q_exc */ Word16 lg, /* i : frame size */ Word16 lg32, Word32 L_gain_code, /* i : decoded codebook gain Q16 */ Word16 *sQ_exc, /* i/o: Excitation scaling factor */ Word16 *sQsubfr, /* i/o: Past excitation scaling factors */ Word16 exc2[], /* o : local excitation vector */ Word16 exc2[], /* o : local excitation vector Q_exc */ Word16 i_subfr, /* i : subframe number */ const Word16 coder_type ); Loading @@ -1353,13 +1353,13 @@ void Rescale_mem( const Word16 Q_exc, /* i : current excitation scaling (>=0) */ Word16 *prev_Q_syn, /* i/o : scaling factor of previous frame */ Word16 *Q_syn, /* i/o : scaling factor of frame */ Word16 *mem_syn2, /* i/o : modified synthesis memory */ Word16 *mem_syn_clas_estim_fx, /* i/o : old 12k8 core memory for classification */ Word16 *mem_syn2, /* i/o : modified synthesis memory Qexp_scale */ Word16 *mem_syn_clas_estim_fx, /* i/o : old 12k8 core memory for classification Qexp_scale*/ const Word16 MaxScaling, /* i: Minimal difference between excitation scaling and synthesis scaling */ Word16 *mem_deemph, /* i/o: speech deemph filter memory */ Word16 *pst_old_syn, /* i/o: psfiler */ Word16 *pst_mem_deemp_err, /* i/o: psfiler */ Word16 *mem_agc, Word16 *mem_deemph, /* i/o: speech deemph filter memory Qexp_scale */ Word16 *pst_old_syn, /* i/o: psfiler Qexp_scale*/ Word16 *pst_mem_deemp_err, /* i/o: psfiler Qexp_scale */ Word16 *mem_agc, /*Qexp_scale*/ PFSTAT_HANDLE hPFstat, /* i/o: All memories related to NB post filter */ const Word16 Vad_flag, const Word16 Cna_flag, Loading Loading @@ -2192,7 +2192,7 @@ Word32 hq2_bit_alloc_fx( ); void reordvct_fx( Word16 *y, /* i/o: vector to rearrange */ Word16 *y, /* i/o: vector to rearrange Q0*/ const Word16 N, /* i : dimensions */ Word16 *idx /* o : reordered vector index */ ); Loading Loading @@ -2477,9 +2477,9 @@ void Residu3_fx( void calc_residu_fx( Encoder_State *st, /* i/o: state structure */ const Word16 *speech, /* i : weighted speech signal */ Word16 *res, /* o : residual signal */ const Word16 *p_Aq /* i : quantized LP filter coefficients */ const Word16 *speech, /* i : weighted speech signal Qx*/ Word16 *res, /* o : residual signal Qx+1*/ const Word16 *p_Aq /* i : quantized LP filter coefficients Q12*/ ); // inerpol_lc.c Word32 Interpol_lc_fx( /* o : interpolated value Q15 */ Loading Loading @@ -5482,12 +5482,12 @@ void bitallocsum_fx( // stab_est_fx.c Word16 stab_est_fx( Word16 etot, /* i : Total energy of the current frame */ Word16 *lt_diff_etot, /* i/o : Long term total energy variation */ Word16 *mem_etot, /* i/o : Total energy memory */ Word16 etot, /* i : Total energy of the current frame Q8*/ Word16 *lt_diff_etot, /* i/o : Long term total energy variation Q8*/ Word16 *mem_etot, /* i/o : Total energy memory Q8*/ Word16 *nb_thr_3, /* i/o : Number of consecutives frames of level 3 */ Word16 *nb_thr_1, /* i/o : Number of consecutives frames of level 1 */ Word16 *thresh, /* i/o : Detection thresold */ Word16 *thresh, /* i/o : Detection thresold Q11*/ Word16 *last_music_flag, /* i/o : Previous music detection ouptut */ const Word16 vad_flag /* i : VAD flag */ ); Loading Loading @@ -8362,23 +8362,23 @@ void stat_noise_uv_dec_fx( // stat_noise_uv_mod_fx.c void stat_noise_uv_mod_fx( const Word16 coder_type, /* i : Coder type */ Word16 noisiness, /* i : noisiness parameter */ const Word16 *lsp_old, /* i : old LSP vector at 4th sfr */ const Word16 *lsp_new, /* i : LSP vector at 4th sfr */ const Word16 *lsp_mid, /* i : LSP vector at 2nd sfr */ Word16 *Aq, /* o : A(z) quantized for the 4 subframes */ Word16 *exc2, /* i/o: excitation buffer */ Word16 noisiness, /* i : noisiness parameter Q0 */ const Word16 *lsp_old, /* i : old LSP vector at 4th sfr Q15 */ const Word16 *lsp_new, /* i : LSP vector at 4th sfr Q15 */ const Word16 *lsp_mid, /* i : LSP vector at 2nd sfr Q15 */ Word16 *Aq, /* o : A(z) quantized for the 4 subframes Q12 */ Word16 *exc2, /* i/o: excitation buffer Q_exc */ Word16 Q_exc, /* i : Q of exc2 excitation buffer [11..-1] expected */ const Word16 bfi, /* i : Bad frame indicator */ Word32 *ge_sm, /* i/o: smoothed excitation gain */ Word32 *ge_sm, /* i/o: smoothed excitation gain Q_ge */ Word16 *uv_count, /* i/o: unvoiced counter */ Word16 *act_count, /* i/o: activation counter */ Word16 lspold_s[], /* i/o: old LSP */ Word16 *noimix_seed, /* i/o: mixture seed */ Word16 *st_min_alpha, /* i/o: minimum alpha */ Word16 *exc_pe, /* i/o: scale Q_stat_noise */ Word16 lspold_s[], /* i/o: old LSP Q15 */ Word16 *noimix_seed, /* i/o: mixture seed Q0 */ Word16 *st_min_alpha, /* i/o: minimum alpha Q15 */ Word16 *exc_pe, /* i/o: scale Q_stat_noise Q_stat_noise */ const Word32 bitrate, /* i : core bitrate */ const Word16 bwidth_fx, /* i : i bandwidth */ const Word16 bwidth_fx, /* i : input bandwidth */ Word16 *Q_stat_noise, /* i/o: noise scaling */ Word16 *Q_stat_noise_ge /* i/o: noise scaling */ ); Loading @@ -8397,7 +8397,7 @@ void stat_noise_uv_mod_ivas_fx( Word16 *uv_count, /* i/o: unvoiced counter */ Word16 *act_count, /* i/o: activation counter */ Word16 lspold_s[], /* i/o: old LSP Q=15*/ Word16 *noimix_seed, /* i/o: mixture seed */ Word16 *noimix_seed, /* i/o: mixture seed Q0 */ Word16 *st_min_alpha, /* i/o: minimum alpha Q=15*/ Word16 *exc_pe, /* i/o: scale Q_stat_noise Q=Q_stat_noise*/ const Word32 bitrate, /* i : core bitrate */ Loading Loading @@ -10719,9 +10719,8 @@ void swb_pre_proc_ivas_fx( Encoder_State *st, /* i/o: encoder state structure */ Word16 *new_swb_speech, /* o : original input signal at 32kHz - Q0 */ Word32 *new_swb_speech_fx, /* o : original input signal at 32kHz - Q - q_reImBuffer */ Word16 *shb_speech, /* o : SHB target signal (6-14kHz) at 16kHz- Q0 */ Word32 *shb_speech_32, /* o : SHB target signal (6-14kHz) at 16kHz- Q - q_reImBuffer */ Word16 *use_shb32, /* o : flags valid data in 32-bit shb buffer for better precision. */ Word16 *shb_speech, /* o : SHB target signal (6-14kHz) at 16kHz- Q(Q_shb_spch) */ Word16 *Q_shb_spch, Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : real buffer Q - q_reImbuffer */ Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : imag buffer Q - q_reImbuffer */ Word16 q_reImBuffer, /* i : scale data of real and imag CLDFB buffers */
lib_com/reordvct_fx.c +1 −1 Original line number Diff line number Diff line Loading @@ -42,7 +42,7 @@ *--------------------------------------------------------------------------*/ void reordvct_fx( Word16 *y, /* i/o: vector to rearrange */ Word16 *y, /* i/o: vector to rearrange Q0*/ const Word16 N, /* i : dimensions */ Word16 *idx /* o : reordered vector index */ ) Loading
