[xiph-cvs] cvs commit: vorbis/lib lookup.c lookup.h lookup_data.h lookups.pl Makefile.in bitwise.c bitwise.h floor0.c lpc.c lpc.h lsp.c lsp.h psytune.c

Monty xiphmont at xiph.org
Tue Sep 26 15:31:53 PDT 2000



xiphmont    00/09/26 15:31:52

  Modified:    .        Tag: branch_postbeta2 configure
               lib      Tag: branch_postbeta2 Makefile.in bitwise.c
                        bitwise.h floor0.c lpc.c lpc.h lsp.c lsp.h
                        psytune.c
  Added:       lib      Tag: branch_postbeta2 lookup.c lookup.h
                        lookup_data.h lookups.pl
  Log:
  Lookup optimizations for vorbis_lsp_to_curve, also an integerized version.

Revision  Changes    Path
No                   revision

No                   revision

1.19.2.3  +68 -67    vorbis/configure

Index: configure
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -r1.19.2.2 -r1.19.2.3
--- configure	2000/08/31 08:59:58	1.19.2.2
+++ configure	2000/09/26 22:31:49	1.19.2.3
@@ -1094,16 +1094,17 @@
         case $host in 
         *86-*-linux*)
                 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
-		OPT="-O20 -ffast-math -D_REENTRANT -fsigned-char"
-		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char"
-		
+		OPT="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+#              	PROFILE="-Wall -W -pg -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+		PROFILE="-Wall -W -pg -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline -static"
+
                 # glibc < 2.1.3 has a serious FP bug in the math inline header
                 # that will cripple Vorbis.  Look to see if the magic FP stack
                 # clobber is missing in the mathinline header, thus indicating
                 # the buggy version
 
                 cat > conftest.$ac_ext <<EOF
-#line 1107 "configure"
+#line 1108 "configure"
 #include "confdefs.h"
 
                                 #define __LIBC_INTERNAL_MATH_INLINES 1
@@ -1123,7 +1124,7 @@
 
                 if test ${bad} = "maybe" ;then
                       cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1128 "configure"
 #include "confdefs.h"
 
                                         #define __LIBC_INTERNAL_MATH_INLINES 1
@@ -1179,12 +1180,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1183: checking for ANSI C header files" >&5
+echo "configure:1184: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1188 "configure"
+#line 1189 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1192,7 +1193,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1209,7 +1210,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1213 "configure"
+#line 1214 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1227,7 +1228,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1231 "configure"
+#line 1232 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1248,7 +1249,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
+#line 1253 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1259,7 +1260,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1288,7 +1289,7 @@
 #	pthread_lib="-lpthread"; AC_DEFINE(HAVE_LIBPTHREAD), :)
 # We no longer use config.h
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1292: checking for pthread_create in -lpthread" >&5
+echo "configure:1293: checking for pthread_create in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1296,7 +1297,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1300 "configure"
+#line 1301 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1307,7 +1308,7 @@
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1376,7 +1377,7 @@
 # behind the times on type madness
 
 echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-echo "configure:1380: checking for int16_t" >&5
+echo "configure:1381: checking for int16_t" >&5
 if eval "test \"`echo '$''{'has_int16_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1385,7 +1386,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
+#line 1390 "configure"
 #include "confdefs.h"
 
 #ifdef __BEOS__
@@ -1396,7 +1397,7 @@
 int main() {return 0;}
 
 EOF
-if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   has_int16_t=yes
 else
@@ -1413,7 +1414,7 @@
 echo "$ac_t""$has_int16_t" 1>&6
 
 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:1417: checking for int32_t" >&5
+echo "configure:1418: checking for int32_t" >&5
 if eval "test \"`echo '$''{'has_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1422,7 +1423,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1426 "configure"
+#line 1427 "configure"
 #include "confdefs.h"
 
 #ifdef __BEOS__
@@ -1433,7 +1434,7 @@
 int main() {return 0;}
 
 EOF
-if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   has_int32_t=yes
 else
@@ -1450,7 +1451,7 @@
 echo "$ac_t""$has_int32_t" 1>&6
 
 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:1454: checking for uint32_t" >&5
+echo "configure:1455: checking for uint32_t" >&5
 if eval "test \"`echo '$''{'has_uint32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1459,7 +1460,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1463 "configure"
+#line 1464 "configure"
 #include "confdefs.h"
 
 #ifdef __BEOS__
@@ -1470,7 +1471,7 @@
 int main() {return 0;}
 
 EOF
-if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   has_uint32_t=yes
 else
@@ -1487,7 +1488,7 @@
 echo "$ac_t""$has_uint32_t" 1>&6
 
 echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:1491: checking for u_int32_t" >&5
+echo "configure:1492: checking for u_int32_t" >&5
 if eval "test \"`echo '$''{'has_u_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1496,7 +1497,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1500 "configure"
+#line 1501 "configure"
 #include "confdefs.h"
 
 #ifdef __BEOS__
@@ -1507,7 +1508,7 @@
 int main() {return 0;}
 
 EOF
-if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   has_u_int32_t=yes
 else
@@ -1524,7 +1525,7 @@
 echo "$ac_t""$has_u_int32_t" 1>&6
 
 echo $ac_n "checking for int64_t""... $ac_c" 1>&6
-echo "configure:1528: checking for int64_t" >&5
+echo "configure:1529: checking for int64_t" >&5
 if eval "test \"`echo '$''{'has_int64_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1533,7 +1534,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1537 "configure"
+#line 1538 "configure"
 #include "confdefs.h"
 
 #ifdef __BEOS__
@@ -1544,7 +1545,7 @@
 int main() {return 0;}
 
 EOF
-if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   has_int64_t=yes
 else
@@ -1561,7 +1562,7 @@
 echo "$ac_t""$has_int64_t" 1>&6
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1565: checking size of short" >&5
+echo "configure:1566: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1569,7 +1570,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1573 "configure"
+#line 1574 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1580,7 +1581,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1600,7 +1601,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1604: checking size of int" >&5
+echo "configure:1605: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1608,7 +1609,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1612 "configure"
+#line 1613 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1619,7 +1620,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -1639,7 +1640,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1643: checking size of long" >&5
+echo "configure:1644: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1647,7 +1648,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1651 "configure"
+#line 1652 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1658,7 +1659,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -1678,7 +1679,7 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:1682: checking size of long long" >&5
+echo "configure:1683: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1686,7 +1687,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1691 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -1697,7 +1698,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -1779,17 +1780,17 @@
 # We no longer use config.h
 ac_safe=`echo "alloca.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for alloca.h""... $ac_c" 1>&6
-echo "configure:1783: checking for alloca.h" >&5
+echo "configure:1784: checking for alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1788 "configure"
+#line 1789 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1813,17 +1814,17 @@
 
 ac_safe=`echo "memory.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for memory.h""... $ac_c" 1>&6
-echo "configure:1817: checking for memory.h" >&5
+echo "configure:1818: checking for memory.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1822 "configure"
+#line 1823 "configure"
 #include "confdefs.h"
 #include <memory.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1847,12 +1848,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1851: checking for working const" >&5
+echo "configure:1852: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1856 "configure"
+#line 1857 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1901,7 +1902,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1922,12 +1923,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1926: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1927: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1931 "configure"
+#line 1932 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1936,7 +1937,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1957,12 +1958,12 @@
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1961: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1962: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1966 "configure"
+#line 1967 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -1970,7 +1971,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -1992,7 +1993,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1996: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1997: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2019,7 +2020,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2023: checking for 8-bit clean memcmp" >&5
+echo "configure:2024: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2027,7 +2028,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2031 "configure"
+#line 2032 "configure"
 #include "confdefs.h"
 
 main()
@@ -2037,7 +2038,7 @@
 }
 
 EOF
-if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2055,12 +2056,12 @@
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2059: checking return type of signal handlers" >&5
+echo "configure:2060: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2064 "configure"
+#line 2065 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2077,7 +2078,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2098,12 +2099,12 @@
 for ac_func in gettimeofday select strcspn strerror strspn sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2102: checking for $ac_func" >&5
+echo "configure:2103: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2107 "configure"
+#line 2108 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2126,7 +2127,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else

No                   revision

No                   revision

1.33.4.2  +4 -4      vorbis/lib/Makefile.in

Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.in,v
retrieving revision 1.33.4.1
retrieving revision 1.33.4.2
diff -u -r1.33.4.1 -r1.33.4.2
--- Makefile.in	2000/08/31 08:05:47	1.33.4.1
+++ Makefile.in	2000/09/26 22:31:50	1.33.4.2
@@ -1,5 +1,5 @@
 # vorbis makefile configured for use with gcc on any platform
-# $Id: Makefile.in,v 1.33.4.1 2000/08/31 08:05:47 xiphmont Exp $
+# $Id: Makefile.in,v 1.33.4.2 2000/09/26 22:31:50 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -31,7 +31,7 @@
                 ../include/vorbis/codebook.h \
                 bitwise.h envelope.h lpc.h lsp.h bookinternal.h misc.h\
                 psy.h smallft.h window.h scales.h os.h mdct.h registry.h\
-		masking.h sharedbook.h iir.h
+		masking.h sharedbook.h iir.h lookup_data.h lookup.h
 LFILES = 	framing.o mdct.o smallft.o block.o envelope.o window.o\
                 lsp.o lpc.o analysis.o synthesis.o psy.o info.o bitwise.o\
                 time0.o floor0.o res0.o mapping0.o registry.o\
@@ -75,7 +75,7 @@
         @./test_sharedbook
         @./test_codebook
 
-libvorbis.a: 	$(LFILES)	
+libvorbis.a: 	$(LFILES) 	
                 $(AR) -r libvorbis.a $(LFILES)
                 $(RANLIB) libvorbis.a
 
@@ -86,7 +86,7 @@
 psytune:	$(PSY_FILES)
                 $(CC) $(CFLAGS) $(LDFLAGS) $(PSY_FILES) -o $@ $(LIBS)
 
-$(LFILES): 	$(HFILES)
+$(LFILES): 	$(HFILES) lookup.c
 $(VF_LFILES): 	$(VF_HFILES)
 
 .c.o:

1.12.4.2  +1 -26     vorbis/lib/bitwise.c

Index: bitwise.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitwise.c,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -r1.12.4.1 -r1.12.4.2
--- bitwise.c	2000/09/02 05:19:24	1.12.4.1
+++ bitwise.c	2000/09/26 22:31:50	1.12.4.2
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: packing variable sized words into an octet stream
-  last mod: $Id: bitwise.c,v 1.12.4.1 2000/09/02 05:19:24 xiphmont Exp $
+  last mod: $Id: bitwise.c,v 1.12.4.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -126,21 +126,6 @@
   return((b->ptr[0]>>b->endbit)&1);
 }
 
-/* Read in bits without advancing the bitptr; bits <= 8 */
-/* we never return 'out of bits'; we'll handle it on _adv */
-long _oggpack_look_huff(oggpack_buffer *b,int bits){
-  unsigned long ret;
-  unsigned long m=mask[bits];
-  
-  bits+=b->endbit;
-  
-  ret=b->ptr[0]>>b->endbit;
-  if(bits>8){
-    ret|=b->ptr[1]<<(8-b->endbit);  
-  }
-  return(m&ret);
-}
-
 void _oggpack_adv(oggpack_buffer *b,int bits){
   bits+=b->endbit;
   b->ptr+=bits/8;
@@ -154,16 +139,6 @@
     b->ptr++;
     b->endbyte++;
   }
-}
-
-/* have to check for overflow now. return -1 on overflow */
-int _oggpack_adv_huff(oggpack_buffer *b,int bits){
-  if(b->endbyte+(b->endbit+bits-1)/8>=b->storage)return(-1);
-  bits+=b->endbit;
-  b->ptr+=bits/8;
-  b->endbyte+=bits/8;
-  b->endbit=bits&7;
-  return 0;
 }
 
 /* bits <= 32 */

1.6.4.2   +1 -3      vorbis/lib/bitwise.h

Index: bitwise.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/bitwise.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- bitwise.h	2000/09/02 05:19:24	1.6.4.1
+++ bitwise.h	2000/09/26 22:31:50	1.6.4.2
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: packing variable sized words into an octet stream
-  last mod: $Id: bitwise.h,v 1.6.4.1 2000/09/02 05:19:24 xiphmont Exp $
+  last mod: $Id: bitwise.h,v 1.6.4.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -27,10 +27,8 @@
 extern void  _oggpack_readinit(oggpack_buffer *b,unsigned char *buf,int bytes);
 extern void  _oggpack_write(oggpack_buffer *b,unsigned long value,int bits);
 extern long  _oggpack_look(oggpack_buffer *b,int bits);
-extern long  _oggpack_look_huff(oggpack_buffer *b,int bits);
 extern long  _oggpack_look1(oggpack_buffer *b);
 extern void  _oggpack_adv(oggpack_buffer *b,int bits);
-extern int   _oggpack_adv_huff(oggpack_buffer *b,int bits);
 extern void  _oggpack_adv1(oggpack_buffer *b);
 extern long  _oggpack_read(oggpack_buffer *b,int bits);
 extern long  _oggpack_read1(oggpack_buffer *b);

1.23.2.4  +13 -63    vorbis/lib/floor0.c

Index: floor0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor0.c,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -r1.23.2.3 -r1.23.2.4
--- floor0.c	2000/09/02 05:19:25	1.23.2.3
+++ floor0.c	2000/09/26 22:31:50	1.23.2.4
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.23.2.3 2000/09/02 05:19:25 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.23.2.4 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -160,13 +160,14 @@
      the encoder may do what it wishes in filling them.  They're
      necessary in some mapping combinations to keep the scale spacing
      accurate */
-  look->linearmap=malloc(look->n*sizeof(int));
+  look->linearmap=malloc((look->n+1)*sizeof(int));
   for(j=0;j<look->n;j++){
     int val=floor( toBARK((info->rate/2.)/look->n*j) 
                    *scale); /* bark numbers represent band edges */
     if(val>look->ln)val=look->ln; /* guard against the approximation */
     look->linearmap[j]=val;
   }
+  look->linearmap[j]=-1;
 
   look->lsp_look=malloc(look->ln*sizeof(float));
   for(j=0;j<look->ln;j++)
@@ -179,7 +180,7 @@
    not bottlenecked here anyway */
 
 float _curve_to_lpc(float *curve,float *lpc,
-		     vorbis_look_floor0 *l,long frameno){
+		     vorbis_look_floor0 *l){
   /* map the input curve to a bark-scale curve for encoding */
   
   int mapped=l->ln;
@@ -222,61 +223,11 @@
   for(i=bark+1;i<mapped;i++)
     work[i]=work[i-1];
   
-#if 0
-    { /******************/
-      FILE *of;
-      char buffer[80];
-      int i;
-
-      sprintf(buffer,"Fmask_%d.m",frameno);
-      of=fopen(buffer,"w");
-      for(i=0;i<mapped;i++)
-	fprintf(of,"%g\n",work[i]);
-      fclose(of);
-    }
-#endif
-
   return vorbis_lpc_from_curve(work,lpc,&(l->lpclook));
 }
 
 /* generate the whole freq response curve of an LSP IIR filter */
 
-void _lsp_to_curve(float *curve,float *lsp,float amp,
-			  vorbis_look_floor0 *l,char *name,long frameno){
-  /* l->m+1 must be less than l->ln, but guard in case we get a bad stream */
-  float *lcurve=alloca(sizeof(float)*l->ln);
-  int i;
-
-  if(amp==0){
-    memset(curve,0,sizeof(float)*l->n);
-    return;
-  }
-  vorbis_lsp_to_curve(lcurve,l->ln,lsp,l->m,amp,l->lsp_look);
-
-  for(i=0;i<l->n;i++)curve[i]=lcurve[l->linearmap[i]];
-
-}
-
-void s_lsp_to_curve(float *curve,float *lsp,float amp,
-                         vorbis_look_floor0 *l,char *name,long frameno,
-                         float ampdB){
-  /* l->m+1 must be less than l->ln, but guard in case we get a bad stream */
-  float *lcurve=alloca(sizeof(double)*l->ln);
-  int i;
-
-  if(amp==0){
-    memset(curve,0,sizeof(double)*l->n);
-    return;
-  }
-  vorbis_lsp_to_curve(lcurve,l->ln,lsp,l->m,amp,l->lsp_look);
-
-  for (i = 0; i < l->ln; i++)
-    lcurve[i] = fromdB(lcurve[i]-ampdB);
-  for(i=0;i<l->n;i++)curve[i]=lcurve[l->linearmap[i]];
-
-}
-
-static long seq=0;
 static int floor0_forward(vorbis_block *vb,vorbis_look_floor *i,
                     float *in,float *out){
   long j;
@@ -308,7 +259,7 @@
 
   /* use 'out' as temp storage */
   /* Convert our floor to a set of lpc coefficients */ 
-  amp=sqrt(_curve_to_lpc(work,out,look,seq));
+  amp=sqrt(_curve_to_lpc(work,out,look));
 
   /* amp is in the range (0. to ampdB].  Encode that range using
      ampbits bits */
@@ -374,7 +325,6 @@
         last=work[j];
       }
     }
-    _analysis_output("lsp",seq,out,look->m,0,0);
         
 #endif
 
@@ -383,12 +333,12 @@
 #endif
 
     /* take the coefficients back to a spectral envelope curve */
-    s_lsp_to_curve(out,work,amp,look,"Ffloor",seq++,info->ampdB);
+    vorbis_lsp_to_curve(out,look->linearmap,look->n,look->ln,
+			work,look->m,amp,info->ampdB);
     return(1);
   }
 
   memset(out,0,sizeof(float)*look->n);
-  seq++;
   return(0);
 }
 
@@ -402,22 +352,22 @@
     long maxval=(1<<info->ampbits)-1;
     float amp=(float)ampraw/maxval*info->ampdB;
     int booknum=_oggpack_read(&vb->opb,_ilog(info->numbooks));
+    float *lsp=alloca(sizeof(float)*look->m);
 
     if(booknum!=-1){
       codebook *b=vb->vd->fullbooks+info->books[booknum];
       float last=0.;
       
-      memset(out,0,sizeof(float)*look->m);    
-      
       for(j=0;j<look->m;j+=b->dim)
-	if(vorbis_book_decodevs(b,out+j,&vb->opb,1,-1)==-1)goto eop;
+	if(vorbis_book_decodevs(b,lsp+j,&vb->opb,1,-1)==-1)goto eop;
       for(j=0;j<look->m;){
-	for(k=0;k<b->dim;k++,j++)out[j]+=last;
-	last=out[j-1];
+	for(k=0;k<b->dim;k++,j++)lsp[j]+=last;
+	last=lsp[j-1];
       }
       
       /* take the coefficients back to a spectral envelope curve */
-      s_lsp_to_curve(out,out,amp,look,"",0,info->ampdB);
+      vorbis_lsp_to_curve(out,look->linearmap,look->n,look->ln,
+			  lsp,look->m,amp,info->ampdB);
       return(1);
     }
   }

1.25.2.2  +6 -1      vorbis/lib/lpc.c

Index: lpc.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lpc.c,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- lpc.c	2000/08/31 09:00:00	1.25.2.1
+++ lpc.c	2000/09/26 22:31:50	1.25.2.2
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: LPC low level routines
-  last mod: $Id: lpc.c,v 1.25.2.1 2000/08/31 09:00:00 xiphmont Exp $
+  last mod: $Id: lpc.c,v 1.25.2.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -193,3 +193,8 @@
     data[i]=work[o]=y;
   }
 }
+
+
+
+
+

1.13.2.2  +1 -2      vorbis/lib/lpc.h

Index: lpc.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lpc.h,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- lpc.h	2000/08/31 09:00:00	1.13.2.1
+++ lpc.h	2000/09/26 22:31:50	1.13.2.2
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: LPC low level routines
-  last mod: $Id: lpc.h,v 1.13.2.1 2000/08/31 09:00:00 xiphmont Exp $
+  last mod: $Id: lpc.h,v 1.13.2.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -40,6 +40,5 @@
 
 extern void vorbis_lpc_predict(float *coeff,float *prime,int m,
                                float *data,long n);
-
 
 #endif

1.9.2.4   +181 -18   vorbis/lib/lsp.c

Index: lsp.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lsp.c,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- lsp.c	2000/09/02 09:39:19	1.9.2.3
+++ lsp.c	2000/09/26 22:31:50	1.9.2.4
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: LSP (also called LSF) conversion routines
-  last mod: $Id: lsp.c,v 1.9.2.3 2000/09/02 09:39:19 xiphmont Exp $
+  last mod: $Id: lsp.c,v 1.9.2.4 2000/09/26 22:31:50 xiphmont Exp $
 
   The LSP generation code is taken (with minimal modification) from
   "On the Computation of the LSP Frequencies" by Joseph Rothweiler
@@ -38,24 +38,190 @@
 #include "lsp.h"
 #include "os.h"
 #include "misc.h"
+#include "lookup.h"
+#include "scales.h"
 
-void vorbis_lsp_to_curve(float *curve,int n,float *lsp,int m,float amp,
-			 float *w){
-  int i,j,k;
-  float *coslsp=alloca(m*sizeof(float));
-  for(i=0;i<m;i++)coslsp[i]=2*cos(lsp[i]);
-
-  for(k=0;k<n;k++){
-    double p=.5;
-    double q=.5;
+/* three possible LSP to f curve functions; the exact computation
+   (float), a lookup based float implementation, and an integer
+   implementation.  The float lookup is likely the optimal choice on
+   any machine with an FPU.  The integer implementation is *not* fixed
+   point (due to the need for a large dynamic range and thus a
+   seperately tracked exponent) and thus much more complex than the
+   relatively simple float implementations. It's mostly for future
+   work on a fully fixed point implementation for processors like the
+   ARM family. */
+
+/* undefine both for the 'old' but more precise implementation */
+#define  FLOAT_LOOKUP
+#undef   INT_LOOKUP
+
+#ifdef FLOAT_LOOKUP
+#include "lookup.c" /* catch this in the build system; we #include for
+                       compilers (like gcc) that can't inline across
+                       modules */
+
+/* side effect: changes *lsp to cosines of lsp */
+void vorbis_lsp_to_curve(float *curve,int *map,int n,int ln,float *lsp,int m,
+			    float amp,float ampoffset){
+  int i;
+  float wdel=M_PI/ln;
+  for(i=0;i<m;i++)lsp[i]=vorbis_coslook(lsp[i]);
+
+  i=0;
+  while(i<n){
+    int j,k=map[i];
+    int qexp;
+    float p=.7071067812;
+    float q=.7071067812;
+    float w=vorbis_coslook(wdel*k);
+
+    for(j=0;j<m;j+=2)    p *= lsp[j]-w;
+    for(j=1;j<m;j+=2)    q *= lsp[j]-w;
+
+    q=frexp(p*p*(1.+w)+q*q*(1.-w),&qexp);
+    q=vorbis_fromdBlook(amp*             
+			vorbis_invsqlook(q)*
+			vorbis_invsq2explook(qexp+m)- 
+			ampoffset);
+
+    curve[i++]=q;
+    while(map[i]==k)curve[i++]=q;
+  }
+}
+
+#else
+
+#ifdef INT_LOOKUP
+#include "lookup.c" /* catch this in the build system; we #include for
+                       compilers (like gcc) that can't inline across
+                       modules */
+
+static int MLOOP_1[64]={
+   0,10,11,11, 12,12,12,12, 13,13,13,13, 13,13,13,13,
+  14,14,14,14, 14,14,14,14, 14,14,14,14, 14,14,14,14,
+  15,15,15,15, 15,15,15,15, 15,15,15,15, 15,15,15,15,
+  15,15,15,15, 15,15,15,15, 15,15,15,15, 15,15,15,15,
+};
+
+static int MLOOP_2[64]={
+  0,4,5,5, 6,6,6,6, 7,7,7,7, 7,7,7,7,
+  8,8,8,8, 8,8,8,8, 8,8,8,8, 8,8,8,8,
+  9,9,9,9, 9,9,9,9, 9,9,9,9, 9,9,9,9,
+  9,9,9,9, 9,9,9,9, 9,9,9,9, 9,9,9,9,
+};
+
+static int MLOOP_3[8]={0,1,2,2,3,3,3,3};
+
+
+/* side effect: changes *lsp to cosines of lsp */
+void vorbis_lsp_to_curve(float *curve,int *map,int n,int ln,float *lsp,int m,
+			    float amp,float ampoffset){
+
+  /* 0 <= m < 256 */
+
+  /* set up for using all int later */
+  int i;
+  int ampoffseti=rint(ampoffset*4096.);
+  int ampi=rint(amp*16.);
+  long *ilsp=alloca(m*sizeof(long));
+  for(i=0;i<m;i++)ilsp[i]=vorbis_coslook_i(lsp[i]/M_PI*65536.+.5);
+
+  i=0;
+  while(i<n){
+    int j,k=map[i];
+    unsigned long pi=46341; /* 2**-.5 in 0.16 */
+    unsigned long qi=46341;
+    int qexp=0,shift;
+    long wi=vorbis_coslook_i(k*65536/ln);
+
+    pi*=labs(ilsp[0]-wi);
+    qi*=labs(ilsp[1]-wi);
+
+    for(j=2;j<m;j+=2){
+      if(!(shift=MLOOP_1[(pi|qi)>>25]))
+	if(!(shift=MLOOP_2[(pi|qi)>>19]))
+	  shift=MLOOP_3[(pi|qi)>>16];
+      pi=(pi>>shift)*labs(ilsp[j]-wi);
+      qi=(qi>>shift)*labs(ilsp[j+1]-wi);
+      qexp+=shift;
+    }
+    if(!(shift=MLOOP_1[(pi|qi)>>25]))
+      if(!(shift=MLOOP_2[(pi|qi)>>19]))
+	shift=MLOOP_3[(pi|qi)>>16];
+    pi>>=shift;
+    qi>>=shift;
+    qexp+=shift-7*m;
+
+    /* pi,qi normalized collectively, both tracked using qexp */
+
+    /* p*=p(1-w), q*=q(1+w), let normalization drift because it isn't
+       worth tracking step by step */
+
+    pi=((pi*pi)>>16);
+    qi=((qi*qi)>>16);
+    qexp=qexp*2+m;
+
+    qi*=(1<<14)-wi;
+    pi*=(1<<14)+wi;
+    
+    qi=(qi+pi)>>14;
+
+    /* we've let the normalization drift because it wasn't important;
+       however, for the lookup, things must be normalized again.  We
+       need at most one right shift or a number of left shifts */
+
+    if(qi&0xffff0000){ /* checks for 1.xxxxxxxxxxxxxxxx */
+      qi>>=1; qexp++; 
+    }else
+      while(qi && !(qi&0x8000)){ /* checks for 0.0xxxxxxxxxxxxxxx or less*/
+	qi<<=1; qexp--; 
+      }
+
+    amp=vorbis_fromdBlook_i(ampi*                     /*  n.4         */
+			    vorbis_invsqlook_i(qi,qexp)- 
+			                              /*  m.8, m+n<=8 */
+			    ampoffseti);              /*  8.12[0]     */
+
+    curve[i]=amp;
+    while(map[++i]==k)curve[i]=amp;
+  }
+}
+
+#else 
+
+/* old, nonoptimized but simple version for any poor sap who needs to
+   figure out what the hell this code does, or wants the other tiny
+   fraction of a dB precision */
+
+/* side effect: changes *lsp to cosines of lsp */
+void vorbis_lsp_to_curve(float *curve,int *map,int n,int ln,float *lsp,int m,
+			    float amp,float ampoffset){
+  int i;
+  float wdel=M_PI/ln;
+  for(i=0;i<m;i++)lsp[i]=2*cos(lsp[i]);
+
+  i=0;
+  while(i<n){
+    int j,k=map[i];
+    float p=.5;
+    float q=.5;
+    float w=2*cos(wdel*k);
     for(j=0;j<m;j+=2){
-      p*= w[k]-coslsp[j];
-      q*= w[k]-coslsp[j+1];
+      p *= w-lsp[j];
+      q *= w-lsp[j+1];
     }
-    curve[k]=amp/sqrt(p*p*(2.+ w[k])+q*q*(2.- w[k]));
+    p*=p*(2.+w);
+    q*=q*(2.-w);
+    q=fromdB(amp/sqrt(p+q)-ampoffset);
+
+    curve[i]=q;
+    while(map[++i]==k)curve[i]=q;
   }
 }
 
+#endif
+#endif
+
 static void cheby(float *g, int ord) {
   int i, j;
 
@@ -76,13 +242,10 @@
 }
 
 /* CACM algorithm 283. */
-/* we require doubles here due to the huge spread between val/p and
-   the required max error of 1.e-12, which is beyond the capabilities
-   of floats */
 static void cacm283(float *a,int ord,float *r){
   int i, k;
-  double val, p, delta, error;
-  double rooti;
+  float val, p, delta, error;
+  float rooti;
 
   for(i=0; i<ord;i++) r[i] = 2.0 * (i+0.5) / ord - 1.0;
   

1.4.2.2   +5 -4      vorbis/lib/lsp.h

Index: lsp.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/lsp.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- lsp.h	2000/08/31 09:00:00	1.4.2.1
+++ lsp.h	2000/09/26 22:31:50	1.4.2.2
@@ -12,7 +12,7 @@
  ********************************************************************
 
   function: LSP (also called LSF) conversion routines
-  last mod: $Id: lsp.h,v 1.4.2.1 2000/08/31 09:00:00 xiphmont Exp $
+  last mod: $Id: lsp.h,v 1.4.2.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -21,8 +21,9 @@
 #define _V_LSP_H_
 
 extern void vorbis_lpc_to_lsp(float *lpc,float *lsp,int m);
-extern void vorbis_lsp_to_curve(float *curve,int n,
-				float *lsp,int m,float amp,
-				float *w);
+
+extern void vorbis_lsp_to_curve(float *curve,int *map,int n,int ln,
+				float *lsp,int m,
+				float amp,float ampoffset);
   
 #endif

1.6.2.2   +2 -13     vorbis/lib/psytune.c

Index: psytune.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psytune.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- psytune.c	2000/08/31 09:00:01	1.6.2.1
+++ psytune.c	2000/09/26 22:31:50	1.6.2.2
@@ -13,7 +13,7 @@
 
  function: simple utility that runs audio through the psychoacoustics
            without encoding
- last mod: $Id: psytune.c,v 1.6.2.1 2000/08/31 09:00:01 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.6.2.2 2000/09/26 22:31:50 xiphmont Exp $
 
  ********************************************************************/
 
@@ -150,10 +150,6 @@
   lpc_lookup lpclook;
 } vorbis_look_floor0;
 
-extern float _curve_to_lpc(float *curve,float *lpc,vorbis_look_floor0 *l,
-			    long frameno);
-extern void _lsp_to_curve(float *curve,float *lpc,float amp,
-			  vorbis_look_floor0 *l,char *name,long frameno);
 
 long frameno=0;
 
@@ -295,16 +291,9 @@
 
         _vp_compute_mask(&p_look,pcm[i],floor,decay[i]);
         
-	analysis("prefloor",frameno,floor,framesize/2,1,1);
+	analysis("floor",frameno,floor,framesize/2,1,1);
         analysis("decay",frameno,decay[i],framesize/2,1,1);
         
-	for(j=0;j<framesize/2;j++)floor[j]=todB(floor[j])+150;
-	amp=_curve_to_lpc(floor,lpc,&floorlook,frameno);
-	vorbis_lpc_to_lsp(lpc,lpc,order);
-	_lsp_to_curve(floor,lpc,sqrt(amp),&floorlook,"Ffloor",frameno);
-	for(j=0;j<framesize/2;j++)floor[j]=fromdB(floor[j]-150);
-	analysis("floor",frameno,floor,framesize/2,1,1);
-
         _vp_apply_floor(&p_look,pcm[i],floor);
         /*r(j=0;j<framesize/2;j++)
           if(fabs(pcm[i][j])<1.)pcm[i][j]=0;*/

No                   revision

No                   revision

1.1.2.1   +92 -0     vorbis/lib/Attic/lookup.c

1.1.2.1   +33 -0     vorbis/lib/Attic/lookup.h

1.1.2.1   +190 -0    vorbis/lib/Attic/lookup_data.h

1.1.2.1   +143 -0    vorbis/lib/Attic/lookups.pl

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