summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <xiphmont@xiph.org>2000-02-23 11:42:00 +0000
committerMonty <xiphmont@xiph.org>2000-02-23 11:42:00 +0000
commit77cde653a15102358b90cd4d79d91847548f5165 (patch)
treee481be6bf353260dbf918eed4a6a0cbb208c7665
parentee5a2fcc882741131218554e7d393e23c3ad926b (diff)
downloadlibvorbis-git-77cde653a15102358b90cd4d79d91847548f5165.tar.gz
add the unit codebooks for demo encoding
svn path=/trunk/vorbis/; revision=272
-rw-r--r--include/vorbis/modes.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/include/vorbis/modes.h b/include/vorbis/modes.h
index 4b311378..2c4c9207 100644
--- a/include/vorbis/modes.h
+++ b/include/vorbis/modes.h
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.8 2000/02/23 09:24:01 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.9 2000/02/23 11:42:00 xiphmont Exp $
********************************************************************/
@@ -31,8 +31,9 @@
#include "vorbis/book/resX_1.vqh"
-/*#include "vorbis/book/res128_0a.vqh"
-#include "vorbis/book/res128_0b.vqh"
+#include "vorbis/book/res128_0a.vqh"
+#include "vorbis/book/res1024_0a.vqh"
+/*#include "vorbis/book/res128_0b.vqh"
#include "vorbis/book/res128_0c7x4.vqh"
#include "vorbis/book/res1024_1a.vqh"
#include "vorbis/book/res1024_0b.vqh"
@@ -59,8 +60,8 @@ static vorbis_info_psy _psy_set0={
static vorbis_info_time0 _time_set0={0};
static vorbis_info_floor0 _floor_set0={20, 44100, 64, 12,140, 1, {0} };
static vorbis_info_floor0 _floor_set1={32, 44100, 256, 12,140, 1, {1} };
-static vorbis_info_residue0 _residue_set0={0, 128, 8,4,2,{0,1,1,1},{4,4,4}};
-static vorbis_info_residue0 _residue_set1={0,1024, 8,4,3,{0,1,1,1},{4,4,4}};
+static vorbis_info_residue0 _residue_set0={0, 128, 8,4,2,{0,1,1,1},{4,6,6}};
+static vorbis_info_residue0 _residue_set1={0,1024, 8,4,3,{0,1,1,1},{5,6,6}};
static vorbis_info_mapping0 _mapping_set0={1, {0,0}, {0}, {0}, {0}, {0}};
static vorbis_info_mapping0 _mapping_set1={1, {0,0}, {0}, {1}, {1}, {0}};
static vorbis_info_mode _mode_set0={0,0,0,0};
@@ -73,7 +74,7 @@ vorbis_info info_A={
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 5, 1,
+ 2, 2, 1, 2, 2, 7, 1,
/* modes */
{&_mode_set0,&_mode_set1},
/* maps */
@@ -91,6 +92,9 @@ vorbis_info info_A={
&_huff_book_resshort8aux,/* 2 */
&_huff_book_reslong8aux, /* 3 */
+ &_vq_book_res128_0a, /* 4 */
+ &_vq_book_res1024_0a, /* 5 */
+
#if 0
&_vq_book_res128_0a, /* 4 */
&_vq_book_res128_0b, /* 5 */