1 files changed, 46 insertions, 56 deletions

diff --git a/codec2.h b/codec2.h
index 709b462..97e9262 100644
--- a/codec2.h
+++ b/codec2.h
@@ -26,26 +26,22 @@
   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __CODEC2__
+#define __CODEC2__
+#include "version.h"
+#include <stdbool.h>
+
 #ifdef __cplusplus
-  extern "C" {
+extern "C" {
 #endif
 
-#ifndef __CODEC2__
-#define  __CODEC2__
-
-#include <version.h>
-
-#define CODEC2_MODE_3200        0
-#define CODEC2_MODE_2400        1
-#define CODEC2_MODE_1600        2
-#define CODEC2_MODE_1400        3
-#define CODEC2_MODE_1300        4
-#define CODEC2_MODE_1200        5
-#define CODEC2_MODE_700         6
-#define CODEC2_MODE_700B        7
-#define CODEC2_MODE_700C        8
-#define CODEC2_MODE_450         10
-#define CODEC2_MODE_450PWB      11
+#define CODEC2_MODE_3200 0
+#define CODEC2_MODE_2400 1
+#define CODEC2_MODE_1600 2
+#define CODEC2_MODE_1400 3
+#define CODEC2_MODE_1300 4
+#define CODEC2_MODE_1200 5
+#define CODEC2_MODE_700C 8
 
 #ifndef CODEC2_MODE_EN_DEFAULT
 #define CODEC2_MODE_EN_DEFAULT 1
@@ -55,76 +51,70 @@
 // disable during compile time with -DCODEC2_MODE_1600_EN=0
 // all but CODEC2 1600 are enabled then
 
-//or the other way round
-// -DCODEC2_MODE_EN_DEFAULT=0 -DCODEC2_MODE_1600_EN=1
-// only CODEC2 Mode 1600
+// or the other way round
+//  -DCODEC2_MODE_EN_DEFAULT=0 -DCODEC2_MODE_1600_EN=1
+//  only CODEC2 Mode 1600
 
 #if !defined(CODEC2_MODE_3200_EN)
-        #define CODEC2_MODE_3200_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_3200_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_2400_EN)
-        #define CODEC2_MODE_2400_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_2400_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_1600_EN)
-        #define CODEC2_MODE_1600_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_1600_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_1400_EN)
-        #define CODEC2_MODE_1400_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_1400_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_1300_EN)
-        #define CODEC2_MODE_1300_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_1300_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_1200_EN)
-        #define CODEC2_MODE_1200_EN CODEC2_MODE_EN_DEFAULT
-#endif
-#if !defined(CODEC2_MODE_700_EN)
-        #define CODEC2_MODE_700_EN CODEC2_MODE_EN_DEFAULT
-#endif
-#if !defined(CODEC2_MODE_700B_EN)
-        #define CODEC2_MODE_700B_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_1200_EN CODEC2_MODE_EN_DEFAULT
 #endif
 #if !defined(CODEC2_MODE_700C_EN)
-        #define CODEC2_MODE_700C_EN CODEC2_MODE_EN_DEFAULT
-#endif
-#if !defined(CODEC2_MODE_450_EN)
-        #define CODEC2_MODE_450_EN CODEC2_MODE_EN_DEFAULT
-#endif
-#if !defined(CODEC2_MODE_450PWB_EN)
-        #define CODEC2_MODE_450PWB_EN CODEC2_MODE_EN_DEFAULT
+#define CODEC2_MODE_700C_EN CODEC2_MODE_EN_DEFAULT
 #endif
 
-#define CODEC2_MODE_ACTIVE(mode_name, var)  ((mode_name##_EN) == 0 ? 0: (var) == mode_name)
+#define CODEC2_MODE_ACTIVE(mode_name, var) \
+  ((mode_name##_EN) == 0 ? 0 : (var) == mode_name)
 
 struct CODEC2;
 
-struct CODEC2 *  codec2_create(int mode);
+struct CODEC2 *codec2_create(int mode);
 void codec2_destroy(struct CODEC2 *codec2_state);
-void codec2_encode(struct CODEC2 *codec2_state, unsigned char * bits, short speech_in[]);
-void codec2_decode(struct CODEC2 *codec2_state, short speech_out[], const unsigned char *bits);
-void codec2_decode_ber(struct CODEC2 *codec2_state, short speech_out[], const unsigned char *bits, float ber_est);
-int  codec2_samples_per_frame(struct CODEC2 *codec2_state);
-int  codec2_bits_per_frame(struct CODEC2 *codec2_state);
-
-void codec2_set_lpc_post_filter(struct CODEC2 *codec2_state, int enable, int bass_boost, float beta, float gamma);
-int  codec2_get_spare_bit_index(struct CODEC2 *codec2_state);
-int  codec2_rebuild_spare_bit(struct CODEC2 *codec2_state, int unpacked_bits[]);
+void codec2_encode(struct CODEC2 *codec2_state, unsigned char bytes[],
+                   short speech_in[]);
+void codec2_decode(struct CODEC2 *codec2_state, short speech_out[],
+                   const unsigned char bytes[]);
+void codec2_decode_ber(struct CODEC2 *codec2_state, short speech_out[],
+                       const unsigned char *bytes, float ber_est);
+int codec2_samples_per_frame(struct CODEC2 *codec2_state);
+int codec2_bits_per_frame(struct CODEC2 *codec2_state);
+int codec2_bytes_per_frame(struct CODEC2 *codec2_state);
+
+void codec2_set_lpc_post_filter(struct CODEC2 *codec2_state, int enable,
+                                int bass_boost, float beta, float gamma);
+int codec2_get_spare_bit_index(struct CODEC2 *codec2_state);
+int codec2_rebuild_spare_bit(struct CODEC2 *codec2_state, char unpacked_bits[]);
 void codec2_set_natural_or_gray(struct CODEC2 *codec2_state, int gray);
 void codec2_set_softdec(struct CODEC2 *c2, float *softdec);
 float codec2_get_energy(struct CODEC2 *codec2_state, const unsigned char *bits);
-      
+
 // support for ML and VQ experiments
-void codec2_open_mlfeat(struct CODEC2 *codec2_state, char *filename);
+void codec2_open_mlfeat(struct CODEC2 *codec2_state, char *feat_filename,
+                        char *model_filename);
 void codec2_load_codebook(struct CODEC2 *codec2_state, int num, char *filename);
 float codec2_get_var(struct CODEC2 *codec2_state);
 float *codec2_enable_user_ratek(struct CODEC2 *codec2_state, int *K);
 
 // 700C post filter and equaliser
-void codec2_700c_post_filter(struct CODEC2 *codec2_state, int en);
-void codec2_700c_eq(struct CODEC2 *codec2_state, int en);
-      
-#endif
+void codec2_700c_post_filter(struct CODEC2 *codec2_state, bool en);
+void codec2_700c_eq(struct CODEC2 *codec2_state, bool en);
 
 #ifdef __cplusplus
 }
 #endif
 
+#endif