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

[jm at svn.xiph.org]

Author: jm
Date: 2007-10-30 06:31:44 -0700 (Tue, 30 Oct 2007)
New Revision: 14066

Modified:
   trunk/speex/libspeex/filters.c
   trunk/speex/libspeex/filters.h
   trunk/speex/libspeex/sb_celp.c
   trunk/speex/libspeex/sb_celp.h
Log:
Patch by Thom Johansen: change memory of qmf_synth to 16-bit.


Modified: trunk/speex/libspeex/filters.c
===================================================================
--- trunk/speex/libspeex/filters.c	2007-10-30 13:28:29 UTC (rev 14065)
+++ trunk/speex/libspeex/filters.c	2007-10-30 13:31:44 UTC (rev 14066)
@@ -474,7 +474,7 @@
 }
 
 /* Re-synthesised a signal from the QMF low-band and high-band signals */
-void qmf_synth(const spx_word16_t *x1, const spx_word16_t *x2, const spx_word16_t *a, spx_word16_t *y, int N, int M, spx_word32_t *mem1, spx_word32_t *mem2, char *stack)
+void qmf_synth(const spx_word16_t *x1, const spx_word16_t *x2, const spx_word16_t *a, spx_word16_t *y, int N, int M, spx_word16_t *mem1, spx_word16_t *mem2, char *stack)
    /* assumptions:
       all odd x[i] are zero -- well, actually they are left out of the array now
       N and M are multiples of 4 */

Modified: trunk/speex/libspeex/filters.h
===================================================================
--- trunk/speex/libspeex/filters.h	2007-10-30 13:28:29 UTC (rev 14065)
+++ trunk/speex/libspeex/filters.h	2007-10-30 13:31:44 UTC (rev 14066)
@@ -59,7 +59,7 @@
 
 
 void qmf_decomp(const spx_word16_t *xx, const spx_word16_t *aa, spx_word16_t *, spx_word16_t *y2, int N, int M, spx_word16_t *mem, char *stack);
-void qmf_synth(const spx_word16_t *x1, const spx_word16_t *x2, const spx_word16_t *a, spx_word16_t *y, int N, int M, spx_word32_t *mem1, spx_word32_t *mem2, char *stack);
+void qmf_synth(const spx_word16_t *x1, const spx_word16_t *x2, const spx_word16_t *a, spx_word16_t *y, int N, int M, spx_word16_t *mem1, spx_word16_t *mem2, char *stack);
 
 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, char *stack);
 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, char *stack);

Modified: trunk/speex/libspeex/sb_celp.c
===================================================================
--- trunk/speex/libspeex/sb_celp.c	2007-10-30 13:28:29 UTC (rev 14065)
+++ trunk/speex/libspeex/sb_celp.c	2007-10-30 13:31:44 UTC (rev 14066)
@@ -791,8 +791,8 @@
 
    st->first=1;
 
-   st->g0_mem = (spx_word32_t*)speex_alloc((QMF_ORDER)*sizeof(spx_word32_t));
-   st->g1_mem = (spx_word32_t*)speex_alloc((QMF_ORDER)*sizeof(spx_word32_t));
+   st->g0_mem = (spx_word16_t*)speex_alloc((QMF_ORDER)*sizeof(spx_word16_t));
+   st->g1_mem = (spx_word16_t*)speex_alloc((QMF_ORDER)*sizeof(spx_word16_t));
 
    st->excBuf = (spx_word16_t*)speex_alloc((st->subframeSize)*sizeof(spx_word16_t));
 

Modified: trunk/speex/libspeex/sb_celp.h
===================================================================
--- trunk/speex/libspeex/sb_celp.h	2007-10-30 13:28:29 UTC (rev 14065)
+++ trunk/speex/libspeex/sb_celp.h	2007-10-30 13:31:44 UTC (rev 14066)
@@ -109,7 +109,7 @@
    int    lpc_enh_enabled;
 
    char  *stack;
-   spx_word32_t *g0_mem, *g1_mem;
+   spx_word16_t *g0_mem, *g1_mem;
 
    spx_word16_t *excBuf;
    spx_lsp_t *old_qlsp;