First merge of new psychoacoustics. Have some unused codebooks to

remove yet, but we're otherwise OK.

Tuning still has a little ways to go, but it's not too bad.

Monty

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

Makefile.in

@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.5 2000/02/12 08:32:57 xiphmont Exp $
+# $Id: Makefile.in,v 1.6 2000/05/08 20:49:14 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -17,7 +17,7 @@
 
 @SET_MAKE@
 
-SUBDIRS =	lib vq huff examples # cmdline xmms
+SUBDIRS =	lib examples # cmdline xmms vq huff 
 
 all debug profile selftest target clean:
 	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $(MFLAGS) $@) || exit 1; done

examples/Makefile.in

@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.6 2000/04/03 09:51:07 xiphmont Exp $
+# $Id: Makefile.in,v 1.7 2000/05/08 20:49:42 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -50,21 +50,21 @@ encoder_example.o:	../include/vorbis/modes.h
 
 encoder_example:	$(OFILES) ../lib/libvorbis.a
 	$(CC) $(CFLAGS) $(LDFLAGS) encoder_example.o ../lib/libvorbis.a -o \
-			encoder_example -lm
+			encoder_example $(LIBS)
 
 decoder_example:	$(OFILES) ../lib/libvorbis.a
 	$(CC) $(CFLAGS) $(LDFLAGS) decoder_example.o ../lib/libvorbis.a -o \
-			decoder_example -lm
+			decoder_example $(LIBS)
 
 chaining_example:	$(OFILES) ../lib/libvorbis.a ../lib/vorbisfile.a
 	$(CC) $(CFLAGS) $(LDFLAGS) chaining_example.o \
 			../lib/vorbisfile.a ../lib/libvorbis.a \
-			-o chaining_example -lm
+			-o chaining_example $(LIBS)
 
 seeking_test:	$(OFILES) ../lib/libvorbis.a ../lib/vorbisfile.a
 	$(CC) $(CFLAGS) $(LDFLAGS) seeking_test.o \
 			../lib/vorbisfile.a ../lib/libvorbis.a \
-			-o seeking_test -lm
+			-o seeking_test $(LIBS)
 
 $(OFILES): 	$(HFILES)
 

examples/seeking_example.c

@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: illustrate seeking, and test it too
- last mod: $Id: seeking_example.c,v 1.1 2000/04/03 09:51:07 xiphmont Exp $
+ last mod: $Id: seeking_example.c,v 1.2 2000/05/08 20:49:42 xiphmont Exp $
 
  ********************************************************************/
 

include/vorbis/backends.h

@@ -13,7 +13,7 @@
 
  function: libvorbis backend and mapping structures; needed for 
            static mode headers
- last mod: $Id: backends.h,v 1.7 2000/02/23 09:24:00 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.8 2000/05/08 20:49:42 xiphmont Exp $
 
  ********************************************************************/
 
@@ -70,7 +70,7 @@ typedef struct{
   int   ampbits;
   int   ampdB;
 
-  int   stages; /* <= 16 */
+  int   numbooks; /* <= 16 */
   int   books[16];
 } vorbis_info_floor0;
 
@@ -94,11 +94,13 @@ typedef struct vorbis_info_residue0{
   long  end;
 
   /* first stage (lossless partitioning) */
-  int grouping;         /* group n vectors per partition */
-  int partitions;       /* possible codebooks ofr a partition */
-  int groupbook;        /* huffbook for partitioning */
-  int secondstages[64]; /* expanded out to pointers in lookup */
-  int booklist[256];    /* list of second stage books */
+  int    grouping;         /* group n vectors per partition */
+  int    partitions;       /* possible codebooks ofr a partition */
+  int    groupbook;        /* huffbook for partitioning */
+
+  double ampmax[64];       /* book amp threshholds for *encode* */
+  int    secondstages[64]; /* expanded out to pointers in lookup */
+  int    booklist[256];    /* list of second stage books */
 
 } vorbis_info_residue0;