FreeCalypso > hg > gsm-codec-lib
changeset 48:af4b075d0313
libgsmefr: encoder state structure finished in first pass
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Fri, 25 Nov 2022 05:16:38 +0000 |
| parents | 89945a3b576e |
| children | dd79ec84283d |
| files | libgsmefr/Makefile libgsmefr/enc_state.h libgsmefr/typedef.h libgsmefr/vad.h |
| diffstat | 4 files changed, 45 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgsmefr/Makefile Fri Nov 25 04:01:13 2022 +0000 +++ b/libgsmefr/Makefile Fri Nov 25 05:16:38 2022 +0000 @@ -2,8 +2,9 @@ CFLAGS= -O2 OBJS= basicop2.o frame2params.o params2frame.o sid_class.o sid_insert.o \ tls_flags.o -HDRS= basic_op.h cnst.h codec.h d_homing.h dtx.h e_homing.h gains_tb.h \ - gsm_efr.h namespace.h no_count.h oper_32b.h sig_proc.h typedef.h vad.h +HDRS= basic_op.h cnst.h codec.h d_homing.h dec_state.h dtx.h e_homing.h \ + enc_state.h gains_tb.h gsm_efr.h namespace.h no_count.h oper_32b.h \ + sig_proc.h typedef.h vad.h LIB= libgsmefr.a INSTALL_PREFIX= /usr/local
--- a/libgsmefr/enc_state.h Fri Nov 25 04:01:13 2022 +0000 +++ b/libgsmefr/enc_state.h Fri Nov 25 05:16:38 2022 +0000 @@ -30,5 +30,37 @@ Word16 x0; Word16 x1; } pre_proc; - /* to be continued */ + /* from q_plsf_5.c */ + Word16 past_r2_q[M]; + /* from q_gains.c */ + Word16 past_qua_en[4]; + Word16 pred[4]; + /* from dtx.c */ + Word16 txdtx_ctrl; + Word16 CN_excitation_gain; + Word32 L_pn_seed_tx; + Word16 txdtx_hangover; + Word16 txdtx_N_elapsed; + Word16 old_CN_mem_tx[6]; + Word16 buf_p_tx; + Word16 lsf_old_tx[DTX_HANGOVER][M]; + Word16 gain_code_old_tx[4 * DTX_HANGOVER]; + /* from vad.c */ + struct vad_state { + Word16 rvad[9]; + Word16 scal_rvad; + Pfloat thvad; + Word32 L_sacf[27]; + Word32 L_sav0[36]; + Word16 pt_sacf; + Word16 pt_sav0; + Word32 L_lastdm; + Word16 adaptcount; + Word16 burstcount; + Word16 hangcount; + Word16 oldlagcount; + Word16 veryoldlagcount; + Word16 oldlag; + } vad; + Word16 ptch; };
--- a/libgsmefr/typedef.h Fri Nov 25 04:01:13 2022 +0000 +++ b/libgsmefr/typedef.h Fri Nov 25 05:16:38 2022 +0000 @@ -3,3 +3,12 @@ typedef int16_t Word16; typedef int32_t Word32; typedef uint8_t Flag; + +/* Struct for storing pseudo floating point exponent and mantissa */ +struct _fp +{ + Word16 e; /* exponent */ + Word16 m; /* mantissa */ +}; + +typedef struct _fp Pfloat;
--- a/libgsmefr/vad.h Fri Nov 25 04:01:13 2022 +0000 +++ b/libgsmefr/vad.h Fri Nov 25 05:16:38 2022 +0000 @@ -8,15 +8,6 @@ * **************************************************************************/ -/* Struct for storing pseudo floating point exponent and mantissa */ -struct _fp -{ - Word16 e; /* exponent */ - Word16 m; /* mantissa */ -}; - -typedef struct _fp Pfloat; - void vad_reset (void); Word16 vad_computation (