Changeset 2992:ff4cbda31297 in roaraudio for include/libroardsp/libroardsp.h

Timestamp:

10/26/09 18:23:34 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

start with Speex Prep filter

File:

• include/libroardsp/libroardsp.h (modified) (5 diffs)

include/libroardsp/libroardsp.h

@@ -29 +29 @@
 
 __BEGIN_DECLS
+
+// enable Speex preprocessing and better type handling if speex > 1.1.8
+#ifdef ROAR_HAVE_LIBSPEEX
+#include <speex/speex.h>
+#ifdef _SPEEX_TYPES_H
+#include <speex/speex_preprocess.h>
+#endif
+#endif
 
 #include "midi.h"
@@ -74 +82 @@
 // filter CTLs:
 
-#define ROARDSP_FCTL_FREQ             1
+#define ROARDSP_FCTL_FREQ             1 /* float */
 #define ROARDSP_FCTL_TIME             2
 #define ROARDSP_FCTL_MUL              3
@@ -83 +91 @@
 #define ROARDSP_FCTL_Q                8
 #define ROARDSP_FCTL_MODE             9
-#define ROARDSP_FCTL_PACKET_SIZE     10
+#define ROARDSP_FCTL_PACKET_SIZE     10 /* size_t */
 
 // consts for filter flags:
@@ -155 +163 @@
 
 struct roardsp_speex_prep {
+#ifdef _SPEEX_TYPES_H
+ SpeexPreprocessState *preprocess;
+ int frame_size;
+#else
  char dummy[8];
+#endif
 };
 
@@ -229 +242 @@
 int roardsp_swap_reset  (struct roardsp_filter * filter, int what);
 
+#ifdef _SPEEX_TYPES_H
+int roardsp_speex_prep_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id);
+int roardsp_speex_prep_uninit (struct roardsp_filter * filter);
+int roardsp_speex_prep_ctl    (struct roardsp_filter * filter, int cmd, void * data);
+int roardsp_speex_prep_reset  (struct roardsp_filter * filter, int what);
+#endif
+
 // codecs:
 int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len);