[xiph-commits] r11180 - trunk/speex/libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2006-04-20 08:17:34 -0700 (Thu, 20 Apr 2006)
New Revision: 11180

Modified:
   trunk/speex/libspeex/filters.c
Log:
this makes the _mem16 version of the filters use the _mem2 for floating point
(including SSE).


Modified: trunk/speex/libspeex/filters.c
===================================================================
--- trunk/speex/libspeex/filters.c	2006-04-20 15:09:09 UTC (rev 11179)
+++ trunk/speex/libspeex/filters.c	2006-04-20 15:17:34 UTC (rev 11180)
@@ -276,6 +276,7 @@
 #endif
 #endif
 
+#ifdef FIXED_POINT
 void filter_mem16(const spx_word16_t *x, const spx_coef_t *num, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
 {
    int i,j;
@@ -293,6 +294,12 @@
       y[i] = yi;
    }
 }
+#else
+void filter_mem16(const spx_word16_t *x, const spx_coef_t *num, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
+{
+   filter_mem2(x, num, den, y, N, ord, mem);
+}
+#endif
 
 
 #ifndef OVERRIDE_IIR_MEM2
@@ -340,7 +347,7 @@
 #endif
 #endif
 
-
+#ifdef FIXED_POINT
 void iir_mem16(const spx_word16_t *x, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
 {
    int i,j;
@@ -358,6 +365,12 @@
       y[i] = yi;
    }
 }
+#else
+void iir_mem16(const spx_word16_t *x, const spx_coef_t *den, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
+{
+   iir_mem2(x, den, y, N, ord, mem);
+}
+#endif
 
 
 #ifndef OVERRIDE_FIR_MEM2
@@ -404,6 +417,7 @@
 #endif
 #endif
 
+#ifdef FIXED_POINT
 void fir_mem16(const spx_word16_t *x, const spx_coef_t *num, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
 {
    int i,j;
@@ -421,13 +435,18 @@
       y[i] = yi;
    }
 }
+#else
+void fir_mem16(const spx_word16_t *x, const spx_coef_t *num, spx_word16_t *y, int N, int ord, spx_mem_t *mem)
+{
+   fir_mem2(x, num, y, N, ord, mem);
+}
+#endif
 
 
 
 
 
 
-
 void syn_percep_zero(const spx_sig_t *xx, const spx_coef_t *ak, const spx_coef_t *awk1, const spx_coef_t *awk2, spx_sig_t *y, int N, int ord, char *stack)
 {
    int i;