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

[Jean-Marc Valin]

jm          03/06/12 23:59:46

  Modified:    libspeex hexc_table.c nb_celp.c stack_alloc.h
  Log:
  minor stuff...

Revision  Changes    Path
1.12      +1 -1      speex/libspeex/hexc_table.c

Index: hexc_table.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/hexc_table.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hexc_table.c	3 Jun 2003 21:21:56 -0000	1.11
+++ hexc_table.c	13 Jun 2003 03:59:46 -0000	1.12
@@ -52,7 +52,7 @@
 -1, 6, -25, 14, -22, -20, 47, -11, 
 16, 2, 38, -23, -19, -30, -9, 40, 
 -11, 5, 4, -6, 8, 26, -21, -11, 
-131, 4, 1, 6, -9, 2, -7, -2, 
+127, 4, 1, 6, -9, 2, -7, -2, 
 -3, 7, -5, 10, -19, 7, -106, 91, 
 -3, 9, -4, 21, -8, 26, -80, 8, 
 1, -2, -10, -17, -17, -27, 32, 71, 

<p><p>1.119     +1 -1      speex/libspeex/nb_celp.c

Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- nb_celp.c	30 May 2003 19:44:54 -0000	1.118
+++ nb_celp.c	13 Jun 2003 03:59:46 -0000	1.119
@@ -1192,7 +1192,7 @@
                wideband = speex_bits_unpack_unsigned(bits, 1);
                if (wideband)
                {
-                  speex_warning ("More than to wideband layers found: corrupted stream?");
+                  speex_warning ("More than two wideband layers found: corrupted stream?");
                   return -2;
                }
 

<p><p>1.12      +1 -16     speex/libspeex/stack_alloc.h

Index: stack_alloc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/stack_alloc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stack_alloc.h	6 Jan 2003 06:53:02 -0000	1.11
+++ stack_alloc.h	13 Jun 2003 03:59:46 -0000	1.12
@@ -34,21 +34,8 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
-#if 0
-
-/*Aligns the stack to a 'size' boundary */
-#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=(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=(void*)(((int)stack)+((size)*sizeof(type))),(type*)(((int)stack)-((size)*sizeof(type))))
-
-
-#else
-
 /*Aligns the stack to a 'size' boundary */
-#define ALIGN(stack, size) ((stack) += ((size) - (int)(stack)) & ((size) - 1))
+#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
 
 /* Allocates 'size' elements of type 'type' on the stack */
 #define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
@@ -56,7 +43,5 @@
 /* Allocates a struct stack */
 #define PUSHS(stack, type) (ALIGN((stack),sizeof(long)),(stack)+=(sizeof(type)),(type*)((stack)-(sizeof(type))))
 
-
-#endif
 
 #endif

<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.