[xiph-commits] r10652 - in trunk/speex: . libspeex

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2005-12-19 03:20:02 -0800 (Mon, 19 Dec 2005)
New Revision: 10652

Modified:
   trunk/speex/configure.ac
   trunk/speex/libspeex/vorbis_psy.c
Log:
Add to build system, fix a segfault...



Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2005-12-19 10:54:42 UTC (rev 10651)
+++ trunk/speex/configure.ac	2005-12-19 11:20:02 UTC (rev 10652)
@@ -93,6 +93,11 @@
   AC_DEFINE([DISABLE_WIDEBAND], , [Disable wideband codec])
 fi])
 
+AC_ARG_ENABLE(vorbis-psy, [  --enable-vorbis-psy       Enable Vorbis-style psychoacoustics],
+[if test "$enableval" = yes; then
+  AC_DEFINE([VORBIS_PSYCHO], , [Enable Vorbis-style psychoacoustics])
+fi])
+
 AC_ARG_ENABLE(valgrind, [  --enable-valgrind       Enable valgrind extra checks],
 [if test "$enableval" = yes; then
   AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks])

Modified: trunk/speex/libspeex/vorbis_psy.c
===================================================================
--- trunk/speex/libspeex/vorbis_psy.c	2005-12-19 10:54:42 UTC (rev 10651)
+++ trunk/speex/libspeex/vorbis_psy.c	2005-12-19 11:20:02 UTC (rev 10652)
@@ -29,6 +29,10 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef VORBIS_PSYCHO
 
 #include "misc.h"
@@ -218,7 +222,7 @@
 			  float *logfreq, 
 			  float *logmask){
 
-  int i,n=p->n;
+  int i,n=p->n/2;
   float *work=alloca(n*sizeof(*work));
 
   bark_noise_hybridmp(n,p->bark,logfreq,logmask,