[xiph-cvs] cvs commit: speex/libspeex cb_search.c cb_search.h filters.c filters.h lsp.c lsp.h ltp.c ltp.h modes.h nb_celp.c nb_celp.h sb_celp.c sb_celp.h stack_alloc.h testenc_wb.c
Jean-Marc Valin
jm at xiph.org
Sat Oct 26 19:59:01 PDT 2002
jm 02/10/26 22:59:01
Modified: libspeex cb_search.c cb_search.h filters.c filters.h lsp.c
lsp.h ltp.c ltp.h modes.h nb_celp.c nb_celp.h
sb_celp.c sb_celp.h stack_alloc.h testenc_wb.c
Log:
The temp stack is now void* instead of float*
Revision Changes Path
1.78 +4 -4 speex/libspeex/cb_search.c
Index: cb_search.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cb_search.c 27 Oct 2002 02:36:20 -0000 1.77
+++ cb_search.c 27 Oct 2002 02:59:00 -0000 1.78
@@ -48,7 +48,7 @@
float *exc,
float *r,
SpeexBits *bits,
-float *stack,
+void *stack,
int complexity
)
{
@@ -309,7 +309,7 @@
void *par, /* non-overlapping codebook */
int nsf, /* number of samples in subframe */
SpeexBits *bits,
-float *stack
+void *stack
)
{
int i,j;
@@ -360,7 +360,7 @@
float *exc,
float *r,
SpeexBits *bits,
-float *stack,
+void *stack,
int complexity
)
{
@@ -381,7 +381,7 @@
void *par, /* non-overlapping codebook */
int nsf, /* number of samples in subframe */
SpeexBits *bits,
-float *stack
+void *stack
)
{
int i;
<p><p>1.26 +4 -4 speex/libspeex/cb_search.h
Index: cb_search.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cb_search.h 23 Oct 2002 16:35:37 -0000 1.25
+++ cb_search.h 27 Oct 2002 02:59:00 -0000 1.26
@@ -55,7 +55,7 @@
float *exc,
float *r,
SpeexBits *bits,
-float *stack,
+void *stack,
int complexity
);
@@ -64,7 +64,7 @@
void *par, /* non-overlapping codebook */
int nsf, /* number of samples in subframe */
SpeexBits *bits,
-float *stack
+void *stack
);
@@ -79,7 +79,7 @@
float *exc,
float *r,
SpeexBits *bits,
-float *stack,
+void *stack,
int complexity
);
@@ -89,7 +89,7 @@
void *par, /* non-overlapping codebook */
int nsf, /* number of samples in subframe */
SpeexBits *bits,
-float *stack
+void *stack
);
#endif
<p><p>1.29 +2 -2 speex/libspeex/filters.c
Index: filters.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/filters.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- filters.c 26 Oct 2002 19:16:16 -0000 1.28
+++ filters.c 27 Oct 2002 02:59:00 -0000 1.29
@@ -107,7 +107,7 @@
}
}
-void syn_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, float *stack)
+void syn_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, void *stack)
{
int i;
float *mem = PUSH(stack,ord, float);
@@ -119,7 +119,7 @@
iir_mem2(y, awk2, y, N, ord, mem);
}
-void residue_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, float *stack)
+void residue_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, void *stack)
{
int i;
float *mem = PUSH(stack,ord, float);
<p><p>1.20 +2 -2 speex/libspeex/filters.h
Index: filters.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/filters.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- filters.h 26 Oct 2002 19:16:16 -0000 1.19
+++ filters.h 27 Oct 2002 02:59:00 -0000 1.20
@@ -50,9 +50,9 @@
/* FIR filter */
void fir_decim_mem(float *x, float *a, float *y, int N, int M, float *mem);
-void syn_percep_zero(float *x, float *ak, float *awk1, float *awk2, float *y, int N, int ord, float *stack);
+void syn_percep_zero(float *x, float *ak, float *awk1, float *awk2, float *y, int N, int ord, void *stack);
-void residue_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, float *stack);
+void residue_percep_zero(float *xx, float *ak, float *awk1, float *awk2, float *y, int N, int ord, void *stack);
void comb_filter(
float *exc, /*decoded excitation*/
<p><p>1.17 +2 -2 speex/libspeex/lsp.c
Index: lsp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/lsp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lsp.c 26 Oct 2002 19:16:16 -0000 1.16
+++ lsp.c 27 Oct 2002 02:59:00 -0000 1.17
@@ -111,7 +111,7 @@
\*---------------------------------------------------------------------------*/
-int lpc_to_lsp (float *a,int lpcrdr,float *freq,int nb,float delta, float *stack)
+int lpc_to_lsp (float *a,int lpcrdr,float *freq,int nb,float delta, void *stack)
/* float *a lpc coefficients */
/* int lpcrdr order of LPC coefficients (10) */
/* float *freq LSP frequencies in the x domain */
@@ -247,7 +247,7 @@
\*---------------------------------------------------------------------------*/
-void lsp_to_lpc(float *freq,float *ak,int lpcrdr, float *stack)
+void lsp_to_lpc(float *freq,float *ak,int lpcrdr, void *stack)
/* float *freq array of LSP frequencies in the x domain */
/* float *ak array of LPC coefficients */
/* int lpcrdr order of LPC coefficients */
<p><p>1.7 +28 -28 speex/libspeex/lsp.h
Index: lsp.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/lsp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lsp.h 11 Oct 2002 03:39:34 -0000 1.6
+++ lsp.h 27 Oct 2002 02:59:00 -0000 1.7
@@ -16,39 +16,39 @@
\*---------------------------------------------------------------------------*/
/* Speex License:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __AK2LSPD__
#define __AK2LSPD__
-int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta, float *stack);
-void lsp_to_lpc(float *freq, float *ak, int lpcrdr, float *stack);
+int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta, void *stack);
+void lsp_to_lpc(float *freq, float *ak, int lpcrdr, void *stack);
/*Added by JMV*/
void lsp_enforce_margin(float *lsp, int len, float margin);
<p><p>1.63 +6 -6 speex/libspeex/ltp.c
Index: ltp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/ltp.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ltp.c 26 Oct 2002 19:16:16 -0000 1.62
+++ ltp.c 27 Oct 2002 02:59:00 -0000 1.63
@@ -68,7 +68,7 @@
*/
-void open_loop_nbest_pitch(float *sw, int start, int end, int len, int *pitch, float *gain, int N, float *stack)
+void open_loop_nbest_pitch(float *sw, int start, int end, int len, int *pitch, float *gain, int N, void *stack)
{
int i,j,k;
/*float corr=0;*/
@@ -152,7 +152,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int *cdbk_index
@@ -338,7 +338,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int complexity
@@ -414,7 +414,7 @@
int *pitch_val,
float *gain_val,
SpeexBits *bits,
-float *stack,
+void *stack,
int lost)
{
int i;
@@ -518,7 +518,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int complexity
@@ -545,7 +545,7 @@
int *pitch_val,
float *gain_val,
SpeexBits *bits,
-float *stack,
+void *stack,
int lost)
{
int i;
<p><p>1.29 +6 -6 speex/libspeex/ltp.h
Index: ltp.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/ltp.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ltp.h 23 Oct 2002 16:35:37 -0000 1.28
+++ ltp.h 27 Oct 2002 02:59:00 -0000 1.29
@@ -40,7 +40,7 @@
} ltp_params;
-void open_loop_nbest_pitch(float *sw, int start, int end, int len, int *pitch, float *gain, int N, float *stack);
+void open_loop_nbest_pitch(float *sw, int start, int end, int len, int *pitch, float *gain, int N, void *stack);
/** Finds the best quantized 3-tap pitch predictor by analysis by synthesis */
@@ -58,7 +58,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int complexity
@@ -75,7 +75,7 @@
int *pitch_val,
float *gain_val,
SpeexBits *bits,
-float *stack,
+void *stack,
int lost
);
@@ -90,7 +90,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int *cdbk_index
@@ -112,7 +112,7 @@
int p, /* Number of LPC coeffs */
int nsf, /* Number of samples in subframe */
SpeexBits *bits,
-float *stack,
+void *stack,
float *exc2,
float *r,
int complexity
@@ -129,5 +129,5 @@
int *pitch_val,
float *gain_val,
SpeexBits *bits,
-float *stack,
+void *stack,
int lost);
<p><p>1.37 +29 -29 speex/libspeex/modes.h
Index: modes.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/modes.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- modes.h 23 Oct 2002 16:35:37 -0000 1.36
+++ modes.h 27 Oct 2002 02:59:00 -0000 1.37
@@ -57,26 +57,26 @@
/** Long-term predictor quantization */
typedef int (*ltp_quant_func)(float *, float *, float *, float *,
float *, float *, void *, int, int, float,
- int, int, SpeexBits*, float *, float *, float *, int);
+ int, int, SpeexBits*, void *, float *, float *, int);
/** Long-term un-quantize */
typedef void (*ltp_unquant_func)(float *, int, int, float, void *, int, int *,
- float *, SpeexBits*, float*, int);
+ float *, SpeexBits*, void*, int);
/** Innovation quantization function */
typedef void (*innovation_quant_func)(float *, float *, float *, float *, void *, int, int,
- float *, float *, SpeexBits *, float *, int);
+ float *, float *, SpeexBits *, void *, int);
/** Innovation unquantization function */
-typedef void (*innovation_unquant_func)(float *, void *, int, SpeexBits*, float *);
+typedef void (*innovation_unquant_func)(float *, void *, int, SpeexBits*, void *);
/** Description of a Speex sub-mode (wither narrowband or wideband */
typedef struct SpeexSubmode {
- int lbr_pitch; /**< Set to -1 for "normal" modes, otherwise encode pitch using a global pitch and allowing a +- lbr_pitch variation (for low not-rates)*/
- int forced_pitch_gain; /**< Use the same (forced) pitch gain for all sub-frames */
+ int lbr_pitch; /**< Set to -1 for "normal" modes, otherwise encode pitch using a global pitch and allowing a +- lbr_pitch variation (for low not-rates)*/
+ int forced_pitch_gain; /**< Use the same (forced) pitch gain for all sub-frames */
int have_subframe_gain; /**< Number of bits to use as sub-frame innovation gain */
- int double_codebook; /**< Apply innovation quantization twice for higher quality (and higher bit-rate)*/
+ int double_codebook; /**< Apply innovation quantization twice for higher quality (and higher bit-rate)*/
/*LSP functions*/
lsp_quant_func lsp_quant; /**< LSP quantization function */
lsp_unquant_func lsp_unquant; /**< LSP unquantization function */
@@ -101,18 +101,18 @@
/** Struct defining the encoding/decoding mode*/
typedef struct SpeexNBMode {
- int frameSize; /**< Size of frames used for encoding */
- int subframeSize; /**< Size of sub-frames used for encoding */
- int lpcSize; /**< Order of LPC filter */
- int bufSize; /**< Size of signal buffer to use in encoder */
- int pitchStart; /**< Smallest pitch value allowed */
- int pitchEnd; /**< Largest pitch value allowed */
-
- float gamma1; /**< Perceptual filter parameter #1 */
- float gamma2; /**< Perceptual filter parameter #2 */
- float lag_factor; /**< Lag-windowing parameter */
- float lpc_floor; /**< Noise floor for LPC analysis */
- float preemph; /**< Pre-emphasis */
+ int frameSize; /**< Size of frames used for encoding */
+ int subframeSize; /**< Size of sub-frames used for encoding */
+ int lpcSize; /**< Order of LPC filter */
+ int bufSize; /**< Size of signal buffer to use in encoder */
+ int pitchStart; /**< Smallest pitch value allowed */
+ int pitchEnd; /**< Largest pitch value allowed */
+
+ float gamma1; /**< Perceptual filter parameter #1 */
+ float gamma2; /**< Perceptual filter parameter #2 */
+ float lag_factor; /**< Lag-windowing parameter */
+ float lpc_floor; /**< Noise floor for LPC analysis */
+ float preemph; /**< Pre-emphasis */
SpeexSubmode *submodes[NB_SUBMODES]; /**< Sub-mode data for the mode */
int defaultSubmode; /**< Default sub-mode to use when encoding */
@@ -122,16 +122,16 @@
/** Struct defining the encoding/decoding mode for SB-CELP (wideband) */
typedef struct SpeexSBMode {
- SpeexMode *nb_mode; /**< Embedded narrowband mode */
- int frameSize; /**< Size of frames used for encoding */
- int subframeSize; /**< Size of sub-frames used for encoding */
- int lpcSize; /**< Order of LPC filter */
- int bufSize; /**< Signal buffer size in encoder */
- float gamma1; /**< Perceptual filter parameter #1 */
- float gamma2; /**< Perceptual filter parameter #1 */
- float lag_factor; /**< Lag-windowing parameter */
- float lpc_floor; /**< Noise floor for LPC analysis */
- float preemph; /**< Pre-emphasis */
+ SpeexMode *nb_mode; /**< Embedded narrowband mode */
+ int frameSize; /**< Size of frames used for encoding */
+ int subframeSize; /**< Size of sub-frames used for encoding */
+ int lpcSize; /**< Order of LPC filter */
+ int bufSize; /**< Signal buffer size in encoder */
+ float gamma1; /**< Perceptual filter parameter #1 */
+ float gamma2; /**< Perceptual filter parameter #1 */
+ float lag_factor; /**< Lag-windowing parameter */
+ float lpc_floor; /**< Noise floor for LPC analysis */
+ float preemph; /**< Pre-emphasis */
SpeexSubmode *submodes[SB_SUBMODES]; /**< Sub-mode data for the mode */
int defaultSubmode; /**< Default sub-mode to use when encoding */
<p><p>1.72 +3 -3 speex/libspeex/nb_celp.c
Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- nb_celp.c 26 Oct 2002 19:16:16 -0000 1.71
+++ nb_celp.c 27 Oct 2002 02:59:00 -0000 1.72
@@ -220,7 +220,7 @@
float ol_gain;
float delta_qual=0;
float *res, *target, *mem;
- float *stack;
+ void *stack;
float *syn_resp;
st=state;
@@ -804,7 +804,7 @@
speex_free(state);
}
-static void nb_decode_lost(DecState *st, float *out, float *stack)
+static void nb_decode_lost(DecState *st, float *out, void *stack)
{
int i, sub;
float *awk1, *awk2, *awk3;
@@ -899,7 +899,7 @@
float best_pitch_gain=-1;
int wideband;
int m;
- float *stack;
+ void *stack;
float *awk1, *awk2, *awk3;
st=state;
stack=st->stack;
<p><p>1.32 +2 -2 speex/libspeex/nb_celp.h
Index: nb_celp.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nb_celp.h 23 Oct 2002 19:06:19 -0000 1.31
+++ nb_celp.h 27 Oct 2002 02:59:00 -0000 1.32
@@ -66,7 +66,7 @@
float preemph; /**< Pre-emphasis: P(z) = 1 - a*z^-1*/
float pre_mem; /**< 1-element memory for pre-emphasis */
float pre_mem2; /**< 1-element memory for pre-emphasis */
- float *stack; /**< Pseudo-stack allocation for temporary memory */
+ void *stack; /**< Pseudo-stack allocation for temporary memory */
float *inBuf; /**< Input buffer (original signal) */
float *frame; /**< Start of original frame */
float *excBuf; /**< Excitation buffer */
@@ -125,7 +125,7 @@
float gamma2; /**< Perceptual filter: A(z/gamma2) */
float preemph; /**< Pre-emphasis: P(z) = 1 - a*z^-1*/
float pre_mem; /**< 1-element memory for pre-emphasis */
- float *stack; /**< Pseudo-stack allocation for temporary memory */
+ void *stack; /**< Pseudo-stack allocation for temporary memory */
float *inBuf; /**< Input buffer (original signal) */
float *frame; /**< Start of original frame */
float *excBuf; /**< Excitation buffer */
<p><p>1.82 +3 -3 speex/libspeex/sb_celp.c
Index: sb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/sb_celp.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sb_celp.c 26 Oct 2002 19:16:16 -0000 1.81
+++ sb_celp.c 27 Oct 2002 02:59:00 -0000 1.82
@@ -265,7 +265,7 @@
{
SBEncState *st;
int i, roots, sub;
- float *stack;
+ void *stack;
float *mem, *innov, *syn_resp;
st = state;
@@ -675,7 +675,7 @@
speex_free(state);
}
-static void sb_decode_lost(SBDecState *st, float *out, float *stack)
+static void sb_decode_lost(SBDecState *st, float *out, void *stack)
{
int i;
for (i=0;i<st->frame_size;i++)
@@ -702,7 +702,7 @@
SBDecState *st;
int wideband;
int ret;
- float *stack;
+ void *stack;
st = state;
stack=st->stack;
<p><p>1.28 +2 -2 speex/libspeex/sb_celp.h
Index: sb_celp.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/sb_celp.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sb_celp.h 26 Oct 2002 02:58:36 -0000 1.27
+++ sb_celp.h 27 Oct 2002 02:59:00 -0000 1.28
@@ -57,7 +57,7 @@
float gamma1; /**< Perceptual weighting coef 1 */
float gamma2; /**< Perceptual weighting coef 2 */
- float *stack; /**< Temporary allocation stack */
+ void *stack; /**< Temporary allocation stack */
float *x0d, *x1d; /**< QMF filter signals*/
float *high; /**< High-band signal (buffer) */
float *y0, *y1; /**< QMF synthesis signals */
@@ -107,7 +107,7 @@
int lpcSize;
int first;
- float *stack;
+ void *stack;
float *x0d, *x1d;
float *high;
float *y0, *y1;
<p><p>1.9 +3 -3 speex/libspeex/stack_alloc.h
Index: stack_alloc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/stack_alloc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stack_alloc.h 27 Oct 2002 02:36:20 -0000 1.8
+++ stack_alloc.h 27 Oct 2002 02:59:00 -0000 1.9
@@ -35,12 +35,12 @@
#define STACK_ALLOC_H
/*Aligns the stack to a 'size' boundary */
-#define ALIGN(stack, size) (stack=(float*)((((int)stack)+((size)-1)) & (-(size))))
+#define ALIGN(stack, size) (stack=(void*)((((int)stack)+((size)-1)) & (-(size))))
/*Aligns the stack to a 'size' boundary minus k */
-#define ALIGN_1(stack, size, k) (stack=(float*)(((((int)stack)+((size)-1+(k))) & (-(size)))-(k)))
+#define ALIGN_1(stack, size, k) (stack=(void*)(((((int)stack)+((size)-1+(k))) & (-(size)))-(k)))
/* Allocates 'size' elements of type 'type' on the stack */
-#define PUSH(stack, size, type) (ALIGN(stack,sizeof(type)),stack=(float*)(((int)stack)+((size)*sizeof(type))),(type*)(((int)stack)-((size)*sizeof(type))))
+#define PUSH(stack, size, type) (ALIGN(stack,sizeof(type)),stack=(void*)(((int)stack)+((size)*sizeof(type))),(type*)(((int)stack)-((size)*sizeof(type))))
#endif
<p><p>1.30 +1 -0 speex/libspeex/testenc_wb.c
Index: testenc_wb.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/testenc_wb.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- testenc_wb.c 22 Aug 2002 21:17:29 -0000 1.29
+++ testenc_wb.c 27 Oct 2002 02:59:00 -0000 1.30
@@ -99,6 +99,7 @@
fprintf (stderr, "Total encoded size: %d bits\n", bitCount);
speex_encoder_destroy(st);
speex_decoder_destroy(dec);
+ speex_bits_destroy(&bits);
fclose(fin);
fclose(fout);
return 1;
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list