Changeset 2992:ff4cbda31297 in roaraudio

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

start with Speex Prep filter

Files:

• Makefile.inc (modified) (1 diff)
• include/libroardsp/libroardsp.h (modified) (5 diffs)
• libroardsp/Makefile (modified) (1 diff)
• libroardsp/filter.c (modified) (1 diff)

Makefile.inc

@@ -6 +6 @@
 
 # libroardsp:
-DSP_CODECLIBS   = $(lib_celt) $(lib_speex)
+DSP_CODECLIBS   = $(lib_celt) $(lib_speex) $(lib_speexdsp)
 DSP_AUXLIBS     = $(lib_samplerate)
 LIBROARDSP_NS   = $(DSP_CODECLIBS) $(DSP_AUXLIBS) $(LIBROAR) $(lib_m)

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);

libroardsp/Makefile

@@ -7 +7 @@
 OBJS=libroardsp.o convert.o midside.o poly.o filter.o filterchain.o remove.o transcode.o vio_transcode.o rms.o fader.o mixer.o amp.o
 OLDROAR=midi.o
-FILTER=filter_lowp.o filter_highp.o filter_amp.o filter_quantify.o filter_add.o filter_clip.o filter_downmix.o filter_dcblock.o filter_swap.o
+FILTER=filter_lowp.o filter_highp.o filter_amp.o filter_quantify.o filter_add.o filter_clip.o filter_downmix.o filter_dcblock.o filter_swap.o filter_speex_prep.o
 MIDI=synth.o
 CODECS=alaw.o mulaw.o

libroardsp/filter.c

@@ -54 +54 @@
  {ROARDSP_FILTER_SWAP, "Swap", roardsp_swap_init, roardsp_swap_uninit, roardsp_swap_ctl, roardsp_swap_reset, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, roardsp_swap_calc162, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
+ {ROARDSP_FILTER_SPEEX_PREP, "SpeexPrep", roardsp_speex_prep_init, roardsp_speex_prep_uninit,
+                                          roardsp_speex_prep_ctl,  roardsp_speex_prep_reset, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
  {-1, NULL, NULL, NULL, NULL, NULL, {
       // ?                  8Bit               16Bit              24Bit              32Bit