[xiph-cvs] cvs commit: speex/libspeex cb_search.c stack_alloc.h

Jean-Marc Valin jm at xiph.org
Sat Oct 26 19:36:20 PDT 2002



jm          02/10/26 22:36:20

  Modified:    libspeex cb_search.c stack_alloc.h
  Log:
  ...

Revision  Changes    Path
1.77      +0 -14     speex/libspeex/cb_search.c

Index: cb_search.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/cb_search.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- cb_search.c	26 Oct 2002 19:16:16 -0000	1.76
+++ cb_search.c	27 Oct 2002 02:36:20 -0000	1.77
@@ -30,25 +30,11 @@
 */
 
 
-
 #include <stdlib.h>
 #include "cb_search.h"
 #include "filters.h"
-#include <math.h>
-#ifdef DEBUG
-#include <stdio.h>
-#endif
 #include "stack_alloc.h"
 #include "vq.h"
-
-#ifndef min
-# define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-# define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-
 
 
 void split_cb_search_shape_sign(

<p><p>1.8       +4 -0      speex/libspeex/stack_alloc.h

Index: stack_alloc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/stack_alloc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stack_alloc.h	26 Oct 2002 19:16:16 -0000	1.7
+++ stack_alloc.h	27 Oct 2002 02:36:20 -0000	1.8
@@ -34,8 +34,12 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
+/*Aligns the stack to a 'size' boundary */
 #define ALIGN(stack, size) (stack=(float*)((((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)))
 
+/* 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))))
 
 

<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