bugfix/speed improvement to envelope.c

Tuning for modes B->E for beta 4.

Pending bugfixes/release version update, beta 4 is frozen.
Monty

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

1 files changed, 20 insertions, 19 deletions

diff --git a/lib/books/res0_160_128aux.vqh b/lib/books/res0_160_128aux.vqh
index 7b2b4003..23cc1d1e 100644
--- a/lib/books/res0_160_128aux.vqh
+++ b/lib/books/res0_160_128aux.vqh
@@ -1,12 +1,13 @@
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
  * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH    *
- * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.        *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the XIPHOPHORUS Company http://www.xiph.org/                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
+ * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
@@ -19,20 +20,20 @@
 #include "codebook.h"
 
 static long _huff_lengthlist_res0_160_128aux[] = {
-	13,15,16,16,16,16,13,11,13,16,16,15,11,11,12,15,
-	15,15,10,14,15,15,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,15, 9,10,12,13,15,15, 5, 2, 5,13,15,15,
-	 7, 5, 8,12,15,15,10,11,13,15,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15, 9, 9,10,10,15,15, 5, 4,
-	 8,12,15,15, 9, 7,10,12,15,15,12,12,13,13,15,15,
-	15,15,15,15,15,15,15,15,15,15,15,15,11,11,12,12,
-	15,15, 9, 4, 5,10,15,15,12, 4, 6,10,15,15,13, 8,
-	 9,10,15,15,15,14,15,15,15,15,15,15,15,15,15,15,
-	12,13,15,15,15,15,13, 3, 5,10,15,15,15, 4, 5,10,
-	15,15,14, 8, 9,10,15,15,15,15,15,15,15,15,15,15,
-	15,15,15,15,13,14,15,15,15,15,15, 5, 6,12,15,15,
-	15, 6, 7,11,15,15,15,10,11,13,15,15,15,15,15,15,
-	15,15,15,15,15,15,15,15,
+	13,16,16,16,16,16,15,14,15,16,16,16,14,12,14,14,
+	15,16,10,12,14,13,16,16,15,16,15,16,16,16,16,16,
+	16,16,16,16,12,13,14,16,16,16, 8, 4, 7,13,16,16,
+	 7, 4, 7,12,16,16, 9, 9,11,13,16,16,14,16,16,16,
+	16,16,15,16,16,16,16,16,10,10,13,11,16,16, 5, 3,
+	 7,11,16,16, 5, 3, 7,13,16,16, 9, 9,12,14,16,16,
+	15,16,16,16,16,16,16,16,16,16,16,16,10,10,11,12,
+	16,16, 8, 3, 4,10,16,16, 8, 4, 5, 9,16,16,12, 8,
+	 9,12,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
+	14,13,15,16,16,16,13, 4, 5,10,16,16,14, 4, 6,10,
+	16,16,15, 9,10,13,16,16,16,16,16,16,16,16,16,16,
+	16,16,16,16,14,16,16,16,16,16,14, 7, 8,12,16,16,
+	16, 7, 8,12,16,16,16,13,13,16,16,16,16,16,16,16,
+	16,16,16,16,16,16,16,16,
 };
 
 static static_codebook _huff_book_res0_160_128aux = {