Changeset 2992:ff4cbda31297 in roaraudio
- Timestamp:
- 10/26/09 18:23:34 (15 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.inc
r2386 r2992 6 6 7 7 # libroardsp: 8 DSP_CODECLIBS = $(lib_celt) $(lib_speex) 8 DSP_CODECLIBS = $(lib_celt) $(lib_speex) $(lib_speexdsp) 9 9 DSP_AUXLIBS = $(lib_samplerate) 10 10 LIBROARDSP_NS = $(DSP_CODECLIBS) $(DSP_AUXLIBS) $(LIBROAR) $(lib_m) -
include/libroardsp/libroardsp.h
r2989 r2992 29 29 30 30 __BEGIN_DECLS 31 32 // enable Speex preprocessing and better type handling if speex > 1.1.8 33 #ifdef ROAR_HAVE_LIBSPEEX 34 #include <speex/speex.h> 35 #ifdef _SPEEX_TYPES_H 36 #include <speex/speex_preprocess.h> 37 #endif 38 #endif 31 39 32 40 #include "midi.h" … … 74 82 // filter CTLs: 75 83 76 #define ROARDSP_FCTL_FREQ 1 84 #define ROARDSP_FCTL_FREQ 1 /* float */ 77 85 #define ROARDSP_FCTL_TIME 2 78 86 #define ROARDSP_FCTL_MUL 3 … … 83 91 #define ROARDSP_FCTL_Q 8 84 92 #define ROARDSP_FCTL_MODE 9 85 #define ROARDSP_FCTL_PACKET_SIZE 10 93 #define ROARDSP_FCTL_PACKET_SIZE 10 /* size_t */ 86 94 87 95 // consts for filter flags: … … 155 163 156 164 struct roardsp_speex_prep { 165 #ifdef _SPEEX_TYPES_H 166 SpeexPreprocessState *preprocess; 167 int frame_size; 168 #else 157 169 char dummy[8]; 170 #endif 158 171 }; 159 172 … … 229 242 int roardsp_swap_reset (struct roardsp_filter * filter, int what); 230 243 244 #ifdef _SPEEX_TYPES_H 245 int roardsp_speex_prep_init (struct roardsp_filter * filter, struct roar_stream * stream, int id); 246 int roardsp_speex_prep_uninit (struct roardsp_filter * filter); 247 int roardsp_speex_prep_ctl (struct roardsp_filter * filter, int cmd, void * data); 248 int roardsp_speex_prep_reset (struct roardsp_filter * filter, int what); 249 #endif 250 231 251 // codecs: 232 252 int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len); -
libroardsp/Makefile
r2935 r2992 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 8 8 OLDROAR=midi.o 9 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 9 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 10 10 MIDI=synth.o 11 11 CODECS=alaw.o mulaw.o -
libroardsp/filter.c
r2990 r2992 54 54 {ROARDSP_FILTER_SWAP, "Swap", roardsp_swap_init, roardsp_swap_uninit, roardsp_swap_ctl, roardsp_swap_reset, { 55 55 {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, roardsp_swap_calc162, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}}, 56 {ROARDSP_FILTER_SPEEX_PREP, "SpeexPrep", roardsp_speex_prep_init, roardsp_speex_prep_uninit, 57 roardsp_speex_prep_ctl, roardsp_speex_prep_reset, { 58 {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}}, 56 59 {-1, NULL, NULL, NULL, NULL, NULL, { 57 60 // ? 8Bit 16Bit 24Bit 32Bit
Note: See TracChangeset
for help on using the changeset viewer.