Bump to codec2 version 1.2.0erdgeist-bump-to-1.2.0

1 files changed, 39 insertions, 77 deletions

diff --git a/quantise.h b/quantise.h
index 4baa87c..08d5532 100644
--- a/quantise.h
+++ b/quantise.h
@@ -29,113 +29,75 @@
 #include "codec2_fft.h"
 #include "comp.h"
 
-#define WO_BITS     7
-#define WO_LEVELS   (1<<WO_BITS)
-#define WO_DT_BITS  3
+#define WO_BITS 7
+#define WO_LEVELS (1 << WO_BITS)
+#define WO_DT_BITS 3
 
-#define E_BITS      5
-#define E_LEVELS    (1<<E_BITS)
-#define E_MIN_DB   -10.0
-#define E_MAX_DB    40.0
+#define E_BITS 5
+#define E_LEVELS (1 << E_BITS)
+#define E_MIN_DB -10.0
+#define E_MAX_DB 40.0
 
-#define LSP_SCALAR_INDEXES    10
-#define LSPD_SCALAR_INDEXES    10
-#define LSP_PRED_VQ_INDEXES    3
-#define LSP_DIFF_FREQ_INDEXES  5
-#define LSP_DIFF_TIME_BITS     7
+#define LSP_SCALAR_INDEXES 10
+#define LSPD_SCALAR_INDEXES 10
+#define LSP_PRED_VQ_INDEXES 3
 
-#define LSPDT_ALL   0
-#define LSPDT_LOW   1
-#define LSPDT_HIGH  2
-
-#define WO_E_BITS   8
+#define WO_E_BITS 8
 
 #define LPCPF_GAMMA 0.5
-#define LPCPF_BETA  0.2
+#define LPCPF_BETA 0.2
 
-void quantise_init();
 float lpc_model_amplitudes(float Sn[], float w[], MODEL *model, int order,
-                           int lsp,float ak[]);
-void aks_to_M2(codec2_fftr_cfg fftr_fwd_cfg, float ak[], int order, MODEL *model,
-               float E, float *snr, int dump, int sim_pf,
-               int pf, int bass_boost, float beta, float gamma, COMP Aw[]);
+                           int lsp, float ak[]);
+void aks_to_M2(codec2_fftr_cfg fftr_fwd_cfg, float ak[], int order,
+               MODEL *model, float E, float *snr, int dump, int sim_pf, int pf,
+               int bass_boost, float beta, float gamma, COMP Aw[]);
 
-int   encode_Wo(C2CONST *c2const, float Wo, int bits);
+int encode_Wo(C2CONST *c2const, float Wo, int bits);
 float decode_Wo(C2CONST *c2const, int index, int bits);
-int   encode_log_Wo(C2CONST *c2const, float Wo, int bits);
+int encode_log_Wo(C2CONST *c2const, float Wo, int bits);
 float decode_log_Wo(C2CONST *c2const, int index, int bits);
-#if 0
-int   encode_Wo_dt(C2CONST *c2const, float Wo, float prev_Wo);
-float decode_Wo_dt(C2CONST *c2const, int index, float prev_Wo);
-#endif
-void  encode_lsps_scalar(int indexes[], float lsp[], int order);
-void  decode_lsps_scalar(float lsp[], int indexes[], int order);
-void  encode_lspds_scalar(int indexes[], float lsp[], int order);
-void  decode_lspds_scalar(float lsp[], int indexes[], int order);
-void  encode_lsps_diff_freq_vq(int indexes[], float lsp[], int order);
-void  decode_lsps_diff_freq_vq(float lsp_[], int indexes[], int order);
-void  encode_lsps_diff_time(int indexes[],
-                            float lsp[],
-                            float lsp__prev[],
-                            int order);
-void decode_lsps_diff_time(float lsp_[],
-                           int indexes[],
-                           float lsp__prev[],
-                           int order);
+void encode_lsps_scalar(int indexes[], float lsp[], int order);
+void decode_lsps_scalar(float lsp[], int indexes[], int order);
+void encode_lspds_scalar(int indexes[], float lsp[], int order);
+void decode_lspds_scalar(float lsp[], int indexes[], int order);
 
 void encode_lsps_vq(int *indexes, float *x, float *xq, int order);
 void decode_lsps_vq(int *indexes, float *xq, int order, int stages);
 
-long quantise(const float * cb, float vec[], float w[], int k, int m, float *se);
+long quantise(const float *cb, float vec[], float w[], int k, int m, float *se);
 void lspvq_quantise(float lsp[], float lsp_[], int order);
-void lspjnd_quantise(float lsp[], float lsp_[], int order);
-void lspdt_quantise(float lsps[], float lsps_[], float lsps__prev[], int mode);
-void lspjvm_quantise(float lsps[], float lsps_[], int order);
-void lspanssi_quantise(float lsps[], float lsps_[], int order, int mbest_entries);
-float lspmelvq_quantise(float *x, float *xq, int order);
-
-float lspmelvq_mbest_encode(int *indexes, float *x, float *xq, int ndim, int mbest_entries);
-void lspmelvq_decode(int *indexes, float *xq, int ndim);
-
-void encode_mels_scalar(int mel_indexes[], float mels[], int order);
-void decode_mels_scalar(float mels[], int mel_indexes[], int order);
+void lspjmv_quantise(float lsps[], float lsps_[], int order);
 
 void quantise_WoE(C2CONST *c2const, MODEL *model, float *e, float xq[]);
-int  encode_WoE(MODEL *model, float e, float xq[]);
+int encode_WoE(MODEL *model, float e, float xq[]);
 void decode_WoE(C2CONST *c2const, MODEL *model, float *e, float xq[], int n1);
 
 int encode_energy(float e, int bits);
 float decode_energy(int index, int bits);
 
-void pack(unsigned char * bits, unsigned int *nbit, int index, unsigned int index_bits);
-void pack_natural_or_gray(unsigned char * bits, unsigned int *nbit, int index, unsigned int index_bits, unsigned int gray);
-int  unpack(const unsigned char * bits, unsigned int *nbit, unsigned int index_bits);
-int  unpack_natural_or_gray(const unsigned char * bits, unsigned int *nbit, unsigned int index_bits, unsigned int gray);
+void pack(unsigned char *bits, unsigned int *nbit, int index,
+          unsigned int index_bits);
+void pack_natural_or_gray(unsigned char *bits, unsigned int *nbit, int index,
+                          unsigned int index_bits, unsigned int gray);
+int unpack(const unsigned char *bits, unsigned int *nbit,
+           unsigned int index_bits);
+int unpack_natural_or_gray(const unsigned char *bits, unsigned int *nbit,
+                           unsigned int index_bits, unsigned int gray);
 
 int lsp_bits(int i);
 int lspd_bits(int i);
-int lspdt_bits(int i);
 int lsp_pred_vq_bits(int i);
-int mel_bits(int i);
-int lspmelvq_cb_bits(int i);
 
 void apply_lpc_correction(MODEL *model);
-float speech_to_uq_lsps(float lsp[],
-                        float ak[],
-                        float Sn[],
-                        float w[],
-                        int m_pitch,
-                        int   order
-                        );
+float speech_to_uq_lsps(float lsp[], float ak[], float Sn[], float w[],
+                        int m_pitch, int order);
 int check_lsp_order(float lsp[], int lpc_order);
-void bw_expand_lsps(float lsp[], int order, float min_sep_low, float min_sep_high);
+void bw_expand_lsps(float lsp[], int order, float min_sep_low,
+                    float min_sep_high);
 void bw_expand_lsps2(float lsp[], int order);
 void locate_lsps_jnd_steps(float lsp[], int order);
-float decode_amplitudes(MODEL *model,
-                        float  ak[],
-                        int    lsp_indexes[],
-                        int    energy_index,
-                        float  lsps[],
-                        float *e);
+float decode_amplitudes(MODEL *model, float ak[], int lsp_indexes[],
+                        int energy_index, float lsps[], float *e);
 
 #endif