Changeset 3003:9d0935291fca in roaraudio for libroardsp

Timestamp:

10/27/09 13:07:18 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

run data thru preprep

File:

• libroardsp/filter_speex_prep.c (modified) (2 diffs)

libroardsp/filter_speex_prep.c

@@ -26 +26 @@
 
 #ifdef _SPEEX_TYPES_H
+
+#if defined(ROAR_HAVE_LIBSPEEX) && !defined(ROAR_HAVE_LIBSPEEXDSP)
+#define _SPEEX_API_OLD
+#elif defined(ROAR_HAVE_LIBSPEEX) && defined(ROAR_HAVE_LIBSPEEXDSP)
+#define _SPEEX_API_NEW
+#endif
+
 // TODO: check parameters we allready know:
 int roardsp_speex_prep_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id) {
@@ -58 +65 @@
 
 int roardsp_speex_prep_calc161(struct roardsp_filter * filter, void * data, size_t samples) {
+ struct roardsp_speex_prep * self = filter->inst;
+
+ if ( self->preprocess == NULL )
+  return -1;
+
+ if ( samples != self->frame_size )
+  return -1;
+
+#ifdef _SPEEX_API_OLD
+ speex_preprocess(self->preprocess, data, NULL);
+#elif defined(_SPEEX_API_NEW)
+ speex_preprocess_run(self->preprocess, data);
+#else
  return -1;
+#endif
+
+ return 0;
 }