diff options
| author | Monty <xiphmont@xiph.org> | 2001-08-03 06:48:15 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2001-08-03 06:48:15 +0000 |
| commit | 0e9be679b6c532253977434dadc1b264805d37b4 (patch) | |
| tree | 4b4dd68a642727cab50f66b92e73ed217aabe4a2 | |
| parent | 3cc399a7b03eea5451970a393275beff676378cf (diff) | |
| download | libvorbis-git-0e9be679b6c532253977434dadc1b264805d37b4.tar.gz | |
Builds and runs, but is untuned. Don't use it yet. Incremental
commit to avoid losing work.
Monty
svn path=/branches/branch_monty_20010708/vorbis/; revision=1676
48 files changed, 1450 insertions, 899 deletions
diff --git a/include/vorbis/vorbisenc.h b/include/vorbis/vorbisenc.h new file mode 100644 index 00000000..ae06b07f --- /dev/null +++ b/include/vorbis/vorbisenc.h @@ -0,0 +1,53 @@ +/******************************************************************** + * * + * 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: vorbis encode-engine setup + last mod: $Id: vorbisenc.h,v 1.4.6.1 2001/08/03 06:48:02 xiphmont Exp $ + + ********************************************************************/ + +#ifndef _OV_ENC_H_ +#define _OV_ENC_H_ + +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +#include "codec.h" + +extern int vorbis_encode_init(vorbis_info *vi, + long channels, + long rate, + + long max_bitrate, + long nominal_bitrate, + long min_bitrate); + +extern int vorbis_encode_init_vbr(vorbis_info *vi, + long channels, + long rate, + + float /* quality level from 0. (lo) to 1. (hi) */ + ); + +extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif + + diff --git a/lib/books/line0_0sub0.vqh b/lib/books/line0_0sub0.vqh index b433c7aa..d4c87f54 100644 --- a/lib/books/line0_0sub0.vqh +++ b/lib/books/line0_0sub0.vqh @@ -20,14 +20,14 @@ #include "codebook.h" static long _huff_lengthlist_line0_0sub0[] = { - 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, - 6, 5, 6, 5, 7, 5, 7, 6, 7, 6, 8, 6, 8, 6, 8, 6, - 8, 7, 8, 7, 9, 7, 9, 7,10, 7,10, 7,10, 8,10, 8, - 10, 8,10, 8,10, 8,10, 9,10, 9,11, 9,11,10,11,10, - 11,10,11,10,12,11,11,11,11,11,12,12,12,13,12,13, - 12,13,13,15,12,15,13,15,13,15,14,15,13,15,14,15, - 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15, - 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,14, + 4, 3, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 5, 6, 5, + 6, 6, 7, 6, 6, 7, 7, 7, 7, 6, 7, 8, 8, 9, 8, 8, + 8, 9, 8, 9, 9, 9, 8, 7, 9, 9, 8, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, }; static static_codebook _huff_book_line0_0sub0 = { diff --git a/lib/books/line0_1sub1.vqh b/lib/books/line0_1sub1.vqh index 9a3b039d..ccb40883 100644 --- a/lib/books/line0_1sub1.vqh +++ b/lib/books/line0_1sub1.vqh @@ -20,7 +20,7 @@ #include "codebook.h" static long _huff_lengthlist_line0_1sub1[] = { - 0, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 4, 7, 4, 7, + 0, 4, 3, 4, 4, 4, 3, 5, 3, 7, 3, 5, 4, 7, 5, 7, 4, 7, }; diff --git a/lib/books/line0_1sub2.vqh b/lib/books/line0_1sub2.vqh index 1dbd7dcd..583ad000 100644 --- a/lib/books/line0_1sub2.vqh +++ b/lib/books/line0_1sub2.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line0_1sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 6, 3, 7, 3, 8, 3, 8, 4,10, 4,11, 4,11, - 5,11, 5,13, 5,13, 6,13, 6,13, 7,12, 7,12, 7,12, - 8,12, + 0, 0, 3, 7, 3, 7, 3, 7, 4, 7, 6, 7, 4, 7, 4, 7, + 5, 7, 5, 7, 5, 7, 4, 7, 5, 7, 5, 7, 5, 7, 6, 7, + 5, 7, }; static static_codebook _huff_book_line0_1sub2 = { diff --git a/lib/books/line0_1sub3.vqh b/lib/books/line0_1sub3.vqh index 147ae765..15768b22 100644 --- a/lib/books/line0_1sub3.vqh +++ b/lib/books/line0_1sub3.vqh @@ -23,11 +23,11 @@ static long _huff_lengthlist_line0_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 8, 3, 8, 4, 8, 4, 8, 5, 8, 6, 8, 6, 7, - 7, 7, 6, 7, 6, 7, 7, 7, 6, 7, 6, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 0, 0, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, }; static static_codebook _huff_book_line0_1sub3 = { diff --git a/lib/books/line0_2sub2.vqh b/lib/books/line0_2sub2.vqh index e702322e..5823e3a5 100644 --- a/lib/books/line0_2sub2.vqh +++ b/lib/books/line0_2sub2.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line0_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 3, 4, 4, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, - 6, 5, 6, 5, 6, 5, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, - 7, 7, + 0, 0, 4, 2, 5, 3, 5, 3, 6, 4, 5, 4, 6, 5, 9, 6, + 6, 5, 7, 7, 9, 6, 8, 7, 8, 7, 8, 7, 8, 8, 8, 8, + 8, 8, }; static static_codebook _huff_book_line0_2sub2 = { diff --git a/lib/books/line0_2sub3.vqh b/lib/books/line0_2sub3.vqh index a15cd8c3..f91da359 100644 --- a/lib/books/line0_2sub3.vqh +++ b/lib/books/line0_2sub3.vqh @@ -23,11 +23,11 @@ static long _huff_lengthlist_line0_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 6, 5, 6, 5, 6, 6, 7, 6, 8, 6, 8, 6,10, 6, 8, - 6,10, 6,11, 6,10, 6,11, 7,11, 7,11, 6,11, 7,11, - 7,11, 6, 8, 7,11, 9,11, 8,11, 9,11,10,11,11,11, - 11,11,11,11,11,11,10,10,10,10,10,10,10,10,10,10, + 0, 0, 5, 2, 6, 3, 6, 3, 8, 4, 6, 5, 7, 5, 8, 6, + 8, 6, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static static_codebook _huff_book_line0_2sub3 = { diff --git a/lib/books/line0_class1.vqh b/lib/books/line0_class1.vqh index f8081e08..20d459fd 100644 --- a/lib/books/line0_class1.vqh +++ b/lib/books/line0_class1.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line0_class1[] = { - 1, 3, 4,11,14,10,10,14,14,14,10,14,14,14,14,14, - 5, 3, 4, 8,12,11,11,14,14,14,14,14,14,14,14,14, - 8, 4, 6,13,14,13,12,14,14,14,14,14,14,14,14,14, - 14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14, + 1, 4, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 4, 3, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, }; static static_codebook _huff_book_line0_class1 = { diff --git a/lib/books/line0_class2.vqh b/lib/books/line0_class2.vqh index d55188f4..5edf9f43 100644 --- a/lib/books/line0_class2.vqh +++ b/lib/books/line0_class2.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line0_class2[] = { - 7, 6, 8,14, 9, 6, 6,11,13, 9, 8,10,15,15,13,14, - 7, 3, 4,10, 7, 2, 3, 8,10, 6, 5, 8,13, 9, 9,11, - 9, 5, 6,11, 8, 3, 4, 9,11, 6, 6, 8,15,11,10,10, - 14,11,12,13,12, 8, 9,11,13,10,11, 9,15,15,15,11, + 7, 6, 9, 9, 9, 4, 7, 9, 9, 7, 9, 9, 9, 9, 9, 9, + 6, 3, 5, 9, 5, 2, 4, 9, 6, 3, 6, 9, 9, 9, 9, 9, + 9, 7, 8, 9, 6, 4, 7, 9, 7, 5, 7, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, }; static static_codebook _huff_book_line0_class2 = { diff --git a/lib/books/line1_0sub0.vqh b/lib/books/line1_0sub0.vqh index f20566fe..d8728ed9 100644 --- a/lib/books/line1_0sub0.vqh +++ b/lib/books/line1_0sub0.vqh @@ -20,8 +20,8 @@ #include "codebook.h" static long _huff_lengthlist_line1_0sub0[] = { - 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 6, 6, + 5, 5, 4, 5, 5, 5, 4, 5, 4, 5, 4, 6, 4, 6, 4, 6, + 4, 6, 4, 6, 5, 7, 5, 7, 5, 7, 5, 8, 5, 9, 6, 9, }; static static_codebook _huff_book_line1_0sub0 = { diff --git a/lib/books/line1_0sub1.vqh b/lib/books/line1_0sub1.vqh index ab14fc7a..6a6e14d8 100644 --- a/lib/books/line1_0sub1.vqh +++ b/lib/books/line1_0sub1.vqh @@ -22,12 +22,12 @@ static long _huff_lengthlist_line1_0sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, - 6, 5, 6, 5, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 7, - 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, - 9, 8,10,10,10,10,10,10,11,10,11,10,10, 9,10,11, - 12,11,12,11,12,13,12,12,13,14,13,14,13,15,15,14, - 14,15,15,13,12,12,12,12,16,14,16,15,15,15,15,15, + 3, 7, 3, 6, 3, 7, 4, 7, 4, 7, 4, 9, 4, 9, 5,10, + 5,10, 5,10, 6,10, 6,10, 7,10, 6,10, 6,10, 9,10, + 6,10, 8, 9, 7, 9, 9, 9, 8, 9, 9, 9, 9, 9, 8, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, }; static static_codebook _huff_book_line1_0sub1 = { diff --git a/lib/books/line1_1sub0.vqh b/lib/books/line1_1sub0.vqh index 332f9a1a..c3a74b89 100644 --- a/lib/books/line1_1sub0.vqh +++ b/lib/books/line1_1sub0.vqh @@ -20,8 +20,8 @@ #include "codebook.h" static long _huff_lengthlist_line1_1sub0[] = { - 2, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 6, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, + 2, 4, 4, 5, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5, 6, + 5, 7, 5, 8, 5, 9, 6,10, 6,12, 6,11, 7,13, 7,13, }; static static_codebook _huff_book_line1_1sub0 = { diff --git a/lib/books/line1_1sub1.vqh b/lib/books/line1_1sub1.vqh index 1377397d..39c6fdf9 100644 --- a/lib/books/line1_1sub1.vqh +++ b/lib/books/line1_1sub1.vqh @@ -22,12 +22,12 @@ static long _huff_lengthlist_line1_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 4, 4, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 6, 6, - 6, 6, 7, 6, 7, 6, 7, 6, 7, 7, 8, 7, 9, 7, 9, 7, - 9, 7, 9, 7, 9, 7, 9, 7, 9, 7, 9, 8,10, 8, 9, 8, - 10, 8, 9, 8, 9, 9, 9, 9, 9, 9,10, 9,10, 9,11,11, - 9,13,11,11,14,11,11,12,12,11,13,13,13,14,14,14, - 14,14,14,14,13,14,12,14,14,14,14,14,14,14,14,14, + 3, 8, 3, 9, 3, 9, 3, 9, 4, 9, 4, 9, 6, 9, 6, 9, + 6, 9, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static static_codebook _huff_book_line1_1sub1 = { diff --git a/lib/books/line1_2sub1.vqh b/lib/books/line1_2sub1.vqh index c7f7ad31..5e7565e5 100644 --- a/lib/books/line1_2sub1.vqh +++ b/lib/books/line1_2sub1.vqh @@ -20,7 +20,7 @@ #include "codebook.h" static long _huff_lengthlist_line1_2sub1[] = { - 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 5, 4, 5, 4, + 0, 4, 5, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 5, 5, 5, }; diff --git a/lib/books/line1_2sub2.vqh b/lib/books/line1_2sub2.vqh index d9738774..cbc6b7fb 100644 --- a/lib/books/line1_2sub2.vqh +++ b/lib/books/line1_2sub2.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line1_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 3, 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, 5, 5, - 5, 6, 6, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 9, - 7, 9, + 0, 0, 2, 4, 3, 5, 3, 5, 4, 6, 4, 7, 4, 8, 4, 8, + 6, 9, 5, 9, 6,10, 7,10, 9,10, 8,10, 9,10, 8,10, + 10,10, }; static static_codebook _huff_book_line1_2sub2 = { diff --git a/lib/books/line1_2sub3.vqh b/lib/books/line1_2sub3.vqh index 68502409..00acea7f 100644 --- a/lib/books/line1_2sub3.vqh +++ b/lib/books/line1_2sub3.vqh @@ -23,11 +23,11 @@ static long _huff_lengthlist_line1_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 5, 3, 5, 4, 6, 4, 7, 4, 7, 3, 7, 4, 7, - 5, 8, 5, 8, 6,11, 7,11, 6, 9, 5, 9, 5, 9, 7, 8, - 7,10, 6,10, 6,12, 7, 8, 8, 8, 9,12,10,12,12,12, - 12,12,10,12,12,12,12,12,11,12,12,11,12,12,12,12, - 12,12,12,12,12,12,12,12,12,12,11,11,11,11,11,11, + 0, 0, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, }; static static_codebook _huff_book_line1_2sub3 = { diff --git a/lib/books/line1_3sub1.vqh b/lib/books/line1_3sub1.vqh index 85b2a63a..ade48fa1 100644 --- a/lib/books/line1_3sub1.vqh +++ b/lib/books/line1_3sub1.vqh @@ -20,8 +20,8 @@ #include "codebook.h" static long _huff_lengthlist_line1_3sub1[] = { - 0, 3, 3, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 5, - 5, 5, + 0, 3, 4, 4, 4, 4, 5, 3, 5, 3, 5, 4, 5, 4, 6, 4, + 6, 5, }; static static_codebook _huff_book_line1_3sub1 = { diff --git a/lib/books/line1_3sub2.vqh b/lib/books/line1_3sub2.vqh index fb2c9e05..5cbcd59a 100644 --- a/lib/books/line1_3sub2.vqh +++ b/lib/books/line1_3sub2.vqh @@ -21,9 +21,9 @@ static long _huff_lengthlist_line1_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 5, - 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, - 8, 9, + 0, 0, 3, 2, 4, 3, 4, 4, 5, 4, 6, 5, 6, 5, 6, 5, + 7, 7, 7, 7, 7, 7, 9, 7, 9, 9, 9, 8,10, 8, 9, 9, + 10, 9, }; static static_codebook _huff_book_line1_3sub2 = { diff --git a/lib/books/line1_3sub3.vqh b/lib/books/line1_3sub3.vqh index d77ae47a..f3bab492 100644 --- a/lib/books/line1_3sub3.vqh +++ b/lib/books/line1_3sub3.vqh @@ -23,11 +23,11 @@ static long _huff_lengthlist_line1_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 4, 4, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, - 7, 5, 6, 4, 6, 4, 8, 5, 9, 5, 8, 5, 7, 5, 8, 5, - 7, 6, 8, 7, 9, 7,10, 8, 8, 9,10,10, 8,10, 9,10, - 7,10, 8,10,10,10,10,10,10,10, 9, 8, 9,10,10,10, - 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, + 0, 0, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, }; static static_codebook _huff_book_line1_3sub3 = { diff --git a/lib/books/line1_class0.vqh b/lib/books/line1_class0.vqh index 86495f95..8aaff8ac 100644 --- a/lib/books/line1_class0.vqh +++ b/lib/books/line1_class0.vqh @@ -20,7 +20,7 @@ #include "codebook.h" static long _huff_lengthlist_line1_class0[] = { - 1, 3, 4, 4, 3, 5, 4, 5, + 1, 2, 5, 4, 3, 6, 7, 7, }; static static_codebook _huff_book_line1_class0 = { diff --git a/lib/books/line1_class1.vqh b/lib/books/line1_class1.vqh index 5bb6b26a..060c9e94 100644 --- a/lib/books/line1_class1.vqh +++ b/lib/books/line1_class1.vqh @@ -20,7 +20,7 @@ #include "codebook.h" static long _huff_lengthlist_line1_class1[] = { - 1, 3, 5, 6, 3, 6, 7,11, 3, 6, 6, 9, 6,10, 8,11, + 1, 3, 5, 8, 2, 6, 8, 8, 5, 8, 8, 8, 8, 8, 7, 7, }; static static_codebook _huff_book_line1_class1 = { diff --git a/lib/books/line1_class2.vqh b/lib/books/line1_class2.vqh index b21fb5d6..5718430f 100644 --- a/lib/books/line1_class2.vqh +++ b/lib/books/line1_class2.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line1_class2[] = { - 1, 3, 6,10, 8, 4, 6,11,10, 6, 7,12,17,14,10,15, - 7, 4, 6,11, 8, 4, 6, 9,10, 6, 7, 9,17,15,14,19, - 10, 6, 8,11,10, 6, 7,10,12, 8, 9,14,19,19,17,19, - 19,15,14,16,16,12,12,14,19,19,17,19,18,18,18,18, + 1, 3, 6,14, 8, 4, 6,14,11, 5, 5,13,13,13,12,13, + 6, 3, 6,13, 9, 5, 8,13,10, 8,11,13,13,13,13,13, + 11, 8,11,13,11, 8,10,13,12,11,13,13,13,13,13,13, + 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, }; static static_codebook _huff_book_line1_class2 = { diff --git a/lib/books/line1_class3.vqh b/lib/books/line1_class3.vqh index a31a68a3..2b2e15cc 100644 --- a/lib/books/line1_class3.vqh +++ b/lib/books/line1_class3.vqh @@ -20,10 +20,10 @@ #include "codebook.h" static long _huff_lengthlist_line1_class3[] = { - 2, 2, 4,10, 7, 4, 5,12,10, 6, 8,13,17,14,14,15, - 6, 3, 5, 9, 8, 4, 6,11,10, 7, 8,12,18,16,18,18, - 11, 7, 7,11,10, 6, 7,12,13, 9,10,14,18,18,18,17, - 18,15,15,15,18,17,15,16,18,15,16,18,18,18,18,18, + 2, 2, 6,12, 6, 3, 8,12, 9, 6, 9,12,12,12,12,12, + 6, 3, 6,11, 7, 4, 7,12, 9, 5, 8,12,12,12,12,12, + 10, 8,11,12, 9, 6, 7,12,10, 8, 8,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, }; static static_codebook _huff_book_line1_class3 = { diff --git a/lib/books/res0_128_1024_1.vqh b/lib/books/res0_128_1024_1.vqh index 7365b823..d24bd98f 100644 --- a/lib/books/res0_128_1024_1.vqh +++ b/lib/books/res0_128_1024_1.vqh @@ -37,25 +37,25 @@ static long _vq_quantlist_res0_128_1024_1[] = { }; static long _vq_lengthlist_res0_128_1024_1[] = { - 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,12,12, 0, - 4, 5, 8, 8,10,10,11,11,12,12,13,13,14,13, 0, 4, - 4, 8, 8,10,10,11,11,12,12,13,13,14,14, 0, 6, 6, - 8, 8,10,10,11,11,12,12,13,13,14,14, 0, 0, 0, 8, - 8,10,10,11,11,12,12,13,13,14,14, 0, 0, 0,10,10, - 9, 9,12,12,13,12,13,13,14,14, 0, 0, 0,10,10, 9, - 9,11,11,12,12,13,13,14,14, 0, 0, 0, 8, 9,11,11, - 11,11,13,13,14,14,14,14, 0, 0, 0, 0, 0,11,11,11, - 11,13,13,14,13,14,14, 0, 0, 0, 0, 0,12,12,12,12, - 12,12,14,14,14,14, 0, 0, 0, 0, 0,12,12,12,12,12, - 12,14,14,15,14, 0, 0, 0, 0, 0,11,11,13,13,14,14, - 13,13,15,15, 0, 0, 0, 0, 0, 0, 0,13,13,14,14,13, - 13,15,15, 0, 0, 0, 0, 0, 0, 0,14,14,14,14,15,15, - 14,14, 0, 0, 0, 0, 0, 0, 0,14,14,14,14,15,14,14, - 14, + 1, 5, 4, 8, 8,10,10,11,11,13,12,13,13,14,15, 0, + 4, 4, 7, 7,10,10,11,11,13,12,14,13,15,14, 0, 4, + 4, 7, 7, 9, 9,11,11,12,12,13,14,13,14, 0, 6, 6, + 7, 7, 9, 9,11,11,13,12,14,13,14,15, 0, 0, 0, 7, + 8, 9, 9,10,10,11,11,12,12,13,14, 0, 0, 0, 9, 9, + 9, 9,11,11,12,13,14,14,16,15, 0, 0, 0, 9, 9,10, + 10,11,10,11,11,12,12,13,13, 0, 0, 0,11,10,10,10, + 11,11,12,12,13,14,16,14, 0, 0, 0, 0, 0,11,11,11, + 11,12,12,12,12,13,13, 0, 0, 0, 0, 0,12,12,12,12, + 12,12,13,13,14,14, 0, 0, 0, 0, 0,12,12,13,12,13, + 13,13,13,13,13, 0, 0, 0, 0, 0,13,14,13,13,13,13, + 13,13,14,14, 0, 0, 0, 0, 0, 0, 0,14,13,14,13,14, + 15,14,14, 0, 0, 0, 0, 0, 0, 0,14,14,14,14,13,14, + 13,14, 0, 0, 0, 0, 0, 0, 0,14,14,15,14,15,16,15, + 16, }; static float _vq_quantthresh_res0_128_1024_1[] = { - -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.7, 0.7, + -6.5, -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, }; diff --git a/lib/books/res0_128_1024_2.vqh b/lib/books/res0_128_1024_2.vqh index fcdd8106..9c270f5a 100644 --- a/lib/books/res0_128_1024_2.vqh +++ b/lib/books/res0_128_1024_2.vqh @@ -25,16 +25,16 @@ static long _vq_quantlist_res0_128_1024_2[] = { }; static long _vq_lengthlist_res0_128_1024_2[] = { - 1, 3, 4, 0, 0, 0, 0, 0, 0, 3, 6, 6, 0, 0, 0, 0, - 0, 0, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 1, 5, 6, 0, 4, 4, 0, 5, 5, 6,11, 9, 0, 0, 8, 0, + 9,10, 6,11, 0, 0,10,10, 0,11, 9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 9,12, 0,10, 8, 0, 9,12, 4,12,10, + 0, 8, 9, 0,11,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, + 10, 8, 0, 0, 9, 0,10,10, 5, 9, 0, 0, 9,11, 0, 9, + 12, }; static float _vq_quantthresh_res0_128_1024_2[] = { - -0.7, 0.7, + -0.5, 0.5, }; static long _vq_quantmap_res0_128_1024_2[] = { @@ -53,8 +53,12 @@ static long _vq_pigeonmap_res0_128_1024_2[] = { }; static long _vq_fitlist_res0_128_1024_2[] = { - 0, 1, 2, 9, 10, 11, 18, 19, - 20, + 0, 1, 2, 4, 5, 7, 8, 9, + 10, 11, 14, 16, 17, 18, 19, 22, + 23, 25, 26, 36, 37, 38, 40, 41, + 43, 44, 45, 46, 47, 49, 50, 52, + 53, 63, 64, 65, 68, 70, 71, 72, + 73, 76, 77, 79, 80, }; static long _vq_fitmap_res0_128_1024_2[] = { @@ -62,13 +66,13 @@ static long _vq_fitmap_res0_128_1024_2[] = { }; static long _vq_fitlength_res0_128_1024_2[] = { - 9, + 45, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_2 = { -1, 1, 2, 1, _vq_pigeonmap_res0_128_1024_2, - 9, + 45, _vq_fitlist_res0_128_1024_2, _vq_fitmap_res0_128_1024_2, _vq_fitlength_res0_128_1024_2 diff --git a/lib/books/res0_128_1024_3.vqh b/lib/books/res0_128_1024_3.vqh index bf9058cc..138c72bf 100644 --- a/lib/books/res0_128_1024_3.vqh +++ b/lib/books/res0_128_1024_3.vqh @@ -25,16 +25,16 @@ static long _vq_quantlist_res0_128_1024_3[] = { }; static long _vq_lengthlist_res0_128_1024_3[] = { - 2, 3, 3, 0, 0, 0, 0, 0, 0, 3, 4, 4, 0, 0, 0, 0, - 0, 0, 3, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 2, 6, 6, 0, 4, 4, 0, 4, 5, 7,10,10, 0, 9, 8, 0, + 8, 9, 7,10,10, 0, 8, 9, 0, 9, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 8, 9, 0, 6, 6, 0, 6, 8, 4, 9, 8, + 0, 6, 6, 0, 8, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, + 9, 8, 0, 8, 6, 0, 6, 7, 4, 8, 9, 0, 6, 8, 0, 7, + 7, }; static float _vq_quantthresh_res0_128_1024_3[] = { - -0.7, 0.7, + -0.5, 0.5, }; static long _vq_quantmap_res0_128_1024_3[] = { @@ -53,8 +53,13 @@ static long _vq_pigeonmap_res0_128_1024_3[] = { }; static long _vq_fitlist_res0_128_1024_3[] = { - 0, 1, 2, 9, 10, 11, 18, 19, - 20, + 0, 1, 2, 4, 5, 7, 8, 9, + 10, 11, 13, 14, 16, 17, 18, 19, + 20, 22, 23, 25, 26, 36, 37, 38, + 40, 41, 43, 44, 45, 46, 47, 49, + 50, 52, 53, 63, 64, 65, 67, 68, + 70, 71, 72, 73, 74, 76, 77, 79, + 80, }; static long _vq_fitmap_res0_128_1024_3[] = { @@ -62,13 +67,13 @@ static long _vq_fitmap_res0_128_1024_3[] = { }; static long _vq_fitlength_res0_128_1024_3[] = { - 9, + 49, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_3 = { -1, 1, 2, 1, _vq_pigeonmap_res0_128_1024_3, - 9, + 49, _vq_fitlist_res0_128_1024_3, _vq_fitmap_res0_128_1024_3, _vq_fitlength_res0_128_1024_3 diff --git a/lib/books/res0_128_1024_4.vqh b/lib/books/res0_128_1024_4.vqh index 093849cd..15988b1b 100644 --- a/lib/books/res0_128_1024_4.vqh +++ b/lib/books/res0_128_1024_4.vqh @@ -27,50 +27,50 @@ static long _vq_quantlist_res0_128_1024_4[] = { }; static long _vq_lengthlist_res0_128_1024_4[] = { - 1, 4, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 9, 9, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 6, 7, 7, 9, 9, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 7, 6, 0,13, 0, 5, 5,10,10, 0, 5, 5,10,10, 0, + 6, 6, 8, 8, 0, 0, 0,10, 9, 7,11,11,12, 0, 0,11, + 10,13, 0, 0, 9,11,13, 0, 0,13, 9, 0, 0, 0, 0, 0, + 11, 0, 7,10,12,11, 0, 0, 9,13,12, 0, 0,11,11,12, + 10, 0, 9,11,13,13, 0, 0, 0, 0,11,11, 0, 0, 0, 0, + 0, 0,13, 0, 0, 0, 0, 0,13, 0, 0, 0, 0, 0,13, 0, + 0, 0,12, 0, 0,12,12, 0,13, 0, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5,10,11, 0, 0, 0, 9, 8,12,11, + 0,11,12,11,12, 0,10, 8,11,10, 0, 0, 0,10, 0, 5, + 10, 9, 0,13, 0, 8, 9, 0,12, 0,11, 9, 0, 9, 0, 9, + 11, 0,11, 0, 0, 0, 0,11,10, 0, 0, 0, 0, 0, 0,12, + 0, 0, 0,12, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, + 0,10, 0,11, 0, 0, 0, 0,11, 0, 0, 0, 0,11, 0,12, + 0,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5,11, 9, 0,12, 0,11,10,12,12, 0, 9, 9, + 0,11, 0,11, 9,12, 0, 0, 0, 0,11, 0, 5,10,10,11, + 0, 0, 9,10,11, 0, 0,10,10,11, 0, 0, 9,10,11,12, + 0, 0, 0,12,11, 9,11,10, 0, 0, 0, 0,10, 0, 0, 0, + 10,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0,10,10, + 0, 0, 0, 0,11, 0, 0, 0, 0, 0,11, 0, 0, 0,11, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 6, 8,11, 0, 0, 0, 9,11, 0, 0, 0, 8,10,12, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,11, 9, 0, 0, 0,11, + 8, 0, 0, 0,10, 9, 0,12, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 8,12, 0, 0, 0, 0, 0,11, 0, 0, 0,12, 0, 0, + 0, 0,12,12, 0,11, 0, 0, 0, 0, 0, 8,12, 0, 0, 0, + 0,11,10, 0, 0, 0, 0,11, 0, 0, 0, 0,12,12, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 0,11, 0, 0, 0, 0,11, 0, 0, 0,12, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 9,11, 0, 0, 0, 0,11, 0, + 0, 0, 0,11,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; static float _vq_quantthresh_res0_128_1024_4[] = { - -1.5, -0.7, 0.7, 1.5, + -1.5, -0.5, 0.5, 1.5, }; static long _vq_quantmap_res0_128_1024_4[] = { @@ -89,10 +89,29 @@ static long _vq_pigeonmap_res0_128_1024_4[] = { }; static long _vq_fitlist_res0_128_1024_4[] = { - 0, 1, 2, 3, 25, 26, 27, 28, - 50, 51, 52, 53, 75, 76, 77, 78, - 4, 29, 54, 79, 100, 101, 102, 103, - 104, + 0, 1, 2, 6, 7, 8, 11, 12, + 13, 16, 17, 18, 25, 26, 27, 28, + 31, 32, 33, 36, 37, 38, 41, 42, + 50, 51, 52, 53, 56, 57, 58, 61, + 62, 63, 66, 67, 68, 75, 82, 88, + 150, 151, 152, 156, 157, 158, 161, 162, + 163, 166, 167, 168, 175, 176, 177, 181, + 182, 186, 187, 191, 192, 200, 207, 211, + 217, 275, 276, 277, 281, 282, 283, 286, + 287, 291, 292, 293, 300, 301, 302, 303, + 306, 307, 308, 311, 316, 325, 326, 327, + 332, 336, 400, 401, 402, 406, 407, 411, + 412, 413, 425, 426, 427, 431, 432, 436, + 450, 451, 457, 461, 466, 4, 9, 14, + 19, 64, 69, 94, 159, 164, 169, 179, + 184, 189, 194, 279, 284, 289, 312, 317, + 337, 437, 467, 319, 439, 469, 23, 48, + 98, 173, 298, 313, 24, 74, 199, 324, + 323, 348, 101, 102, 112, 225, 227, 232, + 237, 241, 318, 350, 351, 356, 366, 475, + 476, 481, 482, 104, 239, 362, 487, 492, + 493, 575, 577, 582, 586, 600, 601, 606, + 611, 612, }; static long _vq_fitmap_res0_128_1024_4[] = { @@ -101,14 +120,14 @@ static long _vq_fitmap_res0_128_1024_4[] = { }; static long _vq_fitlength_res0_128_1024_4[] = { - 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, + 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_4 = { -2, 1, 4, 2, _vq_pigeonmap_res0_128_1024_4, - 25, + 178, _vq_fitlist_res0_128_1024_4, _vq_fitmap_res0_128_1024_4, _vq_fitlength_res0_128_1024_4 diff --git a/lib/books/res0_128_1024_5.vqh b/lib/books/res0_128_1024_5.vqh index ecfba730..5d351c50 100644 --- a/lib/books/res0_128_1024_5.vqh +++ b/lib/books/res0_128_1024_5.vqh @@ -27,50 +27,50 @@ static long _vq_quantlist_res0_128_1024_5[] = { }; static long _vq_lengthlist_res0_128_1024_5[] = { - 3, 4, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 3, 6, 6, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 6, 6, 8, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 6, 6, 6, 8, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 2, 7, 6,14,14, 0, 5, 5,11,11, 0, 5, 5,10,10, 0, + 6, 6, 9, 9, 0, 0, 0, 9, 9, 7, 9, 9,15,13, 0, 9, + 8,13,12, 0, 8, 9,11,12, 0,11, 9,13,11, 0, 0, 0, + 10,13, 6, 9, 9,14,15, 0, 8, 9,12,13, 0, 9, 8,12, + 11, 0, 9,11,11,13, 0, 0, 0,12,10,13,13,14, 0, 0, + 0,14,14, 0,16, 0,13,14,15,17, 0,17,14, 0,17, 0, + 0, 0,14,17,13,15,15, 0,16, 0,13,16, 0, 0, 0,15, + 13, 0,14, 0,14, 0,14, 0, 0, 0, 0, 0,16, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 8, 9,13,15, 0, 6, 6,11,13, + 0, 6, 8,10,13, 0, 9, 8,10,10, 0, 0, 0,10,12, 5, + 9, 8,16,13, 0, 6, 6,12,11, 0, 8, 6,13,10, 0, 8, + 9,10,10, 0, 0, 0,12,10,10,13,13, 0, 0, 0,12,11, + 15,17, 0,11,13,13, 0, 0,16,12,15,14, 0, 0, 0,14, + 16,11,13,12, 0,15, 0,11,13,17,14, 0,13,11,16,14, + 0,12,14,14,15, 0, 0, 0,16,13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 9, 8,17,13, 0, 8, 6,13,11, 0, 7, 6, + 11,10, 0, 9, 8,13,10, 0, 0, 0,10,10, 5, 8, 9,13, + 15, 0, 6, 7,11,13, 0, 6, 7,10,12, 0, 8, 9,10,12, + 0, 0, 0,10,10,10,12,11, 0,14, 0,13,10,17,14, 0, + 10,11,13,14, 0,15,11, 0,13, 0, 0, 0,12,15,10,11, + 12,14, 0, 0,10,13,13,15, 0,11,10,13,14, 0,11,17, + 14,16, 0, 0, 0,16,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 7, 9,11,14,17, 0, 8, 9,12,15, 0, 8, 9,11,17, 0, + 10,10,12,14, 0, 0, 0,11,14, 6,11, 9,17,14, 0, 8, + 8,15,12, 0, 9, 8,15,11, 0,10,10,14,12, 0, 0, 0, + 13,11, 9,12,12,15, 0, 0,10,10,13,16, 0,10,12,14, + 16, 0,13,11,13,13, 0, 0, 0,13, 0, 9,12,11, 0,15, + 0, 9,10,14,14, 0,12,10,17,13, 0,11,12,12,13, 0, + 0, 0,16,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 13,11, 0,14, 0,12,10, 0,13, 0,10,10,14,12, 0,13, + 11, 0,14, 0, 0, 0,13,12, 9,10,13,14, 0, 0,10,11, + 13,17, 0,10,10,12,15, 0,11,13,14,16, 0, 0, 0,12, + 12, }; static float _vq_quantthresh_res0_128_1024_5[] = { - -1.5, -0.7, 0.7, 1.5, + -1.5, -0.5, 0.5, 1.5, }; static long _vq_quantmap_res0_128_1024_5[] = { @@ -89,26 +89,165 @@ static long _vq_pigeonmap_res0_128_1024_5[] = { }; static long _vq_fitlist_res0_128_1024_5[] = { - 0, 1, 2, 3, 25, 26, 27, 28, - 50, 51, 52, 53, 75, 76, 77, 78, - 4, 29, 54, 79, 100, 101, 102, 103, - 104, + 0, 1, 2, 3, 6, 7, 8, 11, + 12, 13, 16, 17, 18, 25, 26, 27, + 28, 31, 32, 33, 36, 37, 38, 41, + 42, 43, 50, 51, 52, 53, 56, 57, + 58, 61, 62, 63, 66, 67, 68, 75, + 76, 77, 81, 82, 86, 87, 88, 91, + 92, 150, 151, 152, 153, 156, 157, 158, + 161, 162, 163, 166, 167, 168, 175, 176, + 177, 178, 181, 182, 183, 186, 187, 188, + 191, 192, 193, 200, 201, 202, 206, 207, + 208, 211, 212, 213, 216, 217, 218, 275, + 276, 277, 278, 281, 282, 283, 286, 287, + 288, 291, 292, 293, 300, 301, 302, 303, + 306, 307, 308, 311, 316, 325, 326, 327, + 331, 332, 333, 336, 341, 400, 401, 402, + 403, 406, 407, 408, 411, 412, 413, 416, + 417, 418, 425, 426, 427, 428, 431, 432, + 433, 436, 441, 450, 451, 452, 453, 456, + 457, 458, 461, 466, 4, 9, 14, 19, + 29, 34, 39, 44, 54, 59, 64, 69, + 84, 89, 94, 154, 159, 164, 169, 179, + 184, 189, 194, 209, 219, 279, 284, 289, + 294, 304, 309, 312, 317, 329, 334, 337, + 342, 404, 409, 414, 419, 429, 434, 437, + 442, 459, 462, 467, 314, 319, 339, 344, + 439, 444, 464, 469, 23, 48, 73, 98, + 173, 198, 223, 298, 313, 338, 423, 438, + 463, 24, 49, 74, 99, 174, 199, 224, + 299, 424, 324, 349, 449, 323, 348, 448, + 473, 100, 101, 102, 106, 107, 111, 112, + 116, 118, 225, 226, 227, 231, 232, 233, + 236, 237, 238, 241, 242, 243, 318, 350, + 351, 352, 353, 356, 357, 358, 361, 366, + 443, 475, 476, 477, 481, 482, 483, 486, + 491, 104, 114, 229, 234, 239, 244, 359, + 362, 367, 479, 484, 487, 492, 364, 369, + 489, 494, 248, 363, 488, 124, 249, 374, + 499, 373, 498, 368, 493, 575, 576, 577, + 581, 582, 586, 591, 579, 584, 587, 592, + 589, 594, 588, 599, 598, 600, 601, 602, + 603, 606, 607, 608, 611, 616, 609, 612, + 617, 614, 619, 613, 624, 623, 618, 0, + 1, 3, 6, 8, 11, 13, 16, 18, + 25, 26, 28, 31, 33, 36, 38, 41, + 43, 50, 51, 53, 56, 58, 61, 63, + 66, 68, 75, 76, 81, 86, 88, 91, + 150, 151, 153, 156, 158, 161, 163, 166, + 168, 175, 176, 178, 181, 183, 186, 188, + 191, 193, 200, 201, 206, 208, 211, 213, + 216, 218, 275, 276, 278, 281, 283, 286, + 288, 291, 293, 300, 301, 303, 306, 308, + 311, 313, 316, 318, 325, 326, 331, 333, + 336, 338, 341, 400, 401, 403, 406, 408, + 411, 413, 416, 418, 425, 426, 428, 431, + 433, 436, 438, 441, 443, 450, 451, 453, + 456, 458, 461, 463, 466, 468, 23, 48, + 73, 98, 173, 198, 223, 298, 323, 348, + 423, 448, 473, 100, 101, 106, 111, 116, + 118, 225, 226, 231, 233, 236, 238, 241, + 243, 350, 351, 353, 356, 358, 361, 363, + 366, 368, 475, 476, 481, 483, 486, 488, + 491, 493, 248, 373, 498, 575, 576, 581, + 586, 588, 591, 598, 600, 601, 603, 606, + 608, 611, 613, 616, 618, 623, 0, 1, + 2, 3, 6, 7, 8, 16, 17, 18, + 25, 26, 27, 28, 31, 32, 33, 41, + 42, 43, 50, 51, 52, 53, 56, 57, + 58, 66, 67, 68, 75, 76, 77, 81, + 82, 91, 92, 150, 151, 152, 153, 156, + 157, 158, 166, 167, 168, 175, 176, 177, + 178, 181, 182, 183, 191, 192, 193, 200, + 201, 202, 206, 207, 208, 216, 217, 218, + 275, 276, 277, 278, 281, 282, 283, 291, + 292, 293, 300, 301, 306, 307, 308, 316, + 317, 318, 325, 326, 331, 332, 333, 341, + 342, 400, 401, 402, 403, 406, 407, 408, + 416, 417, 418, 425, 426, 431, 432, 433, + 441, 442, 443, 450, 451, 456, 457, 458, + 466, 467, 468, 4, 9, 19, 29, 34, + 44, 54, 59, 69, 84, 94, 154, 159, + 169, 179, 184, 194, 209, 219, 279, 284, + 294, 302, 309, 319, 327, 334, 344, 404, + 409, 419, 427, 434, 444, 452, 459, 469, + 304, 329, 429, 100, 101, 102, 106, 107, + 116, 118, 225, 226, 227, 231, 232, 233, + 241, 242, 243, 303, 350, 351, 356, 357, + 358, 366, 367, 368, 428, 475, 476, 481, + 482, 483, 491, 492, 493, 104, 229, 234, + 244, 352, 359, 369, 477, 484, 494, 479, + 353, 575, 576, 581, 582, 591, 592, 577, + 584, 594, 579, 600, 601, 606, 607, 608, + 616, 617, 618, 602, 609, 619, 603, 0, + 1, 2, 3, 6, 7, 8, 11, 12, + 13, 16, 17, 18, 25, 26, 27, 28, + 31, 32, 33, 36, 37, 38, 41, 42, + 43, 75, 76, 77, 81, 82, 86, 87, + 88, 91, 92, 150, 151, 152, 153, 156, + 157, 158, 161, 162, 163, 166, 167, 168, + 200, 201, 202, 206, 207, 208, 211, 212, + 213, 216, 217, 218, 275, 276, 277, 278, + 281, 282, 283, 286, 287, 288, 291, 292, + 293, 325, 326, 327, 331, 332, 333, 336, + 337, 338, 341, 342, 400, 401, 402, 403, + 406, 407, 408, 411, 412, 413, 416, 417, + 418, 450, 451, 452, 453, 456, 457, 458, + 461, 462, 463, 466, 467, 468, 4, 9, + 14, 19, 29, 34, 39, 44, 84, 89, + 94, 154, 159, 164, 169, 209, 219, 279, + 284, 289, 294, 329, 334, 339, 344, 404, + 409, 414, 419, 459, 464, 469, 23, 48, + 98, 173, 223, 298, 348, 423, 473, 24, + 49, 99, 174, 224, 299, 349, 424, 575, + 576, 577, 581, 582, 586, 587, 588, 591, + 592, 579, 584, 589, 594, 598, 599, 0, + 1, 2, 3, 6, 7, 8, 11, 12, + 13, 16, 17, 18, 25, 26, 27, 28, + 31, 32, 33, 36, 37, 38, 41, 42, + 43, 50, 51, 52, 53, 56, 57, 58, + 61, 66, 75, 76, 77, 81, 82, 86, + 91, 150, 151, 152, 153, 156, 157, 158, + 161, 162, 163, 166, 167, 168, 175, 176, + 177, 178, 181, 182, 183, 186, 187, 188, + 191, 192, 193, 200, 201, 202, 206, 207, + 208, 211, 212, 213, 216, 217, 218, 400, + 401, 402, 403, 406, 407, 408, 411, 412, + 413, 416, 417, 418, 425, 426, 427, 428, + 431, 432, 433, 436, 437, 438, 441, 442, + 443, 450, 451, 452, 453, 456, 457, 458, + 461, 462, 463, 466, 467, 468, 4, 9, + 14, 19, 29, 34, 39, 44, 54, 59, + 62, 67, 84, 87, 92, 154, 159, 164, + 169, 179, 184, 189, 194, 209, 219, 404, + 409, 414, 419, 429, 434, 439, 444, 459, + 464, 469, 64, 69, 89, 94, 23, 48, + 63, 88, 173, 198, 223, 423, 448, 473, + 24, 49, 174, 199, 224, 424, 449, 74, + 99, 73, 98, 68, 100, 101, 102, 106, + 107, 111, 116, 225, 226, 227, 231, 232, + 233, 236, 237, 238, 241, 242, 243, 475, + 476, 477, 481, 482, 483, 486, 487, 488, + 491, 492, 493, 104, 112, 229, 234, 239, + 244, 479, 484, 489, 494, 114, 248, 498, + 249, 499, 124, 118, }; static long _vq_fitmap_res0_128_1024_5[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 335, 510, 335, 735, 335, 735, 335, + 911, 335, 911, 335, 735, 335, 735, 335, }; static long _vq_fitlength_res0_128_1024_5[] = { - 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, + 335, 175, 225, 175, 176, 175, 176, 175, + 229, 175, 229, 175, 176, 175, 176, 175, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_5 = { -2, 1, 4, 2, _vq_pigeonmap_res0_128_1024_5, - 25, + 1140, _vq_fitlist_res0_128_1024_5, _vq_fitmap_res0_128_1024_5, _vq_fitlength_res0_128_1024_5 diff --git a/lib/books/res0_128_1024_6.vqh b/lib/books/res0_128_1024_6.vqh index 15f8e12c..ae0c7ebf 100644 --- a/lib/books/res0_128_1024_6.vqh +++ b/lib/books/res0_128_1024_6.vqh @@ -27,35 +27,33 @@ static long _vq_quantlist_res0_128_1024_6[] = { }; static long _vq_lengthlist_res0_128_1024_6[] = { - 1, 4, 3, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 5, 9, 9, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 5, 6, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 9, 9,12,12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 8, 9,10,12,12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 6, 6, 0,12, 5, 5, 5, 0,12, 0, 5, 4,10,10, 0, + 12,12,12,11, 0,12, 0, 0,12, 6,10, 9, 0, 0,10,12, + 9, 0, 0, 0, 9,10,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 12, 0, 7, 9,10, 0, 0,10, 9,11, 0, 0, 0,11, 7, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,12, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, + 0, 0, 9,10, 9, 0, 0, 0,10, 9,12, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 9,12, 0, 0, 9, 9, 8, 0, 0, + 0,10,12,12, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 5, + 12, 8, 0, 0,11,10,10, 0, 0, 0, 0, 9, 0,12, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5,10, 7, 0,12, 9,12, 9, 0, 0, 0, 9,10, + 0,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 0, 0, + 0, 9, 9,12, 0, 0, 0, 9, 9,12, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 9, 0,10, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -64,6 +62,8 @@ static long _vq_lengthlist_res0_128_1024_6[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, + 0,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -89,10 +89,18 @@ static long _vq_pigeonmap_res0_128_1024_6[] = { }; static long _vq_fitlist_res0_128_1024_6[] = { - 0, 1, 2, 3, 25, 26, 27, 28, - 50, 51, 52, 53, 75, 76, 77, 78, - 4, 29, 54, 79, 100, 101, 102, 103, - 104, + 0, 1, 2, 5, 6, 7, 11, 12, + 13, 16, 17, 18, 25, 26, 27, 30, + 31, 32, 36, 37, 38, 50, 51, 52, + 55, 56, 57, 61, 62, 77, 125, 126, + 127, 130, 131, 132, 136, 137, 138, 150, + 151, 152, 155, 156, 157, 161, 162, 163, + 167, 175, 176, 177, 180, 181, 182, 187, + 200, 275, 276, 277, 280, 281, 282, 286, + 287, 300, 301, 305, 306, 307, 311, 325, + 327, 427, 4, 9, 14, 19, 64, 189, + 279, 289, 312, 21, 48, 313, 24, 100, + 105, 350, 351, 575, 577, }; static long _vq_fitmap_res0_128_1024_6[] = { @@ -101,14 +109,14 @@ static long _vq_fitmap_res0_128_1024_6[] = { }; static long _vq_fitlength_res0_128_1024_6[] = { - 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, + 93, 93, 93, 93, 93, 93, 93, 93, + 93, 93, 93, 93, 93, 93, 93, 93, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_6 = { -6, 3, 4, 2, _vq_pigeonmap_res0_128_1024_6, - 25, + 93, _vq_fitlist_res0_128_1024_6, _vq_fitmap_res0_128_1024_6, _vq_fitlength_res0_128_1024_6 diff --git a/lib/books/res0_128_1024_6a.vqh b/lib/books/res0_128_1024_6a.vqh index 0c87b40a..987bd522 100644 --- a/lib/books/res0_128_1024_6a.vqh +++ b/lib/books/res0_128_1024_6a.vqh @@ -25,12 +25,12 @@ static long _vq_quantlist_res0_128_1024_6a[] = { }; static long _vq_lengthlist_res0_128_1024_6a[] = { - 1, 4, 4, 0, 0, 0, 0, 0, 0, 4, 4, 4, 0, 0, 0, 0, - 0, 0, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 1, 6, 6, 9, 5, 5,10, 5, 5, 6, 9, 9, 9, 9, 8,11, + 8, 8, 6, 8, 9,10, 8, 9,10, 8, 8, 9,10,10,13,11, + 9, 0, 9, 9, 5, 8, 8,10, 7, 7,11, 8, 8, 5, 9, 8, + 10, 7, 8,11, 8, 8,10,11,11,13,11,10,12,10, 9, 5, + 8, 8, 9, 9, 7,10, 7, 8, 5, 8, 9, 8, 8, 8,10, 7, + 7, }; static float _vq_quantthresh_res0_128_1024_6a[] = { @@ -53,8 +53,16 @@ static long _vq_pigeonmap_res0_128_1024_6a[] = { }; static long _vq_fitlist_res0_128_1024_6a[] = { - 0, 1, 2, 9, 10, 11, 18, 19, - 20, + 0, 1, 2, 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, 30, 31, + 32, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, }; static long _vq_fitmap_res0_128_1024_6a[] = { @@ -62,13 +70,13 @@ static long _vq_fitmap_res0_128_1024_6a[] = { }; static long _vq_fitlength_res0_128_1024_6a[] = { - 9, + 80, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_6a = { -1, 1, 2, 1, _vq_pigeonmap_res0_128_1024_6a, - 9, + 80, _vq_fitlist_res0_128_1024_6a, _vq_fitmap_res0_128_1024_6a, _vq_fitlength_res0_128_1024_6a diff --git a/lib/books/res0_128_1024_7.vqh b/lib/books/res0_128_1024_7.vqh index dfae8d4b..163b8e6b 100644 --- a/lib/books/res0_128_1024_7.vqh +++ b/lib/books/res0_128_1024_7.vqh @@ -27,45 +27,45 @@ static long _vq_quantlist_res0_128_1024_7[] = { }; static long _vq_lengthlist_res0_128_1024_7[] = { - 1, 4, 4, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 8, 7, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 4, 5, 5, 7, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 8, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 7, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 6, 7,14, 0, 4, 5, 6, 0, 0, 0, 5, 5,10,11, 0, + 13,12,11,11, 0,12,11,10,11, 6,11,11, 0, 0, 9,11, + 9, 0, 0, 0, 8,10,13, 0, 0, 0,13, 0,13, 0, 0,14, + 14, 0, 6,10,11, 0,14, 9, 9,11, 0, 0, 0,10, 9, 0, + 13, 0, 0,13,13, 0, 0, 0, 0, 0,13, 0,14, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,14, 0, 0,14, 0, 0, 0, 0, 0, 0, + 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 9, 9, + 0, 0, 8, 8, 9, 0, 0, 0, 8, 8,14,14, 0,14,14,13, + 0, 0,14,12,13,12, 6,10,11, 0, 0, 9, 9, 9,14, 0, + 0, 9,11,14, 0, 0, 0,12,14,13, 0,14,14,13, 0, 6, + 11,10, 0, 0, 8, 9, 9, 0, 0, 0,11, 9, 0, 0, 0,13, + 14,13,14, 0, 0,14, 0,14,13, 0,14, 0, 0, 0, 0,14, + 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0,12, 0, 0, 0, 0,14,14, 0, 0, 0, 0, 0,14, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5,11, 8, 0, 0, 8,12, 9, 0, 0, 0, 9, 8, + 0,12, 0, 0, 0, 0, 0, 0,13,13, 0,12, 5, 8,10,14, + 0, 8, 9,11,14, 0, 0, 8, 9,14, 0, 0, 0, 0, 0, 0, + 0,14,14,13, 0,11, 0,12, 0, 0,13, 0,13, 0,14, 0, + 13,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,11, + 13,14, 0,13, 0,14, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11,13, 0, 0, 0, 0,14,14, 0, 0, 0,13, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0,12, 0,14, 0, 0,12,13, + 13, 0,14, 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0,12, 0, 0, 0, 0,14,13,13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,13, 0, 0, 0, 0, 0,11, 0,13, 0, 0, + 14,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, + 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11,14,11, + 0, 0,14, 0,14, 0, 0, 0,13,12, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0,11,13, 0, 0, 0,13,14, 0, 0, 0, + 0,14,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, + 0, 0, 0, 0, 0,14,14, 0, 0, 0, 0,13, 0,14, 0, 0, + 0, 0, 0, 0,14,14, 0, 0,11,12,14, 0, 0,14, 0, 0, + 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; @@ -89,10 +89,31 @@ static long _vq_pigeonmap_res0_128_1024_7[] = { }; static long _vq_fitlist_res0_128_1024_7[] = { - 0, 1, 2, 3, 25, 26, 27, 28, - 50, 51, 52, 53, 75, 76, 77, 78, - 4, 29, 54, 79, 100, 101, 102, 103, - 104, + 0, 1, 2, 3, 5, 6, 7, 11, + 12, 13, 16, 17, 18, 25, 26, 27, + 30, 31, 32, 36, 37, 38, 42, 50, + 51, 52, 55, 56, 57, 61, 62, 67, + 68, 76, 125, 126, 127, 130, 131, 132, + 136, 137, 138, 141, 142, 143, 150, 151, + 152, 155, 156, 157, 158, 161, 162, 163, + 167, 168, 175, 176, 177, 180, 181, 182, + 186, 187, 191, 192, 193, 200, 202, 207, + 211, 275, 276, 277, 280, 281, 282, 286, + 287, 300, 301, 302, 303, 305, 306, 307, + 308, 311, 325, 327, 330, 332, 336, 400, + 401, 406, 407, 411, 425, 427, 430, 431, + 432, 436, 450, 455, 456, 457, 14, 19, + 44, 54, 64, 139, 169, 194, 289, 312, + 334, 337, 434, 437, 469, 21, 22, 23, + 47, 48, 146, 147, 148, 171, 172, 173, + 197, 296, 297, 313, 321, 24, 74, 149, + 199, 299, 322, 323, 102, 105, 112, 225, + 230, 231, 237, 350, 351, 352, 353, 355, + 357, 361, 475, 477, 480, 481, 372, 497, + 493, 525, 526, 527, 530, 532, 536, 537, + 550, 551, 555, 556, 561, 575, 581, 582, + 562, 587, 589, 596, 597, 600, 601, 602, + 605, 611, }; static long _vq_fitmap_res0_128_1024_7[] = { @@ -101,14 +122,14 @@ static long _vq_fitmap_res0_128_1024_7[] = { }; static long _vq_fitlength_res0_128_1024_7[] = { - 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, + 194, 194, 194, 194, 194, 194, 194, 194, + 194, 194, 194, 194, 194, 194, 194, 194, }; static encode_aux_pigeonhole _vq_auxp_res0_128_1024_7 = { -6, 3, 4, 2, _vq_pigeonmap_res0_128_1024_7, - 25, + 194, _vq_fitlist_res0_128_1024_7, _vq_fitmap_res0_128_1024_7, _vq_fitlength_res0_128_1024_7 diff --git a/lib/books/res0_128_1024_7a.vqh b/lib/books/res0_128_1024_7a.vqh index 6056b262..d48b87a7 100644 --- a/lib/books/res0_128_1024_7a.vqh +++ b/lib/books/res0_128_1024_7a.vqh @@ -25,12 +25,12 @@ static long _vq_quantlist_res0_128_1024_7a[] = { }; static long _vq_lengthlist_res0_128_1024_7a[] = { - 3, 3, 3, 0, 0, 0, 0, 0, 0, 4, 3, 3, 0, 0, 0, 0, - 0, 0, 4, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, + 3, 6, 6, 9, 5, 5,10, 5, 5, 6, 8, 8,10, 7, 7,11, + 6, 7, 6, 8, 8, 9, 7, 7,10, 7, 7, 9,10,10,12, 9, + 9,11, 9, 9, 5, 7, 7, 9, 6, 6,10, 6, 6, 5, 7, 7, + 10, 6, 6,10, 6, 6,10,10,11,13,10, 9,13,10,10, 4, + 7, 6, 9, 6, 6, 9, 5, 5, 4, 6, 7, 9, 6, 6,10, 6, + 5, }; static float _vq_quantthresh_res0_128_1024_7a[] = { @@ -48,32 +48,6 @@ static encode_aux_threshmatch _vq_auxt_res0_128_1024_7a = { 3 }; -static long _vq_pigeonmap_res0_128_1024_7a[] = { - 0, 0, -}; - -static long _vq_fitlist_res0_128_1024_7a[] = { - 0, 1, 2, 9, 10, 11, 18, 19, - 20, -}; - -static long _vq_fitmap_res0_128_1024_7a[] = { - 0, -}; - -static long _vq_fitlength_res0_128_1024_7a[] = { - 9, -}; - -static encode_aux_pigeonhole _vq_auxp_res0_128_1024_7a = { - -1, 1, 2, 1, - _vq_pigeonmap_res0_128_1024_7a, - 9, - _vq_fitlist_res0_128_1024_7a, - _vq_fitmap_res0_128_1024_7a, - _vq_fitlength_res0_128_1024_7a -}; - static static_codebook _vq_book_res0_128_1024_7a = { 4, 81, _vq_lengthlist_res0_128_1024_7a, @@ -81,7 +55,7 @@ static static_codebook _vq_book_res0_128_1024_7a = { _vq_quantlist_res0_128_1024_7a, NULL, &_vq_auxt_res0_128_1024_7a, - &_vq_auxp_res0_128_1024_7a, + NULL, 0 }; diff --git a/lib/books/res0_128_1024_8.vqh b/lib/books/res0_128_1024_8.vqh index 93c130ea..7367e89e 100644 --- a/lib/books/res0_128_1024_8.vqh +++ b/lib/books/res0_128_1024_8.vqh @@ -31,12 +31,12 @@ static long _vq_quantlist_res0_128_1024_8[] = { }; static long _vq_lengthlist_res0_128_1024_8[] = { - 1, 3, 4, 6, 6, 8, 8,10,10, 5, 5, 5, 7, 7, 9, 9, - 11,11, 6, 5, 5, 7, 7, 9, 9,11,11, 0, 7, 7, 8, 8, - 10,10,11,12, 0, 8, 8, 8, 8,10,10,12,12, 0,12,12, - 9, 9,11,11,12,12, 0,13,13,10, 9,11,11,12,12, 0, - 0, 0,11,11,11,11,13,13, 0, 0, 0,12,12,11,11,13, - 13, + 1, 4, 4, 7, 7, 9,10,11,11, 5, 4, 4, 7, 7,10,10, + 11,11, 6, 5, 5, 7, 6, 9, 9,10,10, 0, 8, 7, 7, 7, + 9, 9,12,11, 0, 8, 8, 8, 8, 9, 9,10,10, 0,13,14, + 9, 9, 9, 9,10,10, 0,14,13,10,11,11,11,10,10, 0, + 0, 0,12,12,10,11,10,10, 0, 0, 0,12,13,12,12,12, + 12, }; static float _vq_quantthresh_res0_128_1024_8[] = { diff --git a/lib/books/res0_128_1024_8a.vqh b/lib/books/res0_128_1024_8a.vqh index 7c6396dd..a38676c0 100644 --- a/lib/books/res0_128_1024_8a.vqh +++ b/lib/books/res0_128_1024_8a.vqh @@ -27,8 +27,8 @@ static long _vq_quantlist_res0_128_1024_8a[] = { }; static long _vq_lengthlist_res0_128_1024_8a[] = { - 2, 4, 4, 5, 5, 7, 5, 5, 5, 5, 7, 4, 4, 5, 5, 7, - 5, 5, 5, 5, 7, 6, 6, 5, 5, + 3, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, 4, 4, 5, 5, 6, + 5, 5, 5, 5, 6, 6, 6, 5, 4, }; static float _vq_quantthresh_res0_128_1024_8a[] = { diff --git a/lib/books/res0_128_1024_9.vqh b/lib/books/res0_128_1024_9.vqh index 511495a6..2a22c314 100644 --- a/lib/books/res0_128_1024_9.vqh +++ b/lib/books/res0_128_1024_9.vqh @@ -19,56 +19,51 @@ #include "codebook.h" static long _vq_quantlist_res0_128_1024_9[] = { - 6, 5, - 7, 4, - 8, + 6, 3, - 9, + 7, 2, - 10, + 8, 1, - 11, + 9, 0, - 12, + 10, }; static long _vq_lengthlist_res0_128_1024_9[] = { - 1, 3, 3, 7, 7,12,11,14,14,17,17,16,16, 5, 4, 5, - 9, 9,14,13,16,13,15,15,15,16, 6, 5, 5, 9, 9,15, - 12,14,15,15,15,16,16,16, 8, 8,11,11,15,15,15,14, - 16,16,16,16,16, 9, 9,11,10,15,15,16,16,15,16,15, - 16,16,12,13,10,10,15,16,16,16,16,16,16,16,16,14, - 13,11,11,15,16,16,16,16,16,16,16,16,16,16,12,11, - 14,14,15,16,16,16,16,16,16,16,16,11,12,14,15,16, - 16,16,16,16,16,16,16,16,15,14,14,14,14,15,16,16, - 16,16,16,16,16,16,14,13,14,16,15,16,16,16,16,16, - 16,16,16,16,16,16,14,15,16,16,16,16,16,16,16,16, - 16,16,16,15,16,15,16,16,16, + 1, 4, 4,12,12,12,12,12,12,12,12, 4, 5, 4,12,12, + 12,12,12,12,12,12, 3, 5, 5,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, + 12,12,12,12,12,12,12,12,12,11,11,11,11,11,11,11, + 11,11,11,11,11,11,11,11,11, }; static float _vq_quantthresh_res0_128_1024_9[] = { - -148.5, -121.5, -94.5, -67.5, -40.5, -13.5, 13.5, 40.5, - 67.5, 94.5, 121.5, 148.5, + -760.5, -591.5, -422.5, -253.5, -84.5, 84.5, 253.5, 422.5, + 591.5, 760.5, }; static long _vq_quantmap_res0_128_1024_9[] = { - 11, 9, 7, 5, 3, 1, 0, 2, - 4, 6, 8, 10, 12, + 9, 7, 5, 3, 1, 0, 2, 4, + 6, 8, 10, }; static encode_aux_threshmatch _vq_auxt_res0_128_1024_9 = { _vq_quantthresh_res0_128_1024_9, _vq_quantmap_res0_128_1024_9, - 13, - 13 + 11, + 11 }; static static_codebook _vq_book_res0_128_1024_9 = { - 2, 169, + 2, 121, _vq_lengthlist_res0_128_1024_9, - 1, -520863744, 1620770816, 4, 0, + 1, -516265984, 1626677248, 4, 0, _vq_quantlist_res0_128_1024_9, NULL, &_vq_auxt_res0_128_1024_9, diff --git a/lib/books/res0_128_1024_9a.vqh b/lib/books/res0_128_1024_9a.vqh index a823789e..8bd33663 100644 --- a/lib/books/res0_128_1024_9a.vqh +++ b/lib/books/res0_128_1024_9a.vqh @@ -19,46 +19,56 @@ #include "codebook.h" static long _vq_quantlist_res0_128_1024_9a[] = { + 6, + 5, + 7, 4, + 8, 3, - 5, + 9, 2, - 6, + 10, 1, - 7, + 11, 0, - 8, + 12, }; static long _vq_lengthlist_res0_128_1024_9a[] = { - 1, 4, 4, 6, 6, 7, 7, 8, 8, 5, 5, 5, 7, 7, 8, 8, - 8, 8, 9, 5, 6, 7, 7, 8, 8, 8, 8,10, 8, 7, 8, 8, - 9, 9, 9, 8,10, 8, 8, 8, 8, 9, 9, 9, 9,10,10, 9, - 9, 9, 9, 9, 9, 9,10,10,10, 8, 9, 9, 9, 9, 9,10, - 10,10, 9,10, 9, 9, 9, 9,10,10,10, 9, 9, 9, 9, 9, - 9, + 1, 5, 5, 7, 7, 9, 9,10,10,11,11,11,10, 6, 4, 5, + 7, 7, 9, 9,10,10,11,11,11,11, 7, 5, 5, 7, 7, 8, + 8,10,10,11,10,11,11,16, 7, 7, 6, 6, 8, 8,10,10, + 11,11,11,11,15, 8, 8, 7, 7, 9, 8, 9,10,11,11,11, + 11,16,12,11, 8, 8, 8, 8,10, 9,10,10,12,11,16,12, + 12, 8, 8, 9, 9,10,10,11,11,11,11,16,16,16,10,10, + 9, 9, 9, 9,10,10,10,10,15,15,16,10,10, 9,10,10, + 10,10,11,11,11,16,16,16,13,14,10,10,10,10,10,10, + 10,10,16,15,16,13,13,10,10,10,10,10,10,11,11,16, + 14,15,15,16,11,11,10,10,10,10,10,10,16,16,16,15, + 16,12,12,10,10,10,10,10,10, }; static float _vq_quantthresh_res0_128_1024_9a[] = { - -10.5, -7.5, -4.5, -1.5, 1.5, 4.5, 7.5, 10.5, + -71.5, -58.5, -45.5, -32.5, -19.5, -6.5, 6.5, 19.5, + 32.5, 45.5, 58.5, 71.5, }; static long _vq_quantmap_res0_128_1024_9a[] = { - 7, 5, 3, 1, 0, 2, 4, 6, - 8, + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, }; static encode_aux_threshmatch _vq_auxt_res0_128_1024_9a = { _vq_quantthresh_res0_128_1024_9a, _vq_quantmap_res0_128_1024_9a, - 9, - 9 + 13, + 13 }; static static_codebook _vq_book_res0_128_1024_9a = { - 2, 81, + 2, 169, _vq_lengthlist_res0_128_1024_9a, - 1, -529006592, 1614282752, 4, 0, + 1, -523010048, 1618608128, 4, 0, _vq_quantlist_res0_128_1024_9a, NULL, &_vq_auxt_res0_128_1024_9a, diff --git a/lib/books/res0_128_1024_9b.vqh b/lib/books/res0_128_1024_9b.vqh index 6c5dd861..31629367 100644 --- a/lib/books/res0_128_1024_9b.vqh +++ b/lib/books/res0_128_1024_9b.vqh @@ -19,39 +19,56 @@ #include "codebook.h" static long _vq_quantlist_res0_128_1024_9b[] = { + 6, + 5, + 7, + 4, + 8, + 3, + 9, + 2, + 10, 1, + 11, 0, - 2, + 12, }; static long _vq_lengthlist_res0_128_1024_9b[] = { - 3, 5, 5, 7, 6, 6, 7, 5, 6, 5, 6, 6, 7, 7, 7, 7, - 7, 6, 5, 6, 6, 7, 7, 7, 7, 7, 6, 7, 7, 8, 8, 8, - 8, 8, 7, 7, 6, 7, 7, 8, 7, 7, 8, 7, 7, 6, 7, 7, - 7, 7, 7, 8, 6, 6, 7, 7, 7, 8, 8, 8, 8, 7, 7, 6, - 6, 6, 7, 7, 7, 7, 6, 6, 6, 6, 6, 7, 7, 7, 7, 6, - 6, + 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 5, + 6, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 6, 6, 7, 6, 7, + 7, 8, 8, 8, 8, 8, 8, 9, 6, 6, 7, 7, 7, 7, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 9, 8, 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, + 8, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 7, 7, + 7, 7, 8, 7, 7, 7, 8, 8, 9, 9, 8, 8, 8, 7, 7, 8, + 8, 7, 7, 8, 8, 8, 8, 8, 9, 9, 8, 8, 8, 8, 8, 7, + 8, 7, 9, 8, 8, 8, 9, 8, 8, 7, 7, 7, 8, 7, 8, 8, + 8, 8, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 9, 9, 8, 9, + 9, 9, 8, 8, 8, 7, 7, 7, 7, }; static float _vq_quantthresh_res0_128_1024_9b[] = { - -0.5, 0.5, + -5.5, -4.5, -3.5, -2.5, -1.5, -0.5, 0.5, 1.5, + 2.5, 3.5, 4.5, 5.5, }; static long _vq_quantmap_res0_128_1024_9b[] = { - 1, 0, 2, + 11, 9, 7, 5, 3, 1, 0, 2, + 4, 6, 8, 10, 12, }; static encode_aux_threshmatch _vq_auxt_res0_128_1024_9b = { _vq_quantthresh_res0_128_1024_9b, _vq_quantmap_res0_128_1024_9b, - 3, - 3 + 13, + 13 }; static static_codebook _vq_book_res0_128_1024_9b = { - 4, 81, + 2, 169, _vq_lengthlist_res0_128_1024_9b, - 1, -535822336, 1611661312, 2, 0, + 1, -531103744, 1611661312, 4, 0, _vq_quantlist_res0_128_1024_9b, NULL, &_vq_auxt_res0_128_1024_9b, diff --git a/lib/books/res0_128_1024aux.vqh b/lib/books/res0_128_1024aux.vqh index dbe96b8f..5c2d33c5 100644 --- a/lib/books/res0_128_1024aux.vqh +++ b/lib/books/res0_128_1024aux.vqh @@ -20,13 +20,13 @@ #include "codebook.h" static long _huff_lengthlist_res0_128_1024aux[] = { - 4, 9, 6, 9, 9,11, 8,13,10,13, 8, 3,20,20,20,20, - 20,20, 6,10, 6,20, 4, 4, 5, 7, 6,11,11,18, 9,20, - 4, 3, 5, 5, 7,11,13,20, 9,20, 5, 5, 6, 7, 7,12, - 13,20,11,20, 7, 5, 7, 6, 8,12,16,20, 8,20, 6, 7, - 6, 8, 7,12,12,20,13,20,11,11,12,12,12,13,17,19, - 9, 5,10,13,12,15,12,16, 5, 8,12, 7,16,18,19,19, - 17,19, 7, 9, + 13,10,11,11,14,12,14,15,14,15, 9, 2,15,15,15,15, + 15,15, 7, 9,11,15, 9, 7,10, 8,10,11,15,15,11,15, + 7, 3, 7, 4, 7, 6,13,15,14,15,10, 7,11, 8,11, 9, + 15,15,10,15, 8, 4, 8, 3, 7, 5,13,15,14,15,10, 7, + 10, 7, 9, 9,13,15,13,15,10, 6,10, 5, 8, 7,12,15, + 12, 5,13,13,15,13,12,12, 6, 7,15, 7,15,15,15,15, + 15,15, 5, 4, }; static static_codebook _huff_book_res0_128_1024aux = { diff --git a/lib/books/res0_128_128aux.vqh b/lib/books/res0_128_128aux.vqh index 5b9a4ba9..975ccb05 100644 --- a/lib/books/res0_128_128aux.vqh +++ b/lib/books/res0_128_128aux.vqh @@ -20,13 +20,13 @@ #include "codebook.h" static long _huff_lengthlist_res0_128_128aux[] = { - 6, 9, 5, 7, 9, 9,10,12,13,13, 9, 3,17,17,17,17, - 17,17,10,15, 5,17, 2, 3, 6, 5, 8, 9,12,17, 7,17, - 4, 4, 8, 6,10,10,15,17, 8,17, 6, 7,10, 9,12,11, - 15,15, 9,17, 5, 6, 9, 6,10, 9,13,16,10,17, 9,10, - 11,10,12,10,15,16,10,17, 9,10,12,10,11,10,14,14, - 11, 4,13,16,15,16,14,13, 9,13,14, 6,15,17,16,17, - 14,16,10,12, + 7,11, 7, 7,11, 8,12,10,12,11, 9, 3,11,11,11,11, + 11,11, 8,11, 8,11, 6, 5,10, 6,11, 8,11,11, 6,11, + 4, 2, 8, 4,11, 7,11,11,11,11,11, 8,11, 9,11,11, + 11,11, 8,11, 6, 3,10, 4,10, 7,11,11,10,11,11,10, + 10, 9,11,11,11,11,11,11, 9, 7,10, 6,10, 8,11,11, + 11, 4,11,11,11,11,11,11, 9,11,11, 6,11,11,11,11, + 11,11,10,11, }; static static_codebook _huff_book_res0_128_128aux = { diff --git a/lib/modes/mode_A.h b/lib/modes/mode_A.h index 51269f3d..4e9a6ac3 100644 --- a/lib/modes/mode_A.h +++ b/lib/modes/mode_A.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_A.h,v 1.14.4.5.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: mode_A.h,v 1.14.4.5.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -78,27 +78,41 @@ static vorbis_info_psy_global _psy_set_AG={ 0, }; +static vp_couple_pass _psy_passA0[]={ + {1.f,1.f, { {9999, {9e10f,0.f}, {0.f,0.f}, {0.f,0.f}, {0.f,0.f}}, + {9999, {0.f,0.f}, {0.f,0.f}, {9e10f,10.f}, {0.f,0.f}} }, + } +}; + +static vp_couple_pass _psy_passA[]={ + {1.f,1.f, { {9999, {9e10f,0.f}, {0.f,0.f}, {0.f,0.f}, {0.f,0.f}}, + {9999, {0.f,0.f}, {0.f,0.f}, {9e10f,10.f}, {0.f,0.f}} }, + } +}; + static vorbis_info_psy _psy_set_A0={ ATH_Bark_dB_lineaggressive, -100., -140., + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ - 1,/* tonemaskp */ + 1,/* tonemaskp */ + 0.f, /* tone master att dB */ /* 0 10 20 30 40 50 60 70 80 90 100 */ { - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*88*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*125*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*175*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*250*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*350*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/ - {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ @@ -115,23 +129,25 @@ static vorbis_info_psy _psy_set_A0={ }, 1,/* peakattp */ - {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*63*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*88*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*125*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*175*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*250*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*350*/ - {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-32.f,-32.f},/*500*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-26.f,-26.f,-26.f},/*700*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.f},/*1000*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*1400*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2000*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*2400*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-22.f,-22.f},/*4000*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-22.f,-22.f},/*5600*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-22.f,-22.f},/*8000*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-22.f,-22.f},/*11500*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-21.f,-22.f},/*16000*/ + {{-10.f,-14.f,-26.f,-28.f,-30.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*1400*/ + + {-20.f,-20.f,-26.f,-30.f,-32.f,-34.f,-36.f,-36.f,-38.f,-40.f,-40.f},/*2000*/ + {-20.f,-20.f,-26.f,-30.f,-32.f,-34.f,-36.f,-36.f,-38.f,-40.f,-40.f},/*2400*/ + + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*4000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*5600*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*8000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*11500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ @@ -153,17 +169,17 @@ static vorbis_info_psy _psy_set_A0={ .500f, 0.f,/*1400*/ .500f, 0.f,/*2000*/ .500f, 0.f,/*2800*/ - .700f, 0.f,/*4000*/ + .500f, 0.f,/*4000*/ .700f, 0.f,/*5600*/ .850f, 0.f,/*8000*/ .900f, 0.f,/*11500*/ .900f, 0.f,/*16000*/ }, - 90.f, /* even decade + 5 is important; saves an rint() later in a + 105.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -26., - + 1, + _psy_passA0 }; static vorbis_info_psy _psy_set_A={ @@ -171,16 +187,19 @@ static vorbis_info_psy _psy_set_A={ -100.f, -140.f, + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { - {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/ - {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/ - {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ @@ -202,23 +221,25 @@ static vorbis_info_psy _psy_set_A={ }, 1,/* peakattp */ - {{-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*63*/ - {-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*88*/ - {-14.f,-16.f,-18.f,-19.f,-24.f,-30.f,-30.f,-30.f,-30.f,-30.f,-32.f},/*125*/ - {-10.f,-10.f,-10.f,-10.f,-16.f,-20.f,-26.f,-30.f,-30.f,-30.f,-32.f},/*175*/ - {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-26.f,-30.f,-30.f,-32.f},/*250*/ - {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-26.f},/*350*/ - {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-26.f},/*500*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*700*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*1000*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*1400*/ - {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*2000*/ - {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*2400*/ - {-10.f,-10.f,-10.f,-12.f,-16.f,-16.f,-16.f,-20.f,-22.f,-24.f,-26.f},/*4000*/ - {-10.f,-10.f,-10.f,-12.f,-12.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*5600*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*8000*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-14.f,-16.f,-18.f,-22.f,-24.f,-26.f},/*11500*/ - {-10.f,-10.f,-10.f,-10.f,-10.f,-12.f,-16.f,-18.f,-22.f,-24.f,-24.f},/*16000*/ + {{-10.f,-14.f,-26.f,-28.f,-30.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-32.f,-32.f,-32.f,-40.f,-40.f},/*1400*/ + + {-20.f,-20.f,-26.f,-30.f,-32.f,-34.f,-36.f,-36.f,-38.f,-40.f,-40.f},/*2000*/ + {-20.f,-20.f,-26.f,-30.f,-32.f,-34.f,-36.f,-36.f,-38.f,-40.f,-40.f},/*2400*/ + + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*4000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*5600*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*8000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*11500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-26.f,-30.f,-30.f,-32.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ @@ -228,29 +249,29 @@ static vorbis_info_psy _psy_set_A={ 10, 10, -1, - {.300f, 0.f, /*63*/ - .300f, 0.f, /*88*/ - .300f, 0.f, /*125*/ - .300f, 0.f, /*175*/ - .400f, 0.f, /*250*/ - .400f, 0.f, /*350*/ - .400f, 0.f, /*500*/ - .400f, 0.f, /*700*/ - .300f, 0.f, /*1000*/ - .300f, 0.f, /*1400*/ + {.000f, 0.f, /*63*/ + .000f, 0.f, /*88*/ + .000f, 0.f, /*125*/ + .000f, 0.f, /*175*/ + .000f, 0.f, /*250*/ + .000f, 0.f, /*350*/ + .000f, 0.f, /*500*/ + .000f, 0.f, /*700*/ + .000f, 0.f, /*1000*/ + .000f, 0.f, /*1400*/ .300f, 0.f, /*2000*/ .300f, 0.f, /*2800*/ - .700f, 0.f, /*4000*/ + .500f, 0.f, /*4000*/ .850f, 0.f, /*5600*/ .900f, 0.f, /*8000*/ .900f, 0.f, /*11500*/ .900f, 1.f, /*16000*/ }, - 95.f, /* even decade + 5 is important; saves an rint() later in a + 105.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -28., - + 1, + _psy_passA }; /* with GNUisms, this could be short and readable. Oh well */ @@ -327,7 +348,8 @@ static vorbis_info_residue0 _residue_set0A={0,192,12,10,23, {.7f,7.5f,1.5f,1.5f,2.5f,2.5f, 7.5f,7.5f,22.5f}, {0}, - {99,4,99,99,99,99,99,99,99,99}}; + {99,4,99,99,99,99,99,99,99,99}, + {3}}; static vorbis_info_residue0 _residue_set1A={0,1408, 32,10,24, {0,1,1,1,1,1,3,3,3,7}, @@ -345,11 +367,12 @@ static vorbis_info_residue0 _residue_set1A={0,1408, 32,10,24, {.7f,7.5f,1.5f,1.5f,2.5f,2.5f, 7.5f,7.5f,22.5f}, {0}, - {99,12,99,99,99,99,99,99,99,99}}; + {99,18,99,99,99,99,99,99,99,99}, + {3}}; -static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, {0}, +static vorbis_info_mapping0 _mapping_set0A={1, {0,0}, {0}, {0}, {0}, 0, 1,{0},{1}}; -static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, {1}, +static vorbis_info_mapping0 _mapping_set1A={1, {0,0}, {0}, {1}, {1}, 1, 1,{0},{1}}; static vorbis_info_mode _mode_set0A={0,0,0,0}; static vorbis_info_mode _mode_set1A={1,0,0,1}; diff --git a/lib/modes/mode_B.h b/lib/modes/mode_B.h index cfa10ba5..416194bb 100644 --- a/lib/modes/mode_B.h +++ b/lib/modes/mode_B.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_B.h,v 1.14.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: mode_B.h,v 1.14.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -22,43 +22,74 @@ #include "vorbis/codec.h" #include "backends.h" -#include "books/lsp12_0.vqh" -#include "books/lsp30_0.vqh" -#include "books/lsp12_1.vqh" -#include "books/lsp30_1.vqh" - -#include "books/res0_160_128aux.vqh" -#include "books/res0_160_1024aux.vqh" - -#include "books/res0_160_128_1.vqh" -#include "books/res0_160_128_2.vqh" -#include "books/res0_160_128_3.vqh" -#include "books/res0_160_128_4.vqh" -#include "books/res0_160_128_5.vqh" - -#include "books/res0_160_1024_1.vqh" -#include "books/res0_160_1024_2.vqh" -#include "books/res0_160_1024_3.vqh" -#include "books/res0_160_1024_4.vqh" -#include "books/res0_160_1024_5.vqh" -#include "books/res0_160_1024_6.vqh" -#include "books/res0_160_1024_7.vqh" -#include "books/res0_160_1024_8.vqh" -#include "books/res0_160_1024_9.vqh" - +#include "books/line0_class1.vqh" +#include "books/line0_class2.vqh" +#include "books/line1_class0.vqh" +#include "books/line1_class1.vqh" +#include "books/line1_class2.vqh" +#include "books/line1_class3.vqh" + +#include "books/line0_0sub0.vqh" +#include "books/line0_1sub1.vqh" +#include "books/line0_1sub2.vqh" +#include "books/line0_1sub3.vqh" +#include "books/line0_2sub1.vqh" +#include "books/line0_2sub2.vqh" +#include "books/line0_2sub3.vqh" + +#include "books/line1_0sub0.vqh" +#include "books/line1_0sub1.vqh" +#include "books/line1_1sub0.vqh" +#include "books/line1_1sub1.vqh" +#include "books/line1_2sub1.vqh" +#include "books/line1_2sub2.vqh" +#include "books/line1_2sub3.vqh" +#include "books/line1_3sub1.vqh" +#include "books/line1_3sub2.vqh" +#include "books/line1_3sub3.vqh" + +#include "books/res0_128_128aux.vqh" +#include "books/res0_128_1024aux.vqh" + +#include "books/res0_128_1024_1.vqh" +#include "books/res0_128_1024_2.vqh" +#include "books/res0_128_1024_3.vqh" +#include "books/res0_128_1024_4.vqh" +#include "books/res0_128_1024_5.vqh" +#include "books/res0_128_1024_6.vqh" +#include "books/res0_128_1024_6a.vqh" +#include "books/res0_128_1024_7.vqh" +#include "books/res0_128_1024_7a.vqh" +#include "books/res0_128_1024_8.vqh" +#include "books/res0_128_1024_8a.vqh" +#include "books/res0_128_1024_9.vqh" +#include "books/res0_128_1024_9a.vqh" +#include "books/res0_128_1024_9b.vqh" + + +static vorbis_info_psy_global _psy_set_BG={ + 0, /* decaydBpms */ + 8, /* lines per eighth octave */ + + /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */ + 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f, + -6.f, + + 0, +}; static vorbis_info_psy _psy_set_B0={ ATH_Bark_dB_lineaggressive, -100., -140., - - + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/ @@ -70,35 +101,38 @@ static vorbis_info_psy _psy_set_B0={ {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/ {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/ - {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/ - {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/ - {-30.,-35.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/ - {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ + {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/ + {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ + + {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ + {-30.f,-30.f,-33.f,-35.f,-35.f,-45.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*11500*/ + {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-90.f,-100.f}, /*16000*/ + + }, 1,/* peakattp */ - {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/ + {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1400*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2800*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*4000*/ + {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*5600*/ + {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*8000*/ + {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*11500*/ + {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ @@ -115,21 +149,25 @@ static vorbis_info_psy _psy_set_B0={ .000f, 0.f,/*250*/ .000f, 0.f,/*350*/ .000f, 0.f,/*500*/ - .300f, 0.f,/*700*/ + .200f, 0.f,/*700*/ .500f, 0.f,/*1000*/ .500f, 0.f,/*1400*/ .500f, 0.f,/*2000*/ .500f, 0.f,/*2800*/ - .600f, 0.f,/*4000*/ + .500f, 0.f,/*4000*/ .700f, 0.f,/*5600*/ - .800f, 0.f,/*8000*/ - .800f, 0.f,/*11500*/ - .800f, 0.f,/*16000*/ + .850f, 0.f,/*8000*/ + .900f, 0.f,/*11500*/ + .900f, 0.f,/*16000*/ }, - 95.f, /* even decade + 5 is important; saves an rint() later in a + 90.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -26., + -44., + + 12, + NULL,NULL + }; static vorbis_info_psy _psy_set_B={ @@ -137,63 +175,65 @@ static vorbis_info_psy _psy_set_B={ -100.f, -140.f, + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/ {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/ {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/ - - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ + {-30.f,-30.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ - {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ - {-35.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/ - {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/ + {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ + + {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ + {-30.f,-30.f,-33.f,-35.f,-40.f,-45.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*11500*/ + {-24.f,-24.f,-26.f,-32.f,-32.f,-42.f,-50.f,-60.f,-70.f,-85.f,-100.f}, /*16000*/ }, 1,/* peakattp */ - {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*63*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*88*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-26.f,-26.f,-26.f,-26.f,-26.f},/*125*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*175*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*250*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*350*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-26.f,-26.f,-26.f},/*500*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*700*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-26.f,-26.f,-26.f},/*1000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*1400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*2400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-26.f,-26.f,-26.f},/*4000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-26.f,-26.f,-26.f},/*5600*/ - {-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*8000*/ - {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-26.f},/*11500*/ - {-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-26.f},/*16000*/ + {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1400*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2800*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*4000*/ + {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*5600*/ + {-10.f,-12.f,-14.f,-16.f,-16.f,-20.f,-24.f,-30.f,-32.f,-40.f,-40.f},/*8000*/ + {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*11500*/ + {-10.f,-10.f,-10.f,-12.f,-14.f,-18.f,-22.f,-28.f,-32.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ - -28.f, /* suppress any noise curve over maxspec+n */ + -10.f, /* suppress any noise curve over maxspec+n */ .5f, /* low window */ .5f, /* high window */ + 10, + 10, 25, - 25, - 40, {.000f, 0.f, /*63*/ .000f, 0.f, /*88*/ .000f, 0.f, /*125*/ @@ -202,51 +242,123 @@ static vorbis_info_psy _psy_set_B={ .000f, 0.f, /*350*/ .000f, 0.f, /*500*/ .000f, 0.f, /*700*/ - .200f, 0.f, /*1000*/ + .000f, 0.f, /*1000*/ .300f, 0.f, /*1400*/ .300f, 0.f, /*2000*/ .300f, 0.f, /*2800*/ - .700f, 0.f, /*4000*/ + .500f, 0.f, /*4000*/ .700f, 0.f, /*5600*/ - .750f, 0.f, /*8000*/ - .750f, 0.f, /*11500*/ - .800f, 0.f, /*16000*/ + .850f, 0.f, /*8000*/ + .900f, 0.f, /*11500*/ + .900f, 1.f, /*16000*/ }, - 105.f, /* even decade + 5 is important; saves an rint() later in a + 95.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -30., + -44., + 32, + NULL,NULL }; /* with GNUisms, this could be short and readable. Oh well */ static vorbis_info_time0 _time_set0B={0}; -static vorbis_info_floor0 _floor_set0B={12, 44100, 64, 10,130, 2, {0,1}, - 0.199f, .285f}; -static vorbis_info_floor0 _floor_set1B={30, 44100, 256, 12,150, 2, {2,3}, - .082f, .126f}; -static vorbis_info_residue0 _residue_set0B={0,96,16,6,4, - {0,1,1,1,1,1}, - {6,7,8,9,10}, - - {0,99999,9999,9999,9999}, - {999.f,1.5f,3.5f,15.5f,26.5f}, - {4,4,4,4,4}, - {99,99,99,99,99}}; - -static vorbis_info_residue0 _residue_set1B={0, 960, 32,10,5, - {0,1,1,1,1,1,1,1,1,1}, - {11,12,13,14,15,16,17,18,19}, - - {0,8,9999,16,9999, - 24,9999,9999,9999}, - {999.f,1.5f,1.5f,2.5f,2.5f, - 6.5f,6.5f,12.5f,22.5f}, - {5,5,5,5,5,5,5,5,5}, - {99,99,99,99,99,99,99,99,99}}; - -static vorbis_info_mapping0 _mapping_set0B={1, {0,0}, {0}, {0}, {0}, {0}}; -static vorbis_info_mapping0 _mapping_set1B={1, {0,0}, {0}, {1}, {1}, {1}}; +/*static vorbis_info_floor0 _floor_set0A={9, 44100, 64, 10,130, 2, {0,1}, + 0.246f, .387f};*/ +/*static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3}, + .082f, .126f};*/ + +static vorbis_info_floor1 _floor_set0B={5, + {0,1,1,2,2}, + + {1,3,3}, + {0,2,2}, + {-1,0,1}, + {{2},{-1,3,4,5},{-1,6,7,8}}, + + 4, + + {0,128, + + 26,7,48, + + 2,1,4, 18,13,22, + 35,30,41, 69,57,84}, + + 80,30,400, + 999,999,0,18., + 8,70, + 108}; + +static vorbis_info_floor1 _floor_set1B={10, + {0,1,2,2,2,2,2, 3,3,3}, + + {3,4,3,3}, + {1,1,2,2}, + {9,10,11,12}, + {{13,14}, + {15,16}, + {-1,17,18,19}, + {-1,20,21,22}, + }, + + 2, + {0,1024, + + 88,31,243, + + 14,54,143,460, + + 6,3,10, 22,18,26, 41,36,47, + 69,61,78, 112,99,126, 185,162,211, + 329,282,387, 672,553,825 + }, + + 60,30,400, + 20,8,1,18., + 20,600, + 864}; + +static vorbis_info_residue0 _residue_set0B={0,216,12,10,23, + {0,1,1,1,1,1,3,3,3,7}, + {25,26, + 27, + 28, + 29, + 30, + 31,32, + 33,34, + 35,36, + 37,38}, + {9999,9999,3,9999,4,9999,8, + 9999,9999,9999}, + {.7f,7.5f,1.5f,1.5f,2.5f,2.5f, + 7.5f,7.5f,22.5f}, + {0}, + {99,4,99,99,99,99,99,99,99,99}}; + +static vorbis_info_residue0 _residue_set1B={0,1728, 32,10,24, + {0,1,1,1,1,1,3,3,3,7}, + {25,26, + 27, + 28, + 29, + 30, + 31,32, + 33,34, + 35,36, + 37,38}, + {9999,9999,5,9999,10,9999,20, + 9999,9999,9999}, + {.7f,7.5f,1.5f,1.5f,2.5f,2.5f, + 7.5f,7.5f,22.5f}, + {0}, + {99,18,99,99,99,99,99,99,99,99}}; + +static vorbis_info_mapping0 _mapping_set0B={1, {0,0}, {0}, {0}, {0}, 0, + 1,{0},{1}}; +static vorbis_info_mapping0 _mapping_set1B={1, {0,0}, {0}, {1}, {1}, 1, + 1,{0},{1}}; static vorbis_info_mode _mode_set0B={0,0,0,0}; static vorbis_info_mode _mode_set1B={1,0,0,1}; @@ -256,7 +368,7 @@ codec_setup_info info_B={ /* smallblock, largeblock */ {256, 2048}, /* modes,maps,times,floors,residues,books,psys */ - 2, 2, 1, 2, 2, 20, 2, + 2, 2, 1, 2, 2, 39, 2, /* modes */ {&_mode_set0B,&_mode_set1B}, /* maps */ @@ -264,37 +376,61 @@ codec_setup_info info_B={ /* times */ {0,0},{&_time_set0B}, /* floors */ - {0,0},{&_floor_set0B,&_floor_set1B}, + {1,1},{&_floor_set0B,&_floor_set1B}, /* residue */ - {0,0},{&_residue_set0B,&_residue_set1B}, + {2,2},{&_residue_set0B,&_residue_set1B}, /* books */ - {&_vq_book_lsp12_0, /* 0 */ - &_vq_book_lsp12_1, /* 1 */ - &_vq_book_lsp30_0, /* 2 */ - &_vq_book_lsp30_1, /* 3 */ - - &_huff_book_res0_160_128aux, - &_huff_book_res0_160_1024aux, - - &_vq_book_res0_160_128_1, - &_vq_book_res0_160_128_2, - &_vq_book_res0_160_128_3, - &_vq_book_res0_160_128_4, - &_vq_book_res0_160_128_5, - - &_vq_book_res0_160_1024_1, - &_vq_book_res0_160_1024_2, - &_vq_book_res0_160_1024_3, - &_vq_book_res0_160_1024_4, - &_vq_book_res0_160_1024_5, - &_vq_book_res0_160_1024_6, - &_vq_book_res0_160_1024_7, - &_vq_book_res0_160_1024_8, - &_vq_book_res0_160_1024_9, + + { + &_huff_book_line0_class1, + &_huff_book_line0_class2, /* 1 */ + + &_huff_book_line0_0sub0, /* 2 */ + &_huff_book_line0_1sub1, /* 3 */ + &_huff_book_line0_1sub2, + &_huff_book_line0_1sub3, /* 5 */ + &_huff_book_line0_2sub1, + &_huff_book_line0_2sub2, /* 7 */ + &_huff_book_line0_2sub3, + + &_huff_book_line1_class0, + &_huff_book_line1_class1, /* 10 */ + &_huff_book_line1_class2, + &_huff_book_line1_class3, /* 12 */ + + &_huff_book_line1_0sub0, + &_huff_book_line1_0sub1, /* 14 */ + &_huff_book_line1_1sub0, + &_huff_book_line1_1sub1, + &_huff_book_line1_2sub1, + &_huff_book_line1_2sub2, /* 18 */ + &_huff_book_line1_2sub3, + &_huff_book_line1_3sub1, + &_huff_book_line1_3sub2, + &_huff_book_line1_3sub3, /* 22 */ + + &_huff_book_res0_128_128aux, + &_huff_book_res0_128_1024aux, + + &_vq_book_res0_128_1024_1, + &_vq_book_res0_128_1024_2, + &_vq_book_res0_128_1024_3, + &_vq_book_res0_128_1024_4, + &_vq_book_res0_128_1024_5, + &_vq_book_res0_128_1024_6, + &_vq_book_res0_128_1024_6a, + &_vq_book_res0_128_1024_7, + &_vq_book_res0_128_1024_7a, + &_vq_book_res0_128_1024_8, + &_vq_book_res0_128_1024_8a, + &_vq_book_res0_128_1024_9, + &_vq_book_res0_128_1024_9a, + &_vq_book_res0_128_1024_9b, }, /* psy */ {&_psy_set_B0,&_psy_set_B}, + &_psy_set_BG }; #endif diff --git a/lib/modes/mode_C.h b/lib/modes/mode_C.h index 56420e71..99706de2 100644 --- a/lib/modes/mode_C.h +++ b/lib/modes/mode_C.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_C.h,v 1.13.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: mode_C.h,v 1.13.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -22,43 +22,74 @@ #include "vorbis/codec.h" #include "backends.h" -#include "books/lsp12_0.vqh" -#include "books/lsp30_0.vqh" -#include "books/lsp12_1.vqh" -#include "books/lsp30_1.vqh" - -#include "books/res0_192_128aux.vqh" -#include "books/res0_192_1024aux.vqh" - -#include "books/res0_192_128_1.vqh" -#include "books/res0_192_128_2.vqh" -#include "books/res0_192_128_3.vqh" -#include "books/res0_192_128_4.vqh" -#include "books/res0_192_128_5.vqh" - -#include "books/res0_192_1024_1.vqh" -#include "books/res0_192_1024_2.vqh" -#include "books/res0_192_1024_3.vqh" -#include "books/res0_192_1024_4.vqh" -#include "books/res0_192_1024_5.vqh" -#include "books/res0_192_1024_6.vqh" -#include "books/res0_192_1024_7.vqh" -#include "books/res0_192_1024_8.vqh" -#include "books/res0_192_1024_9.vqh" - +#include "books/line0_class1.vqh" +#include "books/line0_class2.vqh" +#include "books/line1_class0.vqh" +#include "books/line1_class1.vqh" +#include "books/line1_class2.vqh" +#include "books/line1_class3.vqh" + +#include "books/line0_0sub0.vqh" +#include "books/line0_1sub1.vqh" +#include "books/line0_1sub2.vqh" +#include "books/line0_1sub3.vqh" +#include "books/line0_2sub1.vqh" +#include "books/line0_2sub2.vqh" +#include "books/line0_2sub3.vqh" + +#include "books/line1_0sub0.vqh" +#include "books/line1_0sub1.vqh" +#include "books/line1_1sub0.vqh" +#include "books/line1_1sub1.vqh" +#include "books/line1_2sub1.vqh" +#include "books/line1_2sub2.vqh" +#include "books/line1_2sub3.vqh" +#include "books/line1_3sub1.vqh" +#include "books/line1_3sub2.vqh" +#include "books/line1_3sub3.vqh" + +#include "books/res0_128_128aux.vqh" +#include "books/res0_128_1024aux.vqh" + +#include "books/res0_128_1024_1.vqh" +#include "books/res0_128_1024_2.vqh" +#include "books/res0_128_1024_3.vqh" +#include "books/res0_128_1024_4.vqh" +#include "books/res0_128_1024_5.vqh" +#include "books/res0_128_1024_5a.vqh" +#include "books/res0_128_1024_6.vqh" +#include "books/res0_128_1024_6a.vqh" +#include "books/res0_128_1024_7.vqh" +#include "books/res0_128_1024_7a.vqh" +#include "books/res0_128_1024_8.vqh" +#include "books/res0_128_1024_8a.vqh" +#include "books/res0_128_1024_8b.vqh" + + +static vorbis_info_psy_global _psy_set_CG={ + 0, /* decaydBpms */ + 8, /* lines per eighth octave */ + + /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */ + 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f, + -6.f, + + 0, +}; static vorbis_info_psy _psy_set_C0={ - ATH_Bark_dB_lineconservative, + ATH_Bark_dB_lineaggressive, -100., -140., - + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/ @@ -70,39 +101,40 @@ static vorbis_info_psy _psy_set_C0={ {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*500*/ {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*700*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/ - {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/ - {-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2800*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/ - {-35.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ + {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/ + {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/ + {-30.f,-30.f,-33.f,-35.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/ + }, 1,/* peakattp */ - {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*63*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*88*/ - {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-24.f,-24.f,-24.f,-24.f,-24.f},/*125*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*175*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*250*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*350*/ - {-14.f,-14.f,-14.f,-14.f,-16.f,-16.f,-20.f,-24.f,-24.f,-24.f,-24.f},/*500*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*700*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-24.f,-24.f,-24.f,-24.f},/*1000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*1400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*2400*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-16.f,-18.f,-24.f,-24.f,-24.f,-24.f},/*4000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-12.f,-20.f,-24.f,-24.f,-24.f},/*5600*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*8000*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f,-24.f},/*11500*/ - {-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-14.f,-20.f,-24.f,-24.f},/*16000*/ + {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1400*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2800*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*4000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*5600*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*8000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*11500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ - -20.f, /* suppress any noise curve over maxspec+n */ + -0.f, /* suppress any noise curve over maxspec+n */ .5f, /* low window */ .5f, /* high window */ 5, @@ -115,84 +147,88 @@ static vorbis_info_psy _psy_set_C0={ .000f, 0.f,/*250*/ .000f, 0.f,/*350*/ .000f, 0.f,/*500*/ - .200f, 0.f,/*700*/ - .300f, 0.f,/*1000*/ - .300f, 0.f,/*1400*/ - .300f, 0.f,/*2000*/ - .300f, 0.f,/*2800*/ - .500f, 0.f,/*4000*/ - .600f, 0.f,/*5600*/ - .700f, 0.f,/*8000*/ - .700f, 0.f,/*11500*/ - .700f, 1.f,/*16000*/ + .200f, -2.f,/*700*/ + .500f, -2.f,/*1000*/ + .500f, -2.f,/*1400*/ + .500f, -3.f,/*2000*/ + .500f, -6.f,/*2800*/ + .500f, -3.f,/*4000*/ + .700f, -4.f,/*5600*/ + .850f, -5.f,/*8000*/ + .900f, -4.f,/*11500*/ + .900f, -3.f,/*16000*/ }, - 105.f, /* even decade + 5 is important; saves an rint() later in a + 90.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -26., + -44., + + 12, + NULL,NULL }; static vorbis_info_psy _psy_set_C={ - ATH_Bark_dB_lineconservative, + ATH_Bark_dB_lineaggressive, + -100.f, -140.f, - + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/ {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*88*/ {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*125*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/ - - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1400*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2000*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*2800*/ {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/ - {-40.f,-40.f,-40.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*11500*/ + {-35.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*16000*/ }, - 1, - {{-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*63*/ - {-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*88*/ - {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f,-28.f,-28.f},/*125*/ - {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*175*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*250*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*350*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-28.f,-24.f,-28.f,-28.f,-28.f},/*500*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*700*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1000*/ - {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*1400*/ - {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2000*/ - {-20.f,-20.f,-20.f,-20.f,-24.f,-24.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*2800*/ - {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-24.f,-24.f,-28.f,-28.f,-28.f},/*4000*/ - {-20.f,-20.f,-20.f,-20.f,-22.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*5600*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*8000*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*11500*/ - {-20.f,-20.f,-20.f,-20.f,-20.f,-20.f,-22.f,-24.f,-28.f,-28.f,-28.f},/*16000*/ + 1,/* peakattp */ + {{-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*63*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*88*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*125*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*175*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*250*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*350*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*700*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*1400*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*2800*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*4000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*5600*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*8000*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*11500*/ + {-14.f,-20.f,-20.f,-20.f,-26.f,-32.f,-40.f,-40.f,-40.f,-40.f,-40.f},/*16000*/ }, 1,/*noisemaskp */ - -28.f, /* suppress any noise curve over maxspec+n */ + -00.f, /* suppress any noise curve over maxspec+n */ .5f, /* low window */ .5f, /* high window */ + 10, + 10, 25, - 25, - 40, {.000f, 0.f, /*63*/ .000f, 0.f, /*88*/ .000f, 0.f, /*125*/ @@ -201,51 +237,120 @@ static vorbis_info_psy _psy_set_C={ .000f, 0.f, /*350*/ .000f, 0.f, /*500*/ .000f, 0.f, /*700*/ - .200f, 0.f, /*1000*/ - .300f, 0.f, /*1400*/ - .300f, 0.f, /*2000*/ - .300f, 0.f, /*2800*/ - .300f, 0.f, /*4000*/ - .400f, 0.f, /*5600*/ - .600f, 0.f, /*8000*/ - .600f, 0.f, /*11500*/ - .650f, 0.f, /*16000*/ + .000f, 0.f, /*1000*/ + .300f,-4.f, /*1400*/ + .300f,-4.f, /*2000*/ + .300f,-4.f, /*2800*/ + .500f,-4.f, /*4000*/ + .700f,-4.f, /*5600*/ + .850f,-5.f, /*8000*/ + .900f,-5.f, /*11500*/ + .900f,-4.f, /*16000*/ }, - 105.f, /* even decade + 5 is important; saves an rint() later in a + 95.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ - -32., + -44., + 32,NULL,NULL }; /* with GNUisms, this could be short and readable. Oh well */ static vorbis_info_time0 _time_set0C={0}; -static vorbis_info_floor0 _floor_set0C={12, 44100, 64, 10,130, 2, {0,1}, - 0.199f, .285f}; -static vorbis_info_floor0 _floor_set1C={30, 44100, 256, 12,150, 2, {2,3}, - .082f, .126f}; -static vorbis_info_residue0 _residue_set0C={0,128,16,6,4, - {0,1,1,1,1,1}, - {6,7,8,9,10}, - - {0,99999,9999,9999,9999}, - {999.f,1.5f,3.5f,15.5f,26.5f}, - {4,4,4,4,4}, - {99,99,99,99,99}}; - -static vorbis_info_residue0 _residue_set1C={0, 960, 32,10,5, - {0,1,1,1,1,1,1,1,1,1}, - {11,12,13,14,15,16,17,18,19}, - - {0,8,9999,16,9999, - 24,9999,9999,9999}, - {999.f,1.5f,1.5f,2.5f,2.5f, - 6.5f,6.5f,14.5f,30.f}, - {5,5,5,5,5,5,5,5,5}, +/*static vorbis_info_floor0 _floor_set0A={9, 44100, 64, 10,130, 2, {0,1}, + 0.246f, .387f};*/ +/*static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3}, + .082f, .126f};*/ + +static vorbis_info_floor1 _floor_set0C={5, + {0,1,1,2,2}, + + {1,3,3}, + {0,2,2}, + {-1,0,1}, + {{2},{-1,3,4,5},{-1,6,7,8}}, + + 4, + + {0,128, + + 26,7,48, + + 2,1,4, 18,13,22, + 35,30,41, 69,57,84}, + + 80,30,400, + 999,999,0,18., + 8,70, + 128}; + +static vorbis_info_floor1 _floor_set1C={10, + {0,1,2,2,2,2,2, 3,3,3}, + + {3,4,3,3}, + {1,1,2,2}, + {9,10,11,12}, + {{13,14}, + {15,16}, + {-1,17,18,19}, + {-1,20,21,22}, + }, + + 2, + {0,1024, + + 88,31,243, + + 14,54,143,460, + + 6,3,10, 22,18,26, 41,36,47, + 69,61,78, 112,99,126, 185,162,211, + 329,282,387, 672,553,825 + }, + + 60,30,400, + 20,8,1,18., + 20,600, + 960}; + +static vorbis_info_residue0 _residue_set0C={0,240,12,9,23, + {0,1,1,1,1,3,3,3,7}, + {25, + 26, + 27, + 28, + 29,30, + 31,32, + 33,34, + 35,36,37}, + {9999,4,9999,10,9999,18, + 9999,9999,9999}, + {.5f,1.5f,1.5f,2.5f,2.5f, + 7.5f,7.5f,22.5f}, + {0}, + {99,99,99,99,99,99,99,99,99}}; + +static vorbis_info_residue0 _residue_set1C={0,1920, 32,9,24, + {0,1,1,1,1,3,3,3,7}, + {25, + 26, + 27, + 28, + 29,30, + 31,32, + 33,34, + 35,36,37}, + {9999,6,9999,24,9999,40, + 9999,9999,9999}, + {.5f,1.5f,1.5f,2.5f,2.5f, + 7.5f,7.5f,22.5f}, + {0}, {99,99,99,99,99,99,99,99,99}}; -static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, {0}}; -static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, {1}}; +static vorbis_info_mapping0 _mapping_set0C={1, {0,0}, {0}, {0}, {0}, 0, + 1,{0},{1}}; +static vorbis_info_mapping0 _mapping_set1C={1, {0,0}, {0}, {1}, {1}, 1, + 1,{0},{1}}; static vorbis_info_mode _mode_set0C={0,0,0,0}; static vorbis_info_mode _mode_set1C={1,0,0,1}; @@ -255,7 +360,7 @@ codec_setup_info info_C={ /* smallblock, largeblock */ {256, 2048}, /* modes,maps,times,floors,residues,books,psys */ - 2, 2, 1, 2, 2, 20, 2, + 2, 2, 1, 2, 2, 38, 2, /* modes */ {&_mode_set0C,&_mode_set1C}, /* maps */ @@ -263,37 +368,60 @@ codec_setup_info info_C={ /* times */ {0,0},{&_time_set0C}, /* floors */ - {0,0},{&_floor_set0C,&_floor_set1C}, + {1,1},{&_floor_set0C,&_floor_set1C}, /* residue */ - {0,0},{&_residue_set0C,&_residue_set1C}, + {2,2},{&_residue_set0C,&_residue_set1C}, /* books */ - {&_vq_book_lsp12_0, /* 0 */ - &_vq_book_lsp12_1, /* 1 */ - &_vq_book_lsp30_0, /* 2 */ - &_vq_book_lsp30_1, /* 3 */ - - &_huff_book_res0_192_128aux, - &_huff_book_res0_192_1024aux, - - &_vq_book_res0_192_128_1, - &_vq_book_res0_192_128_2, - &_vq_book_res0_192_128_3, - &_vq_book_res0_192_128_4, - &_vq_book_res0_192_128_5, - - &_vq_book_res0_192_1024_1, - &_vq_book_res0_192_1024_2, - &_vq_book_res0_192_1024_3, - &_vq_book_res0_192_1024_4, - &_vq_book_res0_192_1024_5, - &_vq_book_res0_192_1024_6, - &_vq_book_res0_192_1024_7, - &_vq_book_res0_192_1024_8, - &_vq_book_res0_192_1024_9, + + { + &_huff_book_line0_class1, + &_huff_book_line0_class2, /* 1 */ + + &_huff_book_line0_0sub0, /* 2 */ + &_huff_book_line0_1sub1, /* 3 */ + &_huff_book_line0_1sub2, + &_huff_book_line0_1sub3, /* 5 */ + &_huff_book_line0_2sub1, + &_huff_book_line0_2sub2, /* 7 */ + &_huff_book_line0_2sub3, + + &_huff_book_line1_class0, + &_huff_book_line1_class1, /* 10 */ + &_huff_book_line1_class2, + &_huff_book_line1_class3, /* 12 */ + + &_huff_book_line1_0sub0, + &_huff_book_line1_0sub1, /* 14 */ + &_huff_book_line1_1sub0, + &_huff_book_line1_1sub1, + &_huff_book_line1_2sub1, + &_huff_book_line1_2sub2, /* 18 */ + &_huff_book_line1_2sub3, + &_huff_book_line1_3sub1, + &_huff_book_line1_3sub2, + &_huff_book_line1_3sub3, /* 22 */ + + &_huff_book_res0_128_128aux, + &_huff_book_res0_128_1024aux, + + &_vq_book_res0_128_1024_1, + &_vq_book_res0_128_1024_2, + &_vq_book_res0_128_1024_3, + &_vq_book_res0_128_1024_4, + &_vq_book_res0_128_1024_5, + &_vq_book_res0_128_1024_5a, + &_vq_book_res0_128_1024_6, + &_vq_book_res0_128_1024_6a, + &_vq_book_res0_128_1024_7, + &_vq_book_res0_128_1024_7a, + &_vq_book_res0_128_1024_8, + &_vq_book_res0_128_1024_8a, + &_vq_book_res0_128_1024_8b, }, /* psy */ {&_psy_set_C0,&_psy_set_C}, + &_psy_set_CG }; #endif diff --git a/lib/modes/mode_D.h b/lib/modes/mode_D.h index 1d34a528..6aab2516 100644 --- a/lib/modes/mode_D.h +++ b/lib/modes/mode_D.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_D.h,v 1.14.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: mode_D.h,v 1.14.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -49,12 +49,14 @@ static vorbis_info_psy _psy_set_D0={ ATH_Bark_dB_lineconservative, -100., -140., + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/ @@ -126,17 +128,19 @@ static vorbis_info_psy _psy_set_D0={ 105.f, /* even decade + 5 is important; saves an rint() later in a tight loop) */ -28., + }; static vorbis_info_psy _psy_set_D={ ATH_Bark_dB_lineconservative, -100.f, -140.f, - + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/ diff --git a/lib/modes/mode_E.h b/lib/modes/mode_E.h index a82a5876..6f4bc0f1 100644 --- a/lib/modes/mode_E.h +++ b/lib/modes/mode_E.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: mode_E.h,v 1.13.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: mode_E.h,v 1.13.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -49,12 +49,15 @@ static vorbis_info_psy _psy_set_E0={ ATH_Bark_dB_lineconservative, -100., -140., + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, + /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/ @@ -115,11 +118,12 @@ static vorbis_info_psy _psy_set_E={ ATH_Bark_dB_lineconservative, -100.f, -140.f, - + 0.f, /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ /* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */ /* y: 0 10 20 30 40 50 60 70 80 90 100 dB */ 1,/* tonemaskp */ + 0.f, /* 0 10 20 30 40 50 60 70 80 90 100 */ { {-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/ diff --git a/lib/modes/modes.h b/lib/modes/modes.h index 812dccb9..79da8dee 100644 --- a/lib/modes/modes.h +++ b/lib/modes/modes.h @@ -11,7 +11,7 @@ ******************************************************************** function: predefined encoding modes - last mod: $Id: modes.h,v 1.8.2.1 2001/07/08 08:48:07 xiphmont Exp $ + last mod: $Id: modes.h,v 1.8.2.2 2001/08/03 06:48:13 xiphmont Exp $ ********************************************************************/ @@ -21,9 +21,9 @@ #include "masking.h" //#include "modes/mode_AA.h" #include "modes/mode_A.h" -#include "modes/mode_B.h" -#include "modes/mode_C.h" -#include "modes/mode_D.h" -#include "modes/mode_E.h" +//#include "modes/mode_B.h" +//#include "modes/mode_C.h" +//#include "modes/mode_D.h" +//#include "modes/mode_E.h" #endif @@ -11,7 +11,7 @@ ******************************************************************** function: psychoacoustics not including preecho - last mod: $Id: psy.c,v 1.48.2.4 2001/08/02 22:14:21 xiphmont Exp $ + last mod: $Id: psy.c,v 1.48.2.5 2001/08/03 06:48:03 xiphmont Exp $ ********************************************************************/ @@ -199,11 +199,11 @@ static void setup_curve(float **c, /* add fenceposts */ for(j=0;j<P_LEVELS;j++){ - for(i=0;i<EHMER_MAX;i++) + for(i=0;i<EHMER_OFFSET;i++) if(c[j][i+2]>-200.f)break; c[j][0]=i; - for(i=EHMER_MAX-1;i>=0;i--) + for(i=EHMER_MAX-1;i>EHMER_OFFSET+1;i--) if(c[j][i+2]>-200.f) break; c[j][1]=i; @@ -255,16 +255,13 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi, p->tonecurves=_ogg_malloc(P_BANDS*sizeof(float **)); p->noisemedian=_ogg_malloc(n*sizeof(int)); p->noiseoffset=_ogg_malloc(n*sizeof(float)); - p->peakatt=_ogg_malloc(P_BANDS*sizeof(float *)); - for(i=0;i<P_BANDS;i++){ + for(i=0;i<P_BANDS;i++) p->tonecurves[i]=_ogg_malloc(P_LEVELS*sizeof(float *)); - p->peakatt[i]=_ogg_malloc(P_LEVELS*sizeof(float)); - } for(i=0;i<P_BANDS;i++) - for(j=0;j<P_LEVELS;j++){ + for(j=0;j<P_LEVELS;j++) p->tonecurves[i][j]=_ogg_malloc((EHMER_MAX+2)*sizeof(float)); - } + /* OK, yeah, this was a silly way to do it */ memcpy(p->tonecurves[0][4]+2,tone_125_40dB_SL,sizeof(float)*EHMER_MAX); @@ -316,23 +313,9 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi, optionally specifies maximum dynamic depth, but also [always] limits the masking curves to a minimum depth */ for(i=0;i<P_BANDS;i+=2) - for(j=4;j<P_LEVELS;j+=2){ - float neutraldB=-vi->toneatt[i][j]; - for(k=2;k<EHMER_MAX+2;k++){ + for(j=4;j<P_LEVELS;j+=2) + for(k=2;k<EHMER_MAX+2;k++) p->tonecurves[i][j][k]+=vi->tone_masteratt; - if(p->tonecurves[i][j][k]-neutraldB>vi->peakatt[i][j]) - p->tonecurves[i][j][k]=neutraldB+vi->peakatt[i][j]; - } - } - - if(vi->peakattp) /* we limit depth only optionally */ - for(i=0;i<P_BANDS;i+=2) - for(j=4;j<P_LEVELS;j+=2){ - float neutraldB=-vi->toneatt[i][j]; - if(p->tonecurves[i][j][EHMER_OFFSET]-neutraldB<vi->peakatt[i][j]) - p->tonecurves[i][j][EHMER_OFFSET]=neutraldB+vi->peakatt[i][j]; - } - /* interpolate curves between */ for(i=1;i<P_BANDS;i+=2) @@ -348,11 +331,20 @@ void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi, for(i=0;i<P_BANDS;i++) setup_curve(p->tonecurves[i],i,vi->toneatt[i]); - /* set up attenuation levels */ + /* value limit the tonal masking curves; the peakatt not only + optionally specifies maximum dynamic depth, but also [always] + limits the masking curves to a minimum depth */ for(i=0;i<P_BANDS;i++) - for(j=0;j<P_LEVELS;j++){ - p->peakatt[i][j]=p->vi->peakatt[i][j]; - } + for(j=0;j<P_LEVELS;j++) + for(k=2;k<EHMER_MAX+2;k++) + if(p->tonecurves[i][j][k]>vi->peakatt[i][j]) + p->tonecurves[i][j][k]=vi->peakatt[i][j]; + + if(vi->peakattp) /* we limit depth only optionally */ + for(i=0;i<P_BANDS;i++) + for(j=0;j<P_LEVELS;j++) + if(p->tonecurves[i][j][EHMER_OFFSET+2]<vi->peakatt[i][j]) + p->tonecurves[i][j][EHMER_OFFSET+2]=vi->peakatt[i][j]; /* set up rolling noise median */ for(i=0;i<n;i++){ @@ -388,12 +380,10 @@ void _vp_psy_clear(vorbis_look_psy *p){ _ogg_free(p->tonecurves[i][j]); } _ogg_free(p->tonecurves[i]); - _ogg_free(p->peakatt[i]); } _ogg_free(p->tonecurves); _ogg_free(p->noisemedian); _ogg_free(p->noiseoffset); - _ogg_free(p->peakatt); } memset(p,0,sizeof(vorbis_look_psy)); } @@ -427,27 +417,8 @@ static void seed_curve(float *seed, } } -static void seed_peak(float *seed, - const float *att, - float amp, - int oc, - int linesper, - float dBoffset){ - long seedptr; - - int choice=(int)((amp+dBoffset)*.1f); - choice=max(choice,0); - choice=min(choice,P_LEVELS-1); - seedptr=oc-(linesper>>1); - - amp+=att[choice]; - if(seed[seedptr]<amp)seed[seedptr]=amp; - -} - static void seed_loop(vorbis_look_psy *p, const float ***curves, - const float **att, const float *f, const float *flr, float *seed, @@ -459,53 +430,26 @@ static void seed_loop(vorbis_look_psy *p, /* prime the working vector with peak values */ for(i=0;i<n;i++){ - float max=f[i]; - long oc=p->octave[i]; - while(i+1<n && p->octave[i+1]==oc){ - i++; - if(f[i]>max)max=f[i]; - } - - if(max+6.f>flr[i]){ - oc=oc>>p->shiftoc; - if(oc>=P_BANDS)oc=P_BANDS-1; - if(oc<0)oc=0; - if(vi->tonemaskp) - seed_curve(seed, - curves[oc], - max, - p->octave[i]-p->firstoc, - p->total_octave_lines, - p->eighth_octave_lines, - dBoffset); - - if(vi->peakattp && !vi->tonemaskp) /* if tonemaskp is set, - it's built into the - masking curve */ - seed_peak(seed, - att[oc], - max, - p->octave[i]-p->firstoc, - p->eighth_octave_lines, - dBoffset); - } - } -} - -static void bound_loop(vorbis_look_psy *p, - float *f, - float *seeds, - float *flr, - float att){ - long n=p->n,i; - - long off=(p->eighth_octave_lines>>1)+p->firstoc; - long *ocp=p->octave; - - for(i=0;i<n;i++){ - long oc=ocp[i]-off; - float v=f[i]+att; - if(seeds[oc]<v)seeds[oc]=v; + float max=f[i]; + long oc=p->octave[i]; + while(i+1<n && p->octave[i+1]==oc){ + i++; + if(f[i]>max)max=f[i]; + } + + if(max+6.f>flr[i]){ + oc=oc>>p->shiftoc; + if(oc>=P_BANDS)oc=P_BANDS-1; + if(oc<0)oc=0; + if(vi->tonemaskp) + seed_curve(seed, + curves[oc], + max, + p->octave[i]-p->firstoc, + p->total_octave_lines, + p->eighth_octave_lines, + dBoffset); + } } } @@ -788,8 +732,7 @@ void _vp_compute_mask(vorbis_look_psy *p, /* tone/peak masking */ - seed_loop(p,(const float ***)p->tonecurves, - (const float **)p->peakatt,fft,mask,seed,global_specmax); + seed_loop(p,(const float ***)p->tonecurves,fft,mask,seed,global_specmax); max_seeds(p,g,channel,seed,mask); /* doing this here is clean, but we need to find a faster way to do @@ -11,7 +11,7 @@ ******************************************************************** function: random psychoacoustics (not including preecho) - last mod: $Id: psy.h,v 1.21.2.3 2001/08/02 22:14:22 xiphmont Exp $ + last mod: $Id: psy.h,v 1.21.2.4 2001/08/03 06:48:03 xiphmont Exp $ ********************************************************************/ @@ -118,7 +118,6 @@ typedef struct { struct vorbis_info_psy *vi; float ***tonecurves; - float **peakatt; int *noisemedian; float *noiseoffset; diff --git a/vq/res_128c.vqs b/vq/res_128c.vqs new file mode 100644 index 00000000..faa7a23f --- /dev/null +++ b/vq/res_128c.vqs @@ -0,0 +1,61 @@ +huffbuild line0_class1.vqd 0-64 +huffbuild line0_class2.vqd 0-64 + +huffbuild line0_0sub0.vqd 0-128 +huffbuild line0_1sub1.vqd 1-18 +huffbuild line0_1sub2.vqd 18-50 +huffbuild line0_1sub3.vqd 50-128 +huffbuild line0_2sub1.vqd 1-18 +huffbuild line0_2sub2.vqd 18-50 +huffbuild line0_2sub3.vqd 50-128 + +huffbuild line1_class0.vqd 0-8 +huffbuild line1_class1.vqd 0-16 +huffbuild line1_class2.vqd 0-64 +huffbuild line1_class3.vqd 0-64 + +huffbuild line1_0sub0.vqd 0-32 +huffbuild line1_0sub1.vqd 32-128 + +huffbuild line1_1sub0.vqd 0-32 +huffbuild line1_1sub1.vqd 32-128 + +huffbuild line1_2sub1.vqd 1-18 +huffbuild line1_2sub2.vqd 18-50 +huffbuild line1_2sub3.vqd 50-128 +huffbuild line1_3sub1.vqd 1-18 +huffbuild line1_3sub2.vqd 18-50 +huffbuild line1_3sub3.vqd 50-128 + +residuesplit residue_0#0.vqd 0,192,12 res0_128_128 ,.7, ,7.5,4 3,1.5, ,1.5, 4,2.5, ,2.5, 8,7.5, ,7.5, ,22.5, + +residuesplit residue_1#0.vqd 0,1408,32 res0_128_1024 ,.7, ,7.5,18 5,1.5, ,1.5, 10,2.5, ,2.5, 20,7.5, ,7.5, ,22.5, + + +GO + +>res0_128_128 noninterleaved +haux res0_128_128aux.vqd 0,16,2 + +>res0_128_1024 noninterleaved +haux res0_128_1024aux.vqd 0,44,2 + +:_1 res0_128_1024_1.vqd, 2, nonseq cull, 0 +- 1 2 3 4 5 6 7 +:_2 res0_128_1024_2.vqd, 4, nonseq cull, 0 +- 1 +:_3 res0_128_1024_3.vqd, 4, nonseq cull, 0 +- 1 +:_4 res0_128_1024_4.vqd, 4, nonseq cull, 0 +- 1 2 +:_5 res0_128_1024_5.vqd, 4, nonseq cull, 0 +- 1 2 +:_6 res0_128_1024_6.vqd, 4, nonseq cull, 0 +- 3 6 ++_6a, 4, nonseq cull, 0 +- 1 +:_7 res0_128_1024_7.vqd, 4, nonseq cull, 0 +- 3 6 ++_7a, 4, nonseq cull , 0 +- 1 +:_8 res0_128_1024_8.vqd, 2, nonseq cull, 0 +- 5 10 15 20 ++_8a, 2, nonseq, 0 +- 1 2 +:_9 res0_128_1024_9.vqd, 2, nonseq, 0 +- 169 338 507 676 845 ++_9a, 2, nonseq, 0 +- 13 26 39 52 65 78 ++_9b, 2, nonseq, 0 +- 1 2 3 4 5 6 + + + + + |