32kHz modes, coupled and uncoupled, managed and unmanagedv1.0.0rc4-internal

Monty

svn path=/trunk/vorbis/; revision=3467

16 files changed, 932 insertions, 96 deletions

diff --git a/examples/encoder_example.c b/examples/encoder_example.c
index d9937a34..3e19c65e 100644
--- a/examples/encoder_example.c
+++ b/examples/encoder_example.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.44 2002/07/01 21:56:46 xiphmont Exp $
+ last mod: $Id: encoder_example.c,v 1.45 2002/07/02 04:25:15 xiphmont Exp $
 
  ********************************************************************/
 
@@ -97,8 +97,8 @@ int main(){
   /* (quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR) */
   vorbis_info_init(&vi);
   
-  vorbis_encode_init(&vi,2,44100,-1,320000,-1);
-  //vorbis_encode_init_vbr(&vi,2,44100,.3);
+  vorbis_encode_init(&vi,2,32000,-1,48000,-1);
+  //vorbis_encode_init_vbr(&vi,2,32000,1.);
 
   //vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1);
   //vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL);
diff --git a/lib/bitrate.c b/lib/bitrate.c
index cb1b19b9..39659858 100644
--- a/lib/bitrate.c
+++ b/lib/bitrate.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: bitrate tracking and management
- last mod: $Id: bitrate.c,v 1.16 2002/07/01 21:56:46 xiphmont Exp $
+ last mod: $Id: bitrate.c,v 1.17 2002/07/02 04:25:16 xiphmont Exp $
 
  ********************************************************************/
 
diff --git a/lib/books/coupled/res_books_44c.h b/lib/books/coupled/res_books_44c.h
index 2c12d86f..da977f06 100644
--- a/lib/books/coupled/res_books_44c.h
+++ b/lib/books/coupled/res_books_44c.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: res_books_44c.h,v 1.3 2002/07/01 11:20:13 xiphmont Exp $
+ last modified: $Id: res_books_44c.h,v 1.4 2002/07/02 04:25:18 xiphmont Exp $
 
  ********************************************************************/
 
diff --git a/lib/info.c b/lib/info.c
index 04f80389..d65e3cce 100644
--- a/lib/info.c
+++ b/lib/info.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.55 2002/06/30 08:31:00 xiphmont Exp $
+ last mod: $Id: info.c,v 1.56 2002/07/02 04:25:16 xiphmont Exp $
 
  ********************************************************************/
 
@@ -415,7 +415,7 @@ static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){
 }
 
 static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
-  char temp[]="Xiphophorus libVorbis I 20020630";
+  char temp[]="Xiphophorus libVorbis I 20020701";
   int bytes = strlen(temp);
 
   /* preamble */  
diff --git a/lib/modes/Makefile b/lib/modes/Makefile
new file mode 100644
index 00000000..7fca42f8
--- /dev/null
+++ b/lib/modes/Makefile
@@ -0,0 +1,202 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ../..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/libvorbis
+pkglibdir = $(libdir)/libvorbis
+pkgincludedir = $(includedir)/libvorbis
+
+top_builddir = ../..
+
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+AUTOMAKE = automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-unknown-linux-gnu
+host_triplet = powerpc-unknown-linux-gnu
+AS = @AS@
+CC = gcc-cvs
+CPP = gcc-cvs -E
+DEBUG = -g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES
+DLLTOOL = @DLLTOOL@
+ECHO = echo
+EXEEXT = 
+LIBS = -lm  -logg
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAKEINFO = makeinfo
+OBJDUMP = @OBJDUMP@
+OBJEXT = o
+OGG_CFLAGS = 
+OGG_LIBS =  -logg
+PACKAGE = libvorbis
+PROFILE = -pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT
+RANLIB = ranlib
+STRIP = strip
+VERSION = 1.0rc4
+VE_LIB_AGE = 1
+VE_LIB_CURRENT = 1
+VE_LIB_REVISION = 0
+VF_LIB_AGE = 0
+VF_LIB_CURRENT = 3
+VF_LIB_REVISION = 0
+V_LIB_AGE = 1
+V_LIB_CURRENT = 1
+V_LIB_REVISION = 0
+pthread_lib = -lpthread
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = floor_44.h  residue_44.h   setup_32.h  setup_44u.h psych_44.h  residue_44u.h  setup_44.h  setup_X.h
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/modes/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/modes
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/modes/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/modes/Makefile.am b/lib/modes/Makefile.am
index 36c96c0c..41483dba 100644
--- a/lib/modes/Makefile.am
+++ b/lib/modes/Makefile.am
@@ -2,4 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = floor_44.h psych_44.h residue_44.h setup_44.h
+EXTRA_DIST = floor_44.h  residue_44.h   setup_32.h  setup_44u.h psych_44.h  residue_44u.h  setup_44.h  setup_X.h
diff --git a/lib/modes/Makefile.in b/lib/modes/Makefile.in
new file mode 100644
index 00000000..c96b895c
--- /dev/null
+++ b/lib/modes/Makefile.in
@@ -0,0 +1,202 @@
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+DEBUG = @DEBUG@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PROFILE = @PROFILE@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VE_LIB_AGE = @VE_LIB_AGE@
+VE_LIB_CURRENT = @VE_LIB_CURRENT@
+VE_LIB_REVISION = @VE_LIB_REVISION@
+VF_LIB_AGE = @VF_LIB_AGE@
+VF_LIB_CURRENT = @VF_LIB_CURRENT@
+VF_LIB_REVISION = @VF_LIB_REVISION@
+V_LIB_AGE = @V_LIB_AGE@
+V_LIB_CURRENT = @V_LIB_CURRENT@
+V_LIB_REVISION = @V_LIB_REVISION@
+pthread_lib = @pthread_lib@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = floor_44.h  residue_44.h   setup_32.h  setup_44u.h psych_44.h  residue_44u.h  setup_44.h  setup_X.h
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/modes/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lib/modes
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign lib/modes/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/modes/psych_44.h b/lib/modes/psych_44.h
index f4313e8e..92cb7d2b 100644
--- a/lib/modes/psych_44.h
+++ b/lib/modes/psych_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: psych_44.h,v 1.21 2002/07/01 21:56:47 xiphmont Exp $
+ last mod: $Id: psych_44.h,v 1.22 2002/07/02 04:25:21 xiphmont Exp $
 
  ********************************************************************/
 
@@ -139,27 +139,26 @@ static vp_adjblock _vp_tonemask_adj_otherblock[11]={
 static noise3 _psy_noisebias_trans_low[2]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   /* 0 */
-  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 12, 16, 16, 30},
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8,  8, 10, 12, 20},
     {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2,  2,  2,  4,  8,  8, 15},
     {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
   /* 1 */
-  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 14, 20, 20, 30},
-    {-30,-30,-30,-30,-26,-20,-16, -8, -6, -6, -2,  2,  2,  4,  8,  8, 15},
-    {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
+  {{{-15,-15,-15,-15,-15,-12,-10, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  0,  0,  0,  2,  4,  10},
+    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -4, -4, -4,  -2}}},
 };
 static noise3 _psy_noisebias_long_low[2]={
     /*63     125     250     500      1k       2k      4k      8k     16k*/
   /* 0 */
   {{{-10,-10,-10,-10,-10, -4,  0,  0,  0,  6,  6,  6,  6, 10, 10, 10,  20},
-    {-20,-20,-20,-20,-20,-20,-10, -2,  0,  0,  0,  0,  0,  2,  4,  8,  15},
+    {-20,-20,-20,-20,-20,-20,-10, -2,  0,  0,  0,  0,  0,  2,  4,  6,  15},
     {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
   /* 1 */
-  {{{-10,-10,-10,-10,-10, -4,  0,  0,  0,  6,  6,  6,  6, 10, 10, 10,  20},
-    {-20,-20,-20,-20,-20,-20,-10, -2,  0,  0,  0,  0,  0,  2,  4,  8,  15},
+  {{{-10,-10,-10,-10,-10,-10, -8, -8,  0,  2,  4,  4,  5,  5,  5,  8,  10},
+    {-20,-20,-20,-20,-20,-20,-20,-10, -6, -2,  0,  0,  0,  0,  2,  4,  10},
     {-20,-20,-20,-20,-20,-20,-20,-10, -6, -6, -6, -6, -6, -4, -4, -4, -2}}},
 };
 
-
 static noise3 _psy_noisebias_trans[11]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   /* 0 */
@@ -188,7 +187,7 @@ static noise3 _psy_noisebias_trans[11]={
     {-34,-34,-34,-34,-30,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},
   /* 6 */
   {{{-24,-24,-24,-24,-20,-18,-14, -8, -1,  1,  1,  1,  2,  3,  3,  4,  7},
-    {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2,  2},
+    {-32,-32,-32,-32,-28,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2,  1},
     {-34,-34,-34,-34,-30,-26,-24,-18,-17,-15,-15,-15,-15,-13,-13,-12, -8}}},
   /* 7 */
   {{{-24,-24,-24,-24,-20,-18,-14, -8, -1,  1,  1,  1,  2,  3,  3,  4, 7},
@@ -236,7 +235,7 @@ static noise3 _psy_noisebias_long[11]={
     {-24,-24,-24,-24,-24,-24,-24,-18,-14,-12,-12,-12,-12,-10,-10, -9, -5}}},
   /* 6 */
   {{{-15,-15,-15,-15,-15,-15,-15,-10, -4,  1,  1,  1,  2,  3,  3,  4,  7},
-    {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2,  2},
+    {-24,-24,-24,-24,-24,-24,-24,-18,-14, -8, -6, -6, -6, -6, -4, -2,  1},
     {-26,-26,-26,-26,-26,-26,-26,-18,-16,-15,-15,-15,-15,-13,-13,-12, -8}}},
   /* 7 */
   {{{-15,-15,-15,-15,-15,-15,-15,-10, -4,  1,  1,  1,  2,  3,  3,  4,  7},
@@ -256,60 +255,10 @@ static noise3 _psy_noisebias_long[11]={
     {-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40}}},
 };
 
-#if 0
-static noise3 _psy_noisebias_impulse[11]={
-  /*  63     125     250     500      1k      2k      4k      8k     16k*/
-  /* 0 */
-  {{{-10,-10,-10,-10,-10,-4, 0,  0,  4,  8,  8,  8,  8, 14, 20, 20, 30},
-    {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -2,  2,  2,  4,  4,  5,  8},
-    {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
-  /* 1 */
-  {{{-12,-12,-12,-12,-12,-8,-6, -4,  0,  4,  4,  4,  4, 10, 12, 14, 20},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4,  0,  0,  0,  0,  0,  4},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8,-10,-10, -8, -8, -8, -6, -4}}},
-  /* 2 */
-  {{{-14,-14,-14,-14,-14,-10,-8, -6, -2,  2,  2,  2,  2,  8, 10, 10, 16},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4,  0,  0,  0,  0,  0,  4},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}},
-  /* 3 */
-  {{{-14,-14,-14,-14,-14,-10,-8, -6, -2,  2,  2,  2,  2,  6, 8, 8, 14},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -1, -1, -1, -1,  0,  3},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}},
-  /* 4 */
-  {{{-16,-16,-16,-16,-16,-12,-10, -6, -2,  0,  0,  0,  0,  4, 6, 6, 12},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -4, -1, -1, -1, -1,  0,  3},
-    {-30,-30,-30,-30,-26,-22,-20,-14,-10,-10,-10,-10,-10,-10,-10, -8, -4}}},
-  /* 5 */
-  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  0,  0,  0,  0,  4,  4,  6, 11},
-    {-32,-32,-32,-32,-28,-24,-22,-16,-12, -8, -6, -3, -3, -3, -2, -1,  2},
-    {-34,-34,-34,-34,-30,-26,-24,-18,-14,-12,-12,-12,-12,-12,-10, -9, -5}}},
-  /* 6 */
-  {{{-20,-20,-20,-20,-20,-18,-14,-10, -4,  0,  0,  0,  0,  4,  4,  6, 11},
-    {-34,-34,-34,-34,-30,-30,-24,-20,-14,-10, -6, -6, -6, -6, -3, -2,  2},
-    {-34,-34,-34,-34,-34,-30,-26,-20,-16,-15,-15,-15,-15,-15,-13,-12, -8}}},
-  /* 7 */
-  {{{-22,-22,-22,-22,-22,-20,-14,-10, -6,  0,  0,  0,  0,  4,  4,  6, 11},
-    {-34,-34,-34,-34,-30,-30,-30,-24,-16,-12,-10, -8, -8, -8, -7, -6, -2},
-    {-34,-34,-34,-34,-32,-32,-30,-24,-20,-19,-19,-19,-19,-19,-17,-16,-12}}},
-  /* 8 */
-  {{{-24,-24,-24,-24,-24,-22,-14,-10, -6, -1, -1, -1, -1,  3,  3,  5, 10},
-    {-34,-34,-34,-34,-30,-30,-30,-24,-18,-14,-12,-10,-10,-10, -9, -8, -4},
-    {-36,-36,-36,-36,-36,-34,-28,-24,-24,-24,-24,-24,-24,-24,-24,-20,-16}}},
-  /* 9 */
-  {{{-28,-28,-28,-28,-28,-28,-28,-20,-14, -8, -4, -4, -4, -4, -4, -2,  2},
-    {-36,-36,-36,-36,-34,-32,-32,-26,-20,-16,-16,-16,-16,-14,-12,-10, -7},
-    {-40,-40,-40,-40,-40,-40,-40,-32,-30,-30,-30,-30,-30,-30,-30,-24,-20}}},
-  /* 10 */
-  {{{-30,-30,-30,-30,-30,-26,-24,-24,-24,-20,-16,-16,-16,-16,-16,-14,-12},
-    {-40,-40,-40,-40,-40,-40,-40,-40,-35,-30,-30,-30,-30,-30,-30,-30,-20},
-    {-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40,-40}}},
-};
-#endif
-
 static noise3 _psy_noisebias_impulse[11]={
   /*  63     125     250     500      1k      2k      4k      8k     16k*/
   /* 0 */
-  {{{-10,-10,-10,-10,-10,-4,   0,  0,  4,  8,  8,  8,  8, 14, 20, 20, 30},
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  4,  8,  8,  8, 10, 12, 14, 20},
     {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -2,  2,  2,  2,  2,  3,  6},
     {-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -4, -2}}},
   /* 1 */
@@ -358,23 +307,23 @@ static noise3 _psy_noisebias_impulse[11]={
 static noise3 _psy_noisebias_padding[11]={
   /*  63     125     250     500      1k       2k      4k      8k     16k*/
   /* 0 */
-  {{{-10,-10,-10,-10,-10,-4, 0,  0,  4, -8,  8,  8,  8, 14, 20, 20, 30},
+  {{{-10,-10,-10,-10,-10, -4,  0,  0,  4,  8,  8,  8,  8, 10, 12, 14, 20},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -2,  2,  3,  6,  6,  8, 10},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4, -4, -4, -4, -4, -2,  0,  2}}},
   /* 1 */
-  {{{-12,-12,-12,-12,-12,-8,-6, -4,  0,  4,  4,  4,  4, 10, 12, 14, 20},
+  {{{-12,-12,-12,-12,-12, -8, -6, -4,  0,  4,  4,  4,  4, 10, 12, 14, 20},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4,  0,  0,  0,  2,  2,  4,  8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -6, -6, -6, -6, -4, -2,  0}}},
   /* 2 */
-  {{{-14,-14,-14,-14,-14,-10,-8, -6, -2,  2,  2,  2,  2,  8, 10, 10, 16},
+  {{{-14,-14,-14,-14,-14,-10, -8, -6, -2,  2,  2,  2,  2,  8, 10, 10, 16},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -4,  0,  0,  0,  2,  2,  4,  8},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}},
   /* 3 */
-  {{{-14,-14,-14,-14,-14,-10,-8, -6, -2,  2,  2,  2,  2,  6, 8, 8, 14},
+  {{{-14,-14,-14,-14,-14,-10, -8, -6, -2,  2,  2,  2,  2,  6,  8,  8, 14},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1,  0,  0,  2,  6},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}},
   /* 4 */
-  {{{-16,-16,-16,-16,-16,-12,-10, -6, -2,  0,  0,  0,  0,  4, 6, 6, 12},
+  {{{-16,-16,-16,-16,-16,-12,-10, -6, -2,  0,  0,  0,  0,  4,  6,  6, 12},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -6, -1, -1, -1, -1,  0,  2,  6},
     {-30,-30,-30,-30,-26,-22,-20,-14,-10, -8, -8, -8, -8, -8, -6, -4, -2}}},
   /* 5 */
diff --git a/lib/modes/residue_44.h b/lib/modes/residue_44.h
index ce4ba0f6..388008be 100644
--- a/lib/modes/residue_44.h
+++ b/lib/modes/residue_44.h
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: residue_44.h,v 1.13 2002/07/01 11:20:19 xiphmont Exp $
+ last mod: $Id: residue_44.h,v 1.14 2002/07/02 04:25:21 xiphmont Exp $
 
  ********************************************************************/
 
@@ -248,7 +248,6 @@ static vorbis_residue_template _res_44s_9[]={
    &_resbook_44s_9,&_resbook_44s_9}
 };
 
-
 static vorbis_mapping_template _mapres_template_44_stereo[]={
   { _map_nominal, _res_44s_0 }, /* 0 */
   { _map_nominal, _res_44s_1 }, /* 1 */
diff --git a/lib/modes/setup_32.h b/lib/modes/setup_32.h
new file mode 100644
index 00000000..6b6bdf9d
--- /dev/null
+++ b/lib/modes/setup_32.h
@@ -0,0 +1,246 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: toplevel settings for 32kHz
+ last mod: $Id: setup_32.h,v 1.1 2002/07/02 04:25:21 xiphmont Exp $
+
+ ********************************************************************/
+
+static double rate_mapping_32[11]={
+  28000.,35000.,45000.,56000.,60000.,
+  75000.,90000.,100000.,115000.,150000.,190000.,
+};
+
+static double rate_mapping_32_un[11]={
+  42000.,52000.,64000.,72000.,78000.,
+  86000.,92000.,110000.,120000.,140000.,190000.,
+};
+
+static double rate_mapping_32_low[2]={
+  18000.,28000.
+};
+
+static double rate_mapping_32_un_low[2]={
+  24000.,42000.,
+};
+
+static double _psy_lowpass_32_low[2]={
+  13.,13.,
+};
+static double _psy_lowpass_32[11]={
+  13.,13.,14.,15.,99.,99.,99.,99.,99.,99.,99.
+};
+
+ve_setup_data_template ve_setup_32_stereo={
+  10,
+  rate_mapping_32,
+  quality_mapping_44,
+  2,
+  26000,
+  40000,
+  
+  blocksize_short_44,
+  blocksize_long_44,
+
+  _psy_tone_masteratt_44,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_impulse,
+  _psy_noisebias_padding,
+  _psy_noisebias_trans,
+  _psy_noisebias_long,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44,_noise_start_long_44},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_32,
+
+  _psy_global_44,
+  _global_mapping_44,
+  _psy_stereo_modes_44,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44,
+  _floor_long_mapping_44,
+
+  _mapres_template_44_stereo
+};
+
+ve_setup_data_template ve_setup_32_uncoupled={
+  10,
+  rate_mapping_32_un,
+  quality_mapping_44,
+  -1,
+  26000,
+  40000,
+  
+  blocksize_short_44,
+  blocksize_long_44,
+
+  _psy_tone_masteratt_44,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_impulse,
+  _psy_noisebias_padding,
+  _psy_noisebias_trans,
+  _psy_noisebias_long,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44,_noise_start_long_44},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44_2,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_32,
+
+  _psy_global_44,
+  _global_mapping_44,
+  NULL,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44,
+  _floor_long_mapping_44,
+
+  _mapres_template_44_uncoupled
+};
+
+ve_setup_data_template ve_setup_32_stereo_low={
+  1,
+  rate_mapping_32_low,
+  quality_mapping_44_stereo_low,
+  2,
+  26000,
+  40000,
+  
+  blocksize_short_44_low,
+  blocksize_long_44_low,
+
+  _psy_tone_masteratt_44_low,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_long_low,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44_low,_noise_start_long_44_low},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_32_low,
+
+  _psy_global_44,
+  _global_mapping_44,
+  _psy_stereo_modes_44_low,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44_low,
+  _floor_long_mapping_44_low,
+
+  _mapres_template_44_stereo
+};
+
+
+ve_setup_data_template ve_setup_32_uncoupled_low={
+  1,
+  rate_mapping_32_un_low,
+  quality_mapping_44_stereo_low,
+  -1,
+  26000,
+  40000,
+  
+  blocksize_short_44_low,
+  blocksize_long_44_low,
+
+  _psy_tone_masteratt_44_low,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_long_low,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44_low,_noise_start_long_44_low},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44_2,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_32_low,
+
+  _psy_global_44,
+  _global_mapping_44,
+  NULL,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44_low,
+  _floor_long_mapping_44_low,
+
+  _mapres_template_44_uncoupled
+};
diff --git a/lib/modes/setup_X.h b/lib/modes/setup_X.h
new file mode 100644
index 00000000..42b1db7b
--- /dev/null
+++ b/lib/modes/setup_X.h
@@ -0,0 +1,226 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: catch-all toplevel settings for q modes only
+ last mod: $Id: setup_X.h,v 1.1 2002/07/02 04:25:21 xiphmont Exp $
+
+ ********************************************************************/
+
+static double rate_mapping_X[11]={
+  -1.,-1.,-1.,-1.,-1.,
+  -1.,-1.,-1.,-1.,-1.,-1.
+};
+
+ve_setup_data_template ve_setup_X_stereo={
+  10,
+  rate_mapping_X,
+  quality_mapping_44,
+  2,
+  4000,
+  200000,
+  
+  blocksize_short_44,
+  blocksize_long_44,
+
+  _psy_tone_masteratt_44,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_impulse,
+  _psy_noisebias_padding,
+  _psy_noisebias_trans,
+  _psy_noisebias_long,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44,_noise_start_long_44},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_44,
+
+  _psy_global_44,
+  _global_mapping_44,
+  _psy_stereo_modes_44,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44,
+  _floor_long_mapping_44,
+
+  _mapres_template_44_stereo
+};
+
+ve_setup_data_template ve_setup_X_uncoupled={
+  10,
+  rate_mapping_X,
+  quality_mapping_44,
+  -1,
+  4000,
+  200000,
+  
+  blocksize_short_44,
+  blocksize_long_44,
+
+  _psy_tone_masteratt_44,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_impulse,
+  _psy_noisebias_padding,
+  _psy_noisebias_trans,
+  _psy_noisebias_long,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44,_noise_start_long_44},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44_2,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_44,
+
+  _psy_global_44,
+  _global_mapping_44,
+  NULL,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44,
+  _floor_long_mapping_44,
+
+  _mapres_template_44_uncoupled
+};
+
+ve_setup_data_template ve_setup_X_stereo_low={
+  1,
+  rate_mapping_X,
+  quality_mapping_44_stereo_low,
+  2,
+  4000,
+  200000,
+  
+  blocksize_short_44_low,
+  blocksize_long_44_low,
+
+  _psy_tone_masteratt_44_low,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_long_low,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44_low,_noise_start_long_44_low},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_44_low,
+
+  _psy_global_44,
+  _global_mapping_44,
+  _psy_stereo_modes_44_low,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44_low,
+  _floor_long_mapping_44_low,
+
+  _mapres_template_44_stereo
+};
+
+
+ve_setup_data_template ve_setup_X_uncoupled_low={
+  1,
+  rate_mapping_X,
+  quality_mapping_44_stereo_low,
+  -1,
+  4000,
+  200000,
+  
+  blocksize_short_44_low,
+  blocksize_long_44_low,
+
+  _psy_tone_masteratt_44_low,
+  _psy_tone_0dB,
+  _psy_tone_suppress,
+
+  _vp_tonemask_adj_otherblock,
+  _vp_tonemask_adj_longblock,
+  _vp_tonemask_adj_otherblock,
+
+  _psy_noiseguards_44,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_trans_low,
+  _psy_noisebias_long_low,
+  _psy_noise_suppress,
+  
+  _psy_compand_44,
+  _psy_compand_short_mapping,
+  _psy_compand_long_mapping,
+
+  {_noise_start_short_44_low,_noise_start_long_44_low},
+  {_noise_part_short_44,_noise_part_long_44},
+  _noise_thresh_44_2,
+
+  _psy_ath_floater,
+  _psy_ath_abs,
+  
+  _psy_lowpass_44_low,
+
+  _psy_global_44,
+  _global_mapping_44,
+  NULL,
+
+  _floor_44_books,
+  _floor_44,
+  _floor_short_mapping_44_low,
+  _floor_long_mapping_44_low,
+
+  _mapres_template_44_uncoupled
+};
diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index 03973522..5bd9eb25 100644
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: simple programmatic interface for encoder mode setup
- last mod: $Id: vorbisenc.c,v 1.45 2002/07/01 21:56:46 xiphmont Exp $
+ last mod: $Id: vorbisenc.c,v 1.46 2002/07/02 04:25:16 xiphmont Exp $
 
  ********************************************************************/
 
@@ -142,12 +142,24 @@ typedef struct {
 
 #include "modes/setup_44.h"
 #include "modes/setup_44u.h"
+#include "modes/setup_32.h"
+#include "modes/setup_X.h"
 
 static ve_setup_data_template *setup_list[]={
   &ve_setup_44_stereo,
   &ve_setup_44_stereo_low,
   &ve_setup_44_uncoupled,
   &ve_setup_44_uncoupled_low,
+
+  &ve_setup_32_stereo,
+  &ve_setup_32_stereo_low,
+  &ve_setup_32_uncoupled,
+  &ve_setup_32_uncoupled_low,
+
+  &ve_setup_X_stereo,
+  &ve_setup_X_uncoupled,
+  &ve_setup_X_stereo_low,
+  &ve_setup_X_uncoupled_low,
   0
 };
 
diff --git a/vq/44c0.vqs b/vq/44c0.vqs
index 8cf58674..4e139480 100644
--- a/vq/44c0.vqs
+++ b/vq/44c0.vqs
@@ -33,9 +33,9 @@ haux _44c0_s_long.vqd 0,64,2
 :_p8_0 44c0_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c0_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c0_s/res_part9_pass0.vqd, 4, nonseq, 0 +- 169 338
-:_p9_1 44c0_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 
-:_p9_2 44c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
+:_p9_0 44c0_s/res_part9_pass0.vqd, 4, nonseq, 0 +- 221 442
+:_p9_1 44c0_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p9_2 44c0_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c0s_sm noninterleaved
@@ -66,9 +66,9 @@ haux _44c0_sm_long.vqd 0,64,2
 :_p8_0 44c0_sm/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c0_sm/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c4_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
-:_p9_1 44c4_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c4_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p9_0 44c0_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884
+:_p9_1 44c0_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p9_2 44c0_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 
diff --git a/vq/44c1.vqs b/vq/44c1.vqs
index ad959dd4..f35b4233 100644
--- a/vq/44c1.vqs
+++ b/vq/44c1.vqs
@@ -35,9 +35,9 @@ haux _44c1_s_long.vqd 0,64,2
 :_p8_0 44c1_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c1_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c1_s/res_part9_pass0.vqd, 4, nonseq, 0 +- 169 338
-:_p9_1 44c1_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 13 26 39 52 65 78 
-:_p9_2 44c1_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6
+:_p9_0 44c1_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
+:_p9_1 44c1_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p9_2 44c1_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c1s_sm noninterleaved
@@ -70,6 +70,6 @@ haux _44c1_sm_long.vqd 0,64,2
 :_p8_0 44c1_sm/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c1_sm/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c4_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
-:_p9_1 44c4_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c4_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p9_0 44c1_sm/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
+:_p9_1 44c1_sm/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p9_2 44c1_sm/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
diff --git a/vq/44c2.vqs b/vq/44c2.vqs
index ff3cbf0c..1a3800b9 100644
--- a/vq/44c2.vqs
+++ b/vq/44c2.vqs
@@ -35,9 +35,9 @@ haux _44c2_s_long.vqd 0,64,2
 :_p8_0 44c2_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c2_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c4_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
-:_p9_1 44c4_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
-:_p9_2 44c4_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p9_0 44c2_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 221 442 663 884 1105 1326
+:_p9_1 44c2_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 
+:_p9_2 44c2_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c2s_sm noninterleaved
diff --git a/vq/44c3.vqs b/vq/44c3.vqs
index 20542423..de535dd1 100644
--- a/vq/44c3.vqs
+++ b/vq/44c3.vqs
@@ -35,9 +35,9 @@ haux _44c3_s_long.vqd 0,64,2
 :_p8_0 44c3_s/res_part8_pass0.vqd, 2, nonseq cull, 0 +- 5 10 15 20 25 30
 :_p8_1 44c3_s/res_part8_pass1.vqd, 2, nonseq cull, 0 +- 1 2 
 
-:_p9_0 44c4_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 255 510 765 1020 1275 1530
-:_p9_1 44c4_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 119
-:_p9_2 44c4_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
+:_p9_0 44c3_s/res_part9_pass0.vqd, 2, nonseq, 0 +- 255 510 765 1020 1275 1530
+:_p9_1 44c3_s/res_part9_pass1.vqd, 2, nonseq, 0 +- 17 34 51 68 85 102 119
+:_p9_2 44c3_s/res_part9_pass2.vqd, 2, nonseq, 0 +- 1 2 3 4 5 6 7 8
 
 
 >_44c3s_sm noninterleaved