summaryrefslogtreecommitdiff
path: root/include/vorbis/modes.h
diff options
context:
space:
mode:
authorMonty <xiphmont@xiph.org>2000-06-14 08:19:22 +0000
committerMonty <xiphmont@xiph.org>2000-06-14 08:19:22 +0000
commit548c5cd5ded1dd63dea5d121e6f7e4ec13d7da71 (patch)
tree1a450d562b0136c304bf4801e2fb9da5c8acc27b /include/vorbis/modes.h
parent67f833635368a912b53f68ec55840e4f7cdd69c5 (diff)
downloadlibvorbis-git-548c5cd5ded1dd63dea5d121e6f7e4ec13d7da71.tar.gz
API change to stabilize psychoacoustic configuration for 1.0 beta. It
would be nice, after all, to maintain binary compatability in the library... Monty svn path=/trunk/vorbis/; revision=446
Diffstat (limited to 'include/vorbis/modes.h')
-rw-r--r--include/vorbis/modes.h29
1 files changed, 21 insertions, 8 deletions
diff --git a/include/vorbis/modes.h b/include/vorbis/modes.h
index d5d9d221..c47428ef 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.11 2000/06/14 01:38:27 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.12 2000/06/14 08:19:22 xiphmont Exp $
********************************************************************/
@@ -105,13 +105,13 @@ static vorbis_info_floor0 _floor_set1={30, 44100, 256, 12,150, 1, {1} };
static vorbis_info_residue0 _residue_set0={0,128, 64,14,2,
{0,1,1,1,1,1,1,1,1,1,1,1,1,1,
0,1,1,1,1,1,1,1,1,1,1,1,1,1},
- {4,5,6,7,8,9,10,11,12,13,14,15,16,
- 17,18,19,20,21,22,23,24,25,26,27,28,29},
+ {4,5,6,7,8,9,10,11,12,13,14,15,16},
{0,16,9999,30,9999,41,9999,47,9999,60,9999,128,9999},
{1.5,1.5,1.5,2.5,2.5,3.5,3.5,5,5,9,9,18,18},
{6,6,6,6,6,6,6,6,6,6,6,6,6},
- -1,-1};
+ {99,99,99,99,99,99,99,
+ 99,99,99,99,99,99,99}};
static vorbis_info_residue0 _residue_set1={0,768, 64,28,3,
{0,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -119,10 +119,23 @@ static vorbis_info_residue0 _residue_set1={0,768, 64,28,3,
{4,5,6,7,8,9,10,11,12,13,14,15,16,
17,18,19,20,21,22,23,24,25,26,27,28,29},
- {0,16,9999,30,9999,41,9999,47,9999,60,9999,128,9999},
- {1.5,1.5,1.5,2.5,2.5,3.5,3.5,5,5,9,9,18,18},
- {6,6,6,6,6,6,6,6,6,6,6,6,6},/*6==64*/
- 2,-1};
+ {0, 16,9999, 30,9999, 41,9999,
+ 47,9999,60,9999,128,9999,9999,
+ 0, 16,9999, 30,9999, 41,9999,
+ 47,9999,60,9999,128,9999},
+
+ {1.5, 1.5,1.5, 2.5,2.5, 3.5,3.5,
+ 5,5, 9,9, 18,18, 9999,
+ 1.5, 1.5,1.5, 2.5,2.5, 3.5,3.5,
+ 5,5, 9,9, 18,18},
+
+ {6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6},/*6==64*/
+
+ {2,2,2,2,2,2,2,
+ 2,2,2,2,2,2,2,
+ 99,99,99,99,99,99,99,
+ 99,99,99,99,99,99}};
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}};