[xiph-cvs] cvs commit: vorbis/vq bookutil.c latticebuild.c
Monty
xiphmont at xiph.org
Tue Jan 9 11:13:28 PST 2001
xiphmont 01/01/09 11:13:26
Modified: . Tag: monty_branch_20001226 COPYING
lib Tag: monty_branch_20001226 backends.h block.c
floor0.c mapping0.c psy.c psy.h psytune.c res0.c
window.h
lib/books Tag: monty_branch_20001226 lsp12_0.vqh lsp12_1.vqh
lsp30_0.vqh lsp30_1.vqh res0_128_1024_1.vqh
res0_128_1024_2.vqh res0_128_1024_3.vqh
res0_128_1024_4.vqh res0_128_1024_5.vqh
res0_128_1024_6.vqh res0_128_1024_7.vqh
res0_128_1024_8.vqh res0_128_1024_9.vqh
res0_128_1024aux.vqh res0_128_128_1.vqh
res0_128_128_2.vqh res0_128_128_3.vqh
res0_128_128_4.vqh res0_128_128_5.vqh
res0_128_128aux.vqh
lib/modes Tag: monty_branch_20001226 mode_A.h mode_AA.h
mode_B.h mode_C.h mode_D.h mode_E.h
vq Tag: monty_branch_20001226 bookutil.c
latticebuild.c
Added: lib/books Tag: monty_branch_20001226 Makefile Makefile.in
lsp9_0.vqh lsp9_1.vqh
Log:
Incremental update
Revision Changes Path
No revision
No revision
1.2.2.1 +115 -92 vorbis/COPYING
Index: COPYING
===================================================================
RCS file: /usr/local/cvsroot/vorbis/COPYING,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- COPYING 2000/11/08 19:39:05 1.2
+++ COPYING 2001/01/09 19:13:13 1.2.2.1
@@ -1,13 +1,14 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-[This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
Preamble
@@ -16,97 +17,109 @@
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
- Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
- Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
- Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
- The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
- Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
- However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
- Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
- GNU LIBRARY GENERAL PUBLIC LICENSE
+ GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
@@ -255,7 +268,7 @@
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
- 6. As an exception to the Sections above, you may also compile or
+ 6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
@@ -281,24 +294,32 @@
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
- b) Accompany the work with a written offer, valid for at
+ c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
- c) If distribution of the work is made by offering access to copy
+ d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
- d) Verify that the user has already received a copy of these
+ e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
@@ -347,7 +368,7 @@
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
@@ -390,7 +411,7 @@
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
+versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
@@ -453,17 +474,17 @@
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
@@ -479,3 +500,5 @@
Ty Coon, President of Vice
That's all there is to it!
+
+
No revision
No revision
1.3.2.2 +7 -5 vorbis/lib/backends.h
Index: backends.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/backends.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- backends.h 2000/12/27 23:46:34 1.3.2.1
+++ backends.h 2001/01/09 19:13:14 1.3.2.2
@@ -13,7 +13,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.3.2.1 2000/12/27 23:46:34 xiphmont Exp $
+ last mod: $Id: backends.h,v 1.3.2.2 2001/01/09 19:13:14 xiphmont Exp $
********************************************************************/
@@ -62,9 +62,7 @@
void (*free_info) (vorbis_info_floor *);
void (*free_look) (vorbis_look_floor *);
int (*forward) (struct vorbis_block *,vorbis_look_floor *,
- float *,vorbis_bitbuffer *);
- float(*forward2) (struct vorbis_block *,vorbis_look_floor *,
- long,float, vorbis_bitbuffer *);
+ float *);
int (*inverse) (struct vorbis_block *,vorbis_look_floor *,
float *);
} vorbis_func_floor;
@@ -79,6 +77,10 @@
int numbooks; /* <= 16 */
int books[16];
+
+ float lessthan; /* encode-only config setting hacks for libvorbis */
+ float greaterthan; /* encode-only config setting hacks for libvorbis */
+
} vorbis_info_floor0;
/* Residue backend generic *****************************************/
@@ -91,7 +93,7 @@
void (*free_info) (vorbis_info_residue *);
void (*free_look) (vorbis_look_residue *);
int (*forward) (struct vorbis_block *,vorbis_look_residue *,
- float **,int,vorbis_bitbuffer *);
+ float **,int);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
float **,int);
} vorbis_func_residue;
1.42.2.2 +7 -1 vorbis/lib/block.c
Index: block.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/block.c,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -r1.42.2.1 -r1.42.2.2
--- block.c 2000/12/27 23:46:35 1.42.2.1
+++ block.c 2001/01/09 19:13:14 1.42.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.42.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: block.c,v 1.42.2.2 2001/01/09 19:13:14 xiphmont Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -695,6 +695,7 @@
}
for(j=0;j<vi->channels;j++){
+ static int seq=0;
float *pcm=v->pcm[j]+beginW;
float *p=vb->pcm[j];
@@ -704,7 +705,12 @@
/* the remaining section */
for(;i<sizeW;i++)
pcm[i]=p[i];
+
+ _analysis_output("lapped",seq,pcm,sizeW,0,0);
+ _analysis_output("buffered",seq++,v->pcm[j],sizeW+beginW,0,0);
+
}
+
/* track the frame number... This is for convenience, but also
making sure our last packet doesn't end with added padding. If
1.34.2.2 +48 -44 vorbis/lib/floor0.c
Index: floor0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/floor0.c,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -r1.34.2.1 -r1.34.2.2
--- floor0.c 2000/12/27 23:46:35 1.34.2.1
+++ floor0.c 2001/01/09 19:13:14 1.34.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.34.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: floor0.c,v 1.34.2.2 2001/01/09 19:13:14 xiphmont Exp $
********************************************************************/
@@ -241,7 +241,7 @@
/* didn't need in->out seperation, modifies the flr[] vector; takes in
a dB scale floor, puts out linear */
static int floor0_forward(vorbis_block *vb,vorbis_look_floor *i,
- float *flr,vorbis_bitbuffer *vbb){
+ float *flr){
long j;
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
vorbis_info_floor0 *info=look->vi;
@@ -259,9 +259,6 @@
sprintf(buffer,"lsp0coeff_%d.vqd",vb->mode);
of=fopen(buffer,"a");
#endif
-
- sprintf(buffer,"lsp0ent_%d.vqd",vb->mode);
- ef=fopen(buffer,"a");
#endif
/* our floor comes in on a [-Inf...0] dB scale. The curve has to be
@@ -285,7 +282,7 @@
if(val<0)val=0; /* likely */
if(val>maxval)val=maxval; /* not bloody likely */
- /*oggpack_write(&vb->opb,val,info->ampbits);*/
+ oggpack_write(&vb->opb,val,info->ampbits);
if(val>0)
amp=(float)val/maxval*info->ampdB;
else
@@ -298,25 +295,49 @@
/* the spec supports using one of a number of codebooks. Right
now, encode using this lib supports only one */
backend_lookup_state *be=vb->vd->backend_state;
- codebook *b=be->fullbooks+info->books[0];
- bitbuf_write(vbb,0,_ilog(info->numbooks));
+ codebook *b;
+ int booknum;
/* LSP <-> LPC is orthogonal and LSP quantizes more stably */
+ _analysis_output("lpc",seq,flr,look->m,0,0);
+
vorbis_lpc_to_lsp(flr,flr,look->m);
+ _analysis_output("lsp",seq,flr,look->m,0,0);
+
#ifdef ANALYSIS
-#ifndef TRAIN_LSP
-
- memcpy(lspwork,flr,look->m*sizeof(float));
- vorbis_lsp_to_curve(flr,look->linearmap,look->n,look->ln,
- lspwork,look->m,amp,info->ampdB);
- _analysis_output("prefit",seq,flr,look->n,0,1);
-
-#endif
+ {
+ float *lspwork2=alloca(look->m*sizeof(float));
+ memcpy(lspwork2,flr,sizeof(float)*look->m);
+ memcpy(lspwork,flr,sizeof(float)*look->m);
+ vorbis_lsp_to_curve(flr,look->linearmap,look->n,look->ln,
+ lspwork2,look->m,amp,info->ampdB);
+
+ _analysis_output("prefit",seq++,flr,look->n,0,1);
+ memcpy(flr,lspwork,sizeof(float)*look->m);
+ }
+
#endif
+ /* which codebook to use? We do it only by range right now. */
+ if(info->numbooks>1){
+ float last=0.;
+ for(j=0;j<look->m;j++){
+ float val=flr[j]-last;
+ if(val<info->lessthan || val>info->greaterthan)break;
+ last=flr[j];
+ }
+ if(j<look->m)
+ booknum=0;
+ else
+ booknum=1;
+ }else
+ booknum=0;
+
+ b=be->fullbooks+info->books[booknum];
+ bitbuf_write(vbb,booknum,_ilog(info->numbooks));
-#if 1
+
#ifdef TRAIN_LSP
{
float last=0.f;
@@ -327,7 +348,10 @@
}
fprintf(of,"\n");
fclose(of);
-#endif
+
+ sprintf(buffer,"lsp0ent_m%d_b%d.vqd",vb->mode,booknum);
+ ef=fopen(buffer,"a");
+
#endif
/* code the spectral envelope, and keep track of the actual
@@ -336,7 +360,7 @@
for(j=0;j<look->m;j+=b->dim){
int entry=_f0_fit(b,flr,lspwork,j);
- bits+=vorbis_book_bufencode(b,entry,vbb);
+ bits+=vorbis_book_encode(b,entry,)&vb->opb;
#ifdef TRAIN_LSP
fprintf(ef,"%d,\n",entry);
@@ -354,35 +378,15 @@
return(val);
}
+#ifdef TRAIN_LSP
+ fclose(of);
+#endif
+
memset(flr,0,sizeof(float)*look->n);
seq++;
return(val);
}
-static float floor0_forward2(vorbis_block *vb,vorbis_look_floor *i,
- long amp,float error,
- vorbis_bitbuffer *vbb){
-
- vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
- vorbis_info_floor0 *info=look->vi;
- if(amp){
- long maxval=(1L<<info->ampbits)-1;
- long adj=rint(todB(error)/info->ampdB*maxval/2);
-
- amp+=adj;
- if(amp<1)amp=1;
-
- oggpack_write(&vb->opb,amp,info->ampbits);
- bitbuf_pack(&vb->opb,vbb);
- return(fromdB((float)adj/maxval*info->ampdB));
- }else{
- oggpack_write(&vb->opb,0,info->ampbits);
- bitbuf_pack(&vb->opb,vbb);
- }
- return(0.f);
-}
-
-
static int floor0_inverse(vorbis_block *vb,vorbis_look_floor *i,float *out){
vorbis_look_floor0 *look=(vorbis_look_floor0 *)i;
vorbis_info_floor0 *info=look->vi;
@@ -424,7 +428,7 @@
/* export hooks */
vorbis_func_floor floor0_exportbundle={
&floor0_pack,&floor0_unpack,&floor0_look,&floor0_copy_info,&floor0_free_info,
- &floor0_free_look,&floor0_forward,&floor0_forward2,&floor0_inverse
+ &floor0_free_look,&floor0_forward,&floor0_inverse
};
1.22.2.2 +13 -58 vorbis/lib/mapping0.c
Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- mapping0.c 2000/12/27 23:46:35 1.22.2.1
+++ mapping0.c 2001/01/09 19:13:15 1.22.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.22.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.22.2.2 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
@@ -220,11 +220,6 @@
float **floor=_vorbis_block_alloc(vb,vi->channels*sizeof(float *));
float *additional=_vorbis_block_alloc(vb,n*sizeof(float));
- vorbis_bitbuffer vbb_res;
- vorbis_bitbuffer *vbb_flr=_vorbis_block_alloc(vb,
- sizeof(vorbis_bitbuffer)*
- vi->channels);
-
for(i=0;i<vi->channels;i++)
bitbuf_init(vbb_flr+i,vb);
bitbuf_init(&vbb_res,vb);
@@ -234,10 +229,14 @@
float scale=4.f/n;
int submap=info->chmuxlist[i];
+ _analysis_output("pcm",seq,pcm,n,0,0);
+
/* window the PCM data */
for(j=0;j<n;j++)
additional[j]=pcm[j]*=window[j];
+ _analysis_output("windowed",seq,pcm,n,0,0);
+
/* transform the PCM data */
/* only MDCT right now.... */
mdct_forward(b->transform[vb->W][0],pcm,pcm);
@@ -251,16 +250,16 @@
/* set up our masking data working vector, and stash unquantized
data for later */
- memcpy(pcm+n/2,pcm,n*sizeof(float)/2);
+ /*memcpy(pcm+n/2,pcm,n*sizeof(float)/2);*/
memcpy(additional+n/2,pcm,n*sizeof(float)/2);
/* begin masking work */
floor[i]=_vorbis_block_alloc(vb,n*sizeof(float)/2);
- _analysis_output("fft",seq,additional,n/2,0,1);
- _analysis_output("mdct",seq,additional+n/2,n/2,0,1);
- _analysis_output("lfft",seq,additional,n/2,0,0);
- _analysis_output("lmdct",seq,additional+n/2,n/2,0,0);
+ //_analysis_output("fft",seq,additional,n/2,0,1);
+ //_analysis_output("mdct",seq,additional+n/2,n/2,0,1);
+ //_analysis_output("lfft",seq,additional,n/2,0,0);
+ //_analysis_output("lmdct",seq,additional+n/2,n/2,0,0);
/* perform psychoacoustics; do masking */
_vp_compute_mask(look->psy_look+submap,additional,additional+n/2,
@@ -270,13 +269,13 @@
/* perform floor encoding */
nonzero[i]=look->floor_func[submap]->
- forward(vb,look->floor_look[submap],floor[i],vbb_flr+i);
+ forward(vb,look->floor_look[submap],floor[i]);
_analysis_output("floor",seq,floor[i],n/2,0,1);
/* apply the floor, do optional noise levelling */
_vp_apply_floor(look->psy_look+submap,pcm,floor[i]);
-
+
_analysis_output("res",seq++,pcm,n/2,0,0);
#ifdef TRAIN_RES
@@ -309,53 +308,9 @@
}
look->residue_func[i]->forward(vb,look->residue_look[i],
- pcmbundle,ch_in_bundle,&vbb_res);
+ pcmbundle,ch_in_bundle);
}
- /* go back and compute the original MDCT inverse and our quantized
- inverse; we'll want to give the floor mapping a shot at
- massaging things before we write out the final version. */
-
- {
- for(i=0;i<vi->channels;i++){
- float *pcm=vb->pcm[i];
- float *pcmori=vb->pcm[i]+n/2;
- float *quant=floor[i];
- float num=0.f,den=0.f;
- int submap=info->chmuxlist[i];
-
- if(nonzero[i]){
-
- mdct_backward(b->transform[vb->W][0],pcm+n/2,additional);
- for(j=0;j<n;j++)
- additional[j]*=window[j];
-
- for(j=0;j<n/2;j++)
- pcm[j]=pcmori[j]-pcm[j]*quant[j];
- mdct_backward(b->transform[vb->W][0],pcm,pcm);
- for(j=0;j<n;j++)
- pcm[j]*=window[j];
-
- /* weighted compare twixt original and quantized mdct output */
- for(j=0;j<n;j++){
- den+=(pcm[j]*pcm[j]);
- num+=(additional[j]*additional[j]);
- }
-
- num=sqrt(num);
- den=sqrt(den);
-
- }
-
- look->floor_func[submap]->
- forward2(vb,look->floor_look[submap],
- nonzero[i],den==0.f?0.:num/den,vbb_flr+i);
-
- }
- }
-
- bitbuf_pack(&vb->opb,&vbb_res);
-
look->lastframe=vb->sequence;
return(0);
}
1.34.2.2 +93 -59 vorbis/lib/psy.c
Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -r1.34.2.1 -r1.34.2.2
--- psy.c 2000/12/27 23:46:35 1.34.2.1
+++ psy.c 2001/01/09 19:13:15 1.34.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.34.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.34.2.2 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
@@ -338,7 +338,7 @@
int choice=(int)((amp+dBoffset)*.1f);
choice=max(choice,0);
- choice=min(choice,8);
+ choice=min(choice,P_LEVELS-1);
posts=curves[choice];
curve=posts+2;
seedptr=oc+(posts[0]-16)*linesper-(linesper>>1);
@@ -376,7 +376,8 @@
float **att,
float *f,
float *flr,
- float *seeds,
+ float *minseed,
+ float *maxseed,
float specmax){
vorbis_info_psy *vi=p->vi;
long n=p->n,i;
@@ -386,7 +387,7 @@
for(i=0;i<n;i++){
float max=f[i];
- int oc=p->octave[i];
+ long oc=p->octave[i];
while(i+1<n && p->octave[i+1]==oc){
i++;
if(f[i]>max)max=f[i];
@@ -397,7 +398,7 @@
if(oc>=P_BANDS)oc=P_BANDS-1;
if(oc<0)oc=0;
if(vi->tonemaskp)
- seed_curve(seeds,
+ seed_curve(minseed,
curves[oc],
max,
p->octave[i]-p->firstoc,
@@ -405,7 +406,7 @@
p->eighth_octave_lines,
dBoffset);
if(vi->peakattp)
- seed_peak(seeds,
+ seed_peak(maxseed,
att[oc],
max,
p->octave[i]-p->firstoc,
@@ -415,13 +416,30 @@
}
}
-/* bleaugh, this is more complicated than it needs to be */
-static void max_seeds(vorbis_look_psy *p,float *seeds,float *flr){
- long n=p->total_octave_lines,i;
- int linesper=p->eighth_octave_lines;
+static void bound_loop(vorbis_look_psy *p,
+ float *f,
+ float *seeds,
+ float *flr,
+ float att){
+ vorbis_info_psy *vi=p->vi;
+ 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;
+ }
+}
+
+static void seed_chase(float *seeds, int linesper, long n){
long *posstack=alloca(n*sizeof(long));
float *ampstack=alloca(n*sizeof(float));
long stack=0;
+ long pos=0;
+ long i;
for(i=0;i<n;i++){
if(stack<2){
@@ -453,47 +471,65 @@
/* the stack now contains only the positions that are relevant. Scan
'em straight through */
- {
- long pos=0;
- long linpos=0;
- for(i=0;i<stack;i++){
- long endpos;
- if(i<stack-1 && ampstack[i+1]>ampstack[i]){
- endpos=posstack[i+1];
- }else{
- endpos=posstack[i]+linesper+1; /* +1 is important, else bin 0 is
- discarded in short frames */
- }
- if(endpos>n)endpos=n;
- for(;pos<endpos;pos++)
- seeds[pos]=ampstack[i];
- }
-
- pos=0;
- while(linpos+1<p->n){
- float min=seeds[pos];
- long end=((p->octave[linpos]+p->octave[linpos+1])>>1)-p->firstoc;
- while(pos+1<=end){
- pos++;
- if((seeds[pos]>NEGINF && seeds[pos]<min) || min==NEGINF)min=seeds[pos];
- }
- /* seed scale is log. Floor is linear. Map back to it */
- end=pos+p->firstoc;
- for(;linpos<p->n && p->octave[linpos]<=end;linpos++)
- if(flr[linpos]<min)flr[linpos]=min;
- }
- {
- float v=seeds[p->total_octave_lines-1];
- for(;linpos<p->n;linpos++)
- if(flr[linpos]<v)flr[linpos]=v;
+ for(i=0;i<stack;i++){
+ long endpos;
+ if(i<stack-1 && ampstack[i+1]>ampstack[i]){
+ endpos=posstack[i+1];
+ }else{
+ endpos=posstack[i]+linesper+1; /* +1 is important, else bin 0 is
+ discarded in short frames */
}
- }
-
+ if(endpos>n)endpos=n;
+ for(;pos<endpos;pos++)
+ seeds[pos]=ampstack[i];
+ }
+
/* there. Linear time. I now remember this was on a problem set I
had in Grad Skool... I didn't solve it at the time ;-) */
+
}
+/* bleaugh, this is more complicated than it needs to be */
+static void max_seeds(vorbis_look_psy *p,float *minseed,float *maxseed,
+ float *flr){
+ long n=p->total_octave_lines,i;
+ int linesper=p->eighth_octave_lines;
+ long linpos=0;
+ long pos;
+
+ seed_chase(minseed,linesper,n); /* for masking */
+ seed_chase(maxseed,linesper,n); /* for peak att */
+
+ pos=p->octave[0]-p->firstoc-(linesper>>1);
+ while(linpos+1<p->n){
+ float min=minseed[pos];
+ float max=maxseed[pos];
+ long end=((p->octave[linpos]+p->octave[linpos+1])>>1)-p->firstoc;
+ while(pos+1<=end){
+ pos++;
+ if((minseed[pos]>NEGINF && minseed[pos]<min) || min==NEGINF)
+ min=minseed[pos];
+ if(maxseed[pos]>max)max=maxseed[pos];
+ }
+ if(max<min)max=min;
+
+ /* seed scale is log. Floor is linear. Map back to it */
+ end=pos+p->firstoc;
+ for(;linpos<p->n && p->octave[linpos]<=end;linpos++)
+ if(flr[linpos]<max)flr[linpos]=max;
+ }
+
+ {
+ float min=minseed[p->total_octave_lines-1];
+ float max=maxseed[p->total_octave_lines-1];
+ if(max<min)max=min;
+ for(;linpos<p->n;linpos++)
+ if(flr[linpos]<max)flr[linpos]=max;
+ }
+
+}
+
#define BIN(x) ((int)((x)*-4.))
#define BINdB(x) ((x)*-.25)
static void bark_noise_median(long n,float *b,float *f,float *noise,
@@ -546,7 +582,6 @@
median++;
}
}
-
noise[i]=BINdB(median);
}
@@ -561,8 +596,9 @@
float specmax=NEGINF;
static int seq=0;
- float *seed=alloca(sizeof(float)*p->total_octave_lines);
- for(i=0;i<p->total_octave_lines;i++)seed[i]=NEGINF;
+ float *minseed=alloca(sizeof(float)*p->total_octave_lines);
+ float *maxseed=alloca(sizeof(float)*p->total_octave_lines);
+ for(i=0;i<p->total_octave_lines;i++)minseed[i]=maxseed[i]=NEGINF;
/* go to dB scale. Also find the highest peak so we know the limits */
for(i=0;i<n;i++){
@@ -609,18 +645,12 @@
/* tone/peak masking */
/* XXX apply decay to the fft here */
-
- seed_loop(p,p->tonecurves,p->peakatt,fft,flr,seed,specmax);
- _analysis_output("seed",seq,seed,p->total_octave_lines,0,0);
- max_seeds(p,seed,flr);
-
- /* treat the near-DC offset bin[s] special care */
- {
- float v=mdct[0]+p->vi->nearDCdB;
- for(i=0;i<p->vi->nearDCp;i++)
- if(flr[i]>v)flr[i]=v;
- }
+ seed_loop(p,p->tonecurves,p->peakatt,fft,flr,minseed,maxseed,specmax);
+ bound_loop(p,mdct,maxseed,flr,p->vi->bound_att_dB);
+ _analysis_output("minseed",seq,minseed,p->total_octave_lines,0,0);
+ _analysis_output("maxseed",seq,maxseed,p->total_octave_lines,0,0);
+ max_seeds(p,minseed,maxseed,flr);
_analysis_output("final",seq,flr,n,0,0);
/* doing this here is clean, but we need to find a faster way to do
@@ -629,6 +659,7 @@
for(i=0;i<n;i++)if(mdct[i]>=flr[i])break;
if(i==n)for(i=0;i<n;i++)flr[i]=NEGINF;
+
seq++;
}
@@ -650,5 +681,8 @@
memcpy(f,work,p->n*sizeof(float));
}
+
+
+
1.16.2.2 +2 -4 vorbis/lib/psy.h
Index: psy.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -r1.16.2.1 -r1.16.2.2
--- psy.h 2000/12/27 23:46:35 1.16.2.1
+++ psy.h 2001/01/09 19:13:15 1.16.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: psy.h,v 1.16.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: psy.h,v 1.16.2.2 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
@@ -41,9 +41,6 @@
/* 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 */
- int nearDCp;
- float nearDCdB;
-
int tonemaskp;
float toneatt[P_BANDS][P_LEVELS];
@@ -59,6 +56,7 @@
float noisemedian[P_BANDS];
float max_curve_dB;
+ float bound_att_dB;
/* decay setup */
float attack_coeff;
1.11.2.2 +77 -65 vorbis/lib/psytune.c
Index: psytune.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psytune.c,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- psytune.c 2000/12/27 23:46:35 1.11.2.1
+++ psytune.c 2001/01/09 19:13:15 1.11.2.2
@@ -13,7 +13,7 @@
function: simple utility that runs audio through the psychoacoustics
without encoding
- last mod: $Id: psytune.c,v 1.11.2.1 2000/12/27 23:46:35 xiphmont Exp $
+ last mod: $Id: psytune.c,v 1.11.2.2 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
@@ -45,19 +45,27 @@
/* 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 */
- 2,
- -40.f, /* nearDCdB */
-
1,/* tonemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
- {{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
+ {
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*63*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*88*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*125*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*175*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*250*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*350*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*500*/
+ {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-999.,-999.}, /*700*/
+
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+ //{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
+ //{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
+ //{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
+ //{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
+ //{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
+
{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1400*/
{-40.,-40.,-40.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*2000*/
@@ -69,33 +77,32 @@
{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
},
- 0,/* peakattp */
- {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*175*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*250*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*350*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-28.,-28.,-28.,-28.}, /*500*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*700*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*1000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*1400*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*2000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*2400*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-28.}, /*4000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-16.,-17.}, /*8000*/
- { -6., -7., -9., -9., -9., -9.,-10.,-11.,-12.,-13.,-14.}, /*11500*/
- { -6., -6., -9., -9., -9., -9., -9., -9.,-10.,-11.,-12.}, /*16000*/
- },
+ 1,/* peakattp */
+ {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-28.f,-28.f,-28.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-28.f,-28.f,-28.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-28.f,-28.f,-28.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-28.f,-28.f,-28.f},/*175*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-28.f,-28.f,-28.f},/*250*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-28.f,-28.f,-28.f},/*350*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-28.f,-28.f,-28.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-25.f,-28.f,-28.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-25.f,-28.f,-28.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-25.f,-28.f,-28.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-25.f,-28.f,-28.f},/*2000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-25.f,-28.f,-28.f},/*2400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-25.f,-28.f,-28.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-25.f,-28.f,-28.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-25.f,-26.f,-28.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-23.f,-28.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-21.f,-28.f},/*16000*/ },
1,/*noisemaskp */
- -40.f, /* suppress any noise curve over maxspec+n */
+ -30.f, /* suppress any noise curve over maxspec+n */
.5f, /* low window */
.5f, /* high window */
- 25,
- 25,
+ 5,
+ 5,
{.000f, /*63*/
.000f, /*88*/
.000f, /*125*/
@@ -103,20 +110,21 @@
.000f, /*250*/
.000f, /*350*/
.000f, /*500*/
- .500f, /*700*/
- .500f, /*1000*/
- .500f, /*1400*/
- .500f, /*2000*/
- .500f, /*2800*/
- .700f, /*4000*/
- .800f, /*5600*/
- .850f, /*8000*/
- .850f, /*11500*/
- .900f, /*16000*/
+ .000f, /*700*/
+ .000f, /*1000*/
+ .200f, /*1400*/
+ .300f, /*2000*/
+ .300f, /*2800*/
+ .600f, /*4000*/
+ .700f, /*5600*/
+ .800f, /*8000*/
+ .800f, /*11500*/
+ .800f, /*16000*/
},
105.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */
+ -28.,
-0.f, -.004f /* attack/decay control */
};
@@ -156,9 +164,15 @@
int m;
int *linearmap;
+ void *vi;
lpc_lookup lpclook;
+ float *lsp_look;
+
} vorbis_look_floor0;
+extern float _curve_to_lpc(float *curve,float *lpc,
+ vorbis_look_floor0 *l);
+
long frameno=0;
/* hacked from floor0.c */
@@ -187,8 +201,8 @@
float tot=0.f;
int framesize=2048;
- int order=32;
- int map=256;
+ int order=9;
+ int map=64;
float *pcm[2],*out[2],*window,*lpc,*flr,*mask;
signed char *buffer,*buffer2;
@@ -209,31 +223,23 @@
if(argv[0][1]=='v'){
noisy=0;
}
- if(argv[0][1]=='A'){
- ath=0;
+ if(argv[0][1]=='o'){
+ order=atoi(argv[0]+2);
}
- if(argv[0][1]=='D'){
- decayp=0;
+ if(argv[0][1]=='m'){
+ map=atoi(argv[0]+2);
}
- if(argv[0][1]=='X'){
- ath=0;
- decayp=0;
- }
}else
if(*argv[0]=='+'){
/* option */
if(argv[0][1]=='v'){
noisy=1;
- }
- if(argv[0][1]=='A'){
- ath=1;
}
- if(argv[0][1]=='D'){
- decayp=1;
+ if(argv[0][1]=='o'){
+ order=atoi(argv[0]+2);
}
- if(argv[0][1]=='X'){
- ath=1;
- decayp=1;
+ if(argv[0][1]=='m'){
+ map=atoi(argv[0]+2);
}
}else
framesize=atoi(argv[0]);
@@ -308,11 +314,17 @@
_vp_compute_mask(&p_look,mask,mask+framesize/2,flr,NULL);
- analysis("floor",frameno,flr,framesize/2,0,0);
+ analysis("mask",frameno,flr,framesize/2,0,0);
for(j=0;j<framesize/2;j++)
- flr[j]=fromdB(flr[j]);
-
+ mask[j]=flr[j]+140.;
+
+ amp=sqrt(_curve_to_lpc(mask,mask,&floorlook));
+ vorbis_lpc_to_lsp(mask,mask,floorlook.m);
+ vorbis_lsp_to_curve(flr,floorlook.linearmap,floorlook.n,floorlook.ln,
+ mask,floorlook.m,amp,140.);
+
+ analysis("floor",frameno,flr,framesize/2,0,1);
/*for(j=0;j<framesize/2;){
float energy=0.;
1.23.2.1 +8 -10 vorbis/lib/res0.c
Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- res0.c 2000/12/21 21:04:41 1.23
+++ res0.c 2001/01/09 19:13:15 1.23.2.1
@@ -12,7 +12,7 @@
********************************************************************
function: residue backend 0 implementation
- last mod: $Id: res0.c,v 1.23 2000/12/21 21:04:41 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.23.2.1 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
@@ -32,7 +32,6 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
-#include "bitbuffer.h"
typedef struct {
vorbis_info_residue0 *info;
@@ -107,13 +106,12 @@
info->groupbook=oggpack_read(opb,8);
for(j=0;j<info->partitions;j++){
int cascade=info->secondstages[j]=oggpack_read(opb,4);
- if(cascade>1)goto errout; /* temporary! when cascading gets
- reworked and actually used, we don't
- want old code to DTWT */
acc+=cascade;
}
- for(j=0;j<acc;j++)
+ for(j=0;j<acc;j++){
info->booklist[j]=oggpack_read(opb,8);
+ if(info->booklist[j]==255)info->booklist[j]=-1;
+ }
if(info->groupbook>=ci->books)goto errout;
for(j=0;j<acc;j++)
@@ -230,7 +228,7 @@
fclose(f);
}
#endif
- bits+=vorbis_book_bufencode(books[j],entry,vbb);
+ bits+=vorbis_book_encode(books[j],entry,vbb);
}
}
return(bits);
@@ -255,7 +253,7 @@
}
int res0_forward(vorbis_block *vb,vorbis_look_residue *vl,
- float **in,int ch,vorbis_bitbuffer *vbb){
+ float **in,int ch){
long i,j,k,l;
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
@@ -307,13 +305,13 @@
long val=partword[j][l];
for(k=1;k<partitions_per_word;k++)
val= val*possible_partitions+partword[j][l+k];
- phrasebits+=vorbis_book_bufencode(look->phrasebook,val,vbb);
+ phrasebits+=vorbis_book_encode(look->phrasebook,val,vbb);
}
/* now we encode interleaved residual values for the partitions */
for(k=0;k<partitions_per_word;k++,l++,i+=samples_per_partition)
for(j=0;j<ch;j++){
/*resbits[partword[j][l]]+=*/
- resbitsT+=_encodepart(vbb,in[j]+i,samples_per_partition,
+ resbitsT+=_encodepart(&vb->opb,in[j]+i,samples_per_partition,
info->secondstages[partword[j][l]],
look->partbooks[partword[j][l]],look->map,partword[j][l]);
resvals[partword[j][l]]+=samples_per_partition;
1.5.2.1 +1 -2 vorbis/lib/window.h
Index: window.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/window.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- window.h 2000/11/06 00:07:03 1.5
+++ window.h 2001/01/09 19:13:15 1.5.2.1
@@ -12,14 +12,13 @@
********************************************************************
function: window functions
- last mod: $Id: window.h,v 1.5 2000/11/06 00:07:03 xiphmont Exp $
+ last mod: $Id: window.h,v 1.5.2.1 2001/01/09 19:13:15 xiphmont Exp $
********************************************************************/
#ifndef _V_WINDOW_
#define _V_WINDOW_
-#define VI_WINDOWB 1
extern float *_vorbis_window(int type,int window,int left,int right);
#endif
No revision
No revision
1.2.2.3 +36 -36 vorbis/lib/books/lsp12_0.vqh
Index: lsp12_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp12_0.vqh,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- lsp12_0.vqh 2001/01/02 02:28:12 1.2.2.2
+++ lsp12_0.vqh 2001/01/09 19:13:18 1.2.2.3
@@ -46,42 +46,42 @@
};
static long _vq_lengthlist_lsp12_0[] = {
- 12,12,12,12,12,12,12,12,11,12,11,12,12,12,12,12,
- 12,12,12,12,12,11,12,12,12,12,11,12,11,12,12,12,
- 12,11,12,11,12,12,12,12,12,12,12,12,12,12,12,12,
- 12,12,12,12,12,11,12,11,11,12,11,11,12,12,12,12,
- 12,12,12,12,12,12,12,12,12,12,11,11, 9, 9,10,10,
- 9, 9,10,10,10,11,11,11,11,11, 9,10,11,11,11,11,
- 11,11,11,11,10,11,11,10, 9,11,10,10,11,10,10,11,
- 9,10, 8,11,11,11,11,10,11,11,10,11,11,11,11,10,
- 11,10,11, 9, 9, 8, 8, 7, 7, 7, 8,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,10,10, 9, 9, 9, 9, 8, 8,
- 8, 6, 8,11,11,11,11,11,11,11,11,10,11,11,11,11,
- 10,11, 9, 8, 8, 8, 8, 9, 9, 7, 7,11,11,11,11,11,
- 11,11,10,10,10,11,11,11,10, 9, 8, 7, 7, 9, 9,10,
- 8, 7, 8,11,11,11,11,11,11,11,11,11,10,11,10, 9,
- 8, 8, 6, 5, 6, 7, 8, 8, 8, 7, 9,11,11,11,11,11,
- 11,11,11,11,11,10,10, 9, 7, 6, 5, 4, 5, 8, 9, 8,
- 10, 8,11,11,11,11,11,11,11,11,11,11,10, 8, 9, 9,
- 7, 6, 5, 4, 6, 7, 7, 8,10,10,11,11,11,11,11,11,
- 11,11,11,11,11, 9,10, 9, 8, 7, 6, 6, 6, 7, 8, 9,
- 10,10,11,11,11,11,11,11, 9,11,11,11,11, 9,11,11,
- 10, 8, 7, 7, 7, 7, 9, 9,11,11,10,11,11,11,11,11,
- 10,11,11,10,11,11,11,11,10, 9, 8, 7, 8,10, 9,10,
- 10,11,11,11,11,11,11,11,10,11,11,11,11,11,11, 9,
- 9,10, 9, 9, 9,10,10,10,10,11,11,11,11,11,11,11,
- 11,10,11,11,11,11,10, 9,11,11,10, 8,10, 9,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,10,11,
- 11,10,10,11, 9,10,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
- 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,11,11,11,11,11,11, 9,11,11,11,11,11,11,11,
+ 11,11,11,11,11,10,11,11,11,11,11,10,11,11,11,11,
+ 10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+ 11,11,10,11,11,11,11,10,11, 9, 8, 9,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, 9,
+ 9, 8,10,11,11,11,11,11,11,11,11,10,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,10,10,11,11,11,
+ 10,11,11,11,11,11,11,11,11,11,10,11,10,11,11,11,
+ 11,11,10,11,11,11,10,10,11,10,10,11,11,11,11, 9,
+ 11,11, 9, 8,10,11,11,11,11,11, 9,10,11, 9,11,11,
+ 11, 8, 9,11,11,11,11,11,11,11, 8, 9,11,11,11,11,
+ 10, 9, 9,10,11,10,10, 9,11, 8, 9,11,11,11,11,11,
+ 11,11,11,11,11, 9,11,11,11, 7,10, 8, 9,11,10, 9,
+ 9, 7, 9,11,11,11,11,11,11,11,10,10,11, 9,10,11,
+ 9, 7, 7, 7, 8,10,10, 9, 8, 7, 9,10,10,10,10,10,
+ 10,10,10,10,10,10, 9, 9, 7, 6, 6, 6, 7, 9, 7, 9,
+ 8, 8, 9,10,10,10,10,10,10,10,10,10, 9, 9, 9,10,
+ 7, 6, 5, 6, 6, 8, 6, 9, 8, 9,10,10,10,10,10,10,
+ 10,10,10,10,10, 9, 8, 9, 8, 6, 5, 6, 6, 6, 8, 8,
+ 9, 9,10,10,10,10,10,10, 8, 9,10,10,10,10, 9,10,
+ 9, 8, 6, 5, 6, 7, 9,10,10,10, 9,10,10,10,10,10,
+ 9,10,10,10,10, 9,10, 9, 9, 8, 7, 7, 6, 9, 9, 9,
+ 9,10,10,10,10,10,10,10, 9, 9,10,10,10,10, 9, 9,
+ 9,10, 9, 8, 8,10, 9,10,10,10,10,10,10,10,10,10,
+ 9,10,10,10,10,10,10,10,10, 9,10, 9,10, 8,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10, 9,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
};
static long _vq_pigeonmap_lsp12_0[] = {
1.1.2.3 +45 -45 vorbis/lib/books/Attic/lsp12_1.vqh
Index: lsp12_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/lsp12_1.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- lsp12_1.vqh 2001/01/02 02:28:12 1.1.2.2
+++ lsp12_1.vqh 2001/01/09 19:13:18 1.1.2.3
@@ -31,51 +31,51 @@
};
static long _vq_lengthlist_lsp12_1[] = {
- 17,17,17,17,15,14,17,17,16,16,16,16,15,15,14,16,
- 15,16,16,15,14,13,13,12,14,16,15,14,13,15,13,11,
- 11,13,14,15,16,15,13,10, 9,10,11,12,14,15,16,14,
- 10,10,10,12,12,13,14,15,13,12,12,11,12,13,14,14,
- 15,13,13,13,12,13,15,16,16,15,15,13,13,14,16,16,
- 16,16,16,16,16,16,16,15,16,16,16,15,14,14,14,14,
- 15,14,16,14,13,13,12,11,12,13,15,16,12,13,12,11,
- 9, 9,11,13,14,16,16,11, 8, 7, 8,10,12,12,14,15,
- 12, 8, 9, 9,10,11,12,14,15,13,11,10,11,12,13,13,
- 16,15,13,12,12,12,13,14,15,15,16,14,15,13,15,13,
- 15,15,16,16,15,15,16,15,14,15,15,15,14,13,14,12,
- 12,12,14,15,14,13,13,11, 9,10,11,13,12,13,13,11,
- 8, 7, 9,11,13,12,14,13,10, 7, 6, 8, 9,10,11,16,
- 13,11, 7, 8, 9,10,11,12,16,14,12,10,10,10,11,12,
- 13,15,13,13,11,12,11,12,13,15,15,15,14,15,14,13,
- 15,15,14,15,15,13,15,14,13,11,13,12,16,15,14,12,
- 11, 9,11,12,12,15,15,11, 9, 8, 8,10,11,10,15,13,
- 9, 7, 6, 8, 9,10,10,14,12, 9, 6, 4, 6, 8,10,11,
- 13,13, 9, 6, 7, 7, 9,10,13,15,13,10, 9, 8, 9,10,
- 11,14,14,14,12,11,10,10,11,12,14,14,16,14,13,12,
- 13,14,15,16,16,15,13,13,14,13,10,10, 9,15,15,12,
- 10,10, 9, 8, 9, 9,16,13,10, 8, 8, 7, 7, 8,10,15,
- 11, 8, 7, 5, 5, 7,10,11,13,11, 8, 5, 3, 5, 8,10,
- 12,13,11, 9, 6, 6, 7, 8,10,12,15,13,10, 8, 7, 8,
- 9,10,13,14,13,11,10, 9,10,11,12,14,15,15,13,12,
- 11,13,13,14,15,14,15,14,13,13,12,13,11, 9,16,14,
- 11,10,11,12,11, 8,13,16,12, 9, 9, 9,10, 6,12,13,
- 13,11, 9, 7, 7, 5,10,12,14,12,10, 8, 7, 5, 7, 8,
- 10,13,13,11, 9, 7, 7, 7, 8,10,13,14,11,10, 8, 8,
- 8, 9,11,13,15,12,11,10, 9,10,11,12,14,14,13,12,
- 11,12,13,13,15,15,16,15,14,13,13,15,15,15,15,15,
- 14,12,11,12,14,14,15,16,14,12,10,10,10,11,13,14,
- 16,13,11,10, 9, 9, 9,11,13,14,12,10,10, 9, 8, 8,
- 9,11,14,13,11,10, 9, 8, 8, 9,11,14,13,11,11, 9,
- 9, 9,10,12,15,13,12,12,11,10,11,12,13,15,14,13,
- 13,14,13,15,16,15,15,14,13,13,13,15,15,16,15,15,
- 15,13,13,14,13,15,15,16,16,15,12,12,12,12,13,14,
- 16,16,13,12,11,11,11,11,12,15,15,12,12,11,10,10,
- 10,12,14,16,13,12,12,11,10,10,12,13,15,14,13,12,
- 12,11,11,13,16,16,15,15,14,13,13,13,15,16,16,16,
- 16,15,14,15,14,16,16,16,15,15,16,16,13,16,16,16,
- 16,16,15,15,12,14,16,15,16,16,13,15,15,13,14,14,
- 16,16,16,13,14,14,14,13,14,15,16,16,13,14,14,13,
- 15,14,15,15,16,14,14,16,14,13,14,15,16,16,14,15,
- 15,14,14,16,16,16,16,16,16,14,16,16,15,16,16,16,
+ 17,17,16,16,16,16,16,16,16,16,16,16,14,16,15,16,
+ 16,16,15,16,15,15,15,15,15,15,16,13,12,14,15,13,
+ 15,15,15,15,14,15,16,13,12,14,14,16,15,16,15,14,
+ 12,11,13,15,15,14,16,16,15,14,14,14,15,14,15,16,
+ 16,16,14,14,15,16,15,15,16,16,15,15,15,14,15,15,
+ 16,16,16,16,16,15,15,15,16,16,16,15,14,15,14,16,
+ 15,15,15,15,14,15,13,13,15,15,14,15,12,12,13,11,
+ 11,12,15,14,14,14,14,13, 9,10,11,13,12,12,16,14,
+ 13,10,10,12,13,13,12,16,16,14,12,12,12,13,13,14,
+ 16,16,15,13,14,13,13,14,15,16,16,15,15,16,16,14,
+ 14,16,16,16,15,15,16,15,14,14,16,14,14,16,16,13,
+ 13,14,14,14,16,16,14,12,10,12,12,13,13,15,13,12,
+ 9, 9,10,11,12,12,16,14, 9, 7, 7, 9,11,12,11,15,
+ 13,10, 8, 8, 9,10,11,13,15,15,14,10, 9,10,11,12,
+ 14,16,16,14,12,11,11,12,13,15,16,15,16,16,13,14,
+ 14,15,15,16,15,16,15,15,13,13,13,14,14,14,15,13,
+ 10,11,11,12,12,15,15,13, 9, 8,10,10,11,11,16,15,
+ 9, 7, 7, 8, 9,10,10,14,12, 8, 6, 5, 7, 9,10,12,
+ 16,13, 9, 6, 6, 8, 9,10,14,14,15,11, 9, 8, 9,10,
+ 11,13,15,14,14,11,10,10,11,12,15,16,16,15,14,12,
+ 13,15,14,15,15,14,16,14,12,11,11,12,14,16,15,14,
+ 11, 8, 9,10,11,11,16,14,10, 8, 7, 7, 8, 9,11,16,
+ 12, 8, 6, 5, 6, 7, 9,11,14,10, 8, 5, 3, 5, 8,11,
+ 12,13,11, 9, 5, 4, 7, 8,10,13,16,12,11, 8, 8, 8,
+ 9,11,13,14,13,13,10, 9,10,11,12,15,15,16,14,12,
+ 12,13,13,14,15,15,16,14,14,13,12,11,11,15,16,16,
+ 12,11,11,10, 9,11,14,16,13,10, 9, 8, 7, 9,11,14,
+ 15,11, 9, 7, 5, 6, 9,11,13,13,10, 8, 6, 4, 6, 8,
+ 10,13,13,11, 9, 7, 7, 7, 8,10,13,15,12,10, 8, 8,
+ 8, 9,11,13,15,13,12,10,10,10,11,13,14,15,14,12,
+ 12,12,13,14,15,16,15,16,15,13,14,14,14,14,14,16,
+ 15,14,11,11,11,13,14,15,16,14,11,10, 9, 9,11,12,
+ 15,15,12,10, 9, 7, 8,10,11,14,12,11,10, 8, 8, 8,
+ 9,10,14,13,12,10, 9, 8, 8, 9,11,14,13,12,11, 9,
+ 9, 9,10,12,14,14,13,12,10,10,10,11,14,15,14,14,
+ 12,12,13,15,15,15,15,13,15,15,14,13,13,14,16,15,
+ 14,15,14,13,12,12,13,15,16,15,15,13,11,10,11,12,
+ 14,16,15,14,12,10, 9,10,11,12,14,13,12,11,10, 9,
+ 9,10,12,13,15,12,11,10, 9, 9,11,13,14,15,13,12,
+ 11,10,11,12,16,16,15,14,13,13,12,13,15,16,16,15,
+ 15,13,13,16,14,15,16,16,14,15,14,13,14,14,15,15,
+ 16,15,14,13,13,13,13,13,15,16,15,15,12,13,11,13,
+ 13,15,16,16,12,13,12,11,12,13,15,15,14,13,13,12,
+ 12,12,13,15,16,16,15,12,12,12,13,14,16,16,15,16,
+ 13,14,13,16,15,16,16,16,16,15,15,15,15,16,16,16,
16,16,16,16,15,16,16,16,16,
};
1.2.2.3 +31 -31 vorbis/lib/books/lsp30_0.vqh
Index: lsp30_0.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/lsp30_0.vqh,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- lsp30_0.vqh 2001/01/02 02:28:12 1.2.2.2
+++ lsp30_0.vqh 2001/01/09 19:13:18 1.2.2.3
@@ -44,37 +44,37 @@
};
static long _vq_lengthlist_lsp30_0[] = {
- 18,18,18,18,18,18,17,17,17,17,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,17,17,17,15,16,16,17,15,14,
- 13,13,12,12,12,12,14,15,16,17,17,17,17,17,17,17,
- 16,17,17,15,13,12,12,13,13,13,12,12,13,15,16,17,
- 17,17,17,17,17,16,17,16,17,16,12,12,13,13,14,13,
- 13,13,13,14,16,17,17,17,17,17,17,17,16,17,13,13,
- 14,13,14,14,13,12,13,14,13,14,16,17,17,17,17,15,
- 15,17,15,14,12,11,12,13,12,11,11,11,12,13,13,14,
- 16,15,16,17,17,16,15,15,15,12,11,11,10,11,11,12,
- 11,11,11,12,12,14,12,13,16,17,17,15,15,14,13,11,
- 10,12,11,11,12,13,12,10,11,10,11,11,11,12,15,17,
- 17,15,15,15,15,14,11,12,12,14,12,11,11,10, 9, 9,
- 10,10,10,11,14,17,17,15,17,17,15,16,13,12,12,11,
- 11,10,10, 9, 8, 9, 9,10,10,11,15,17,17,14,15,15,
- 15,15,14,10,11,11,11,10, 9, 8, 7, 9,10,11, 9,11,
- 15,17,17,14,14,12,12,13,12,10,10,11, 9,10, 9, 7,
- 7, 9, 9,11,10,11,15,17,17,13,12,11,11,11, 9, 9,
- 10,10, 9, 9, 7, 6, 6, 7, 9,10,10,11,15,17,17,13,
- 13,11,10, 8, 9, 8, 8, 9, 8, 7, 5, 4, 4, 6, 7, 8,
- 9,10,15,17,17,15,13,11, 9, 8, 9,10,10, 9, 9, 7,
- 6, 4, 3, 5, 6, 8, 9,10,16,16,17,14,14,10, 9, 9,
- 9, 9,10,10, 9, 9, 7, 5, 4, 5, 6, 7, 8,12,17,17,
- 17,13,14,12,11,10, 9, 9,10,11,10,10, 8, 6, 6, 6,
- 7, 7, 8,13,17,17,17,14,15,15,13,11,10,10,11,11,
- 10, 9, 9, 7, 7, 7, 7, 8, 9,15,16,16,17,16,15,16,
- 15,12,11,10,10,10,11,11,11,10, 9, 8,10,10,14,16,
- 16,12,17,17,17,16,16,17,12,11,10, 9, 9, 8, 8, 8,
- 9,11,13,15,14,15,16,15,17,17,17,17,17,17,15,12,
- 11,11,11,10,11,13,15,16,16,16,12,16,16,15,17,17,
- 17,17,17,17,17,17,16,16,16,17,17,17,16,17,16,15,
- 14,15,15,16,
+ 18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,
+ 18,18,18,18,18,18,18,18,17,18,16,17,17,15,14,12,
+ 11,12,12,12,12,12,12,13,17,18,18,18,18,18,18,18,
+ 17,18,18,15,13,13,14,14,13,13,12,13,13,14,17,18,
+ 18,18,18,18,18,17,18,18,13,12,14,13,13,13,13,13,
+ 13,15,13,14,17,18,18,18,18,18,18,18,16,15,12,11,
+ 13,13,13,13,12,12,12,13,13,15,16,17,18,18,18,15,
+ 16,18,14,13,14,12,11,11,12,12,12,12,11,12,12,13,
+ 13,15,18,18,18,16,15,14,11,11,13,15,11,11,12,13,
+ 12,11,11,11,11,11,11,14,18,18,18,16,16,14,13,11,
+ 12,14,13,12,11,12,11,11,10,10,10,10,11,12,16,18,
+ 18,15,16,15,15,13,12,14,13,13,13,11,11,10, 9, 9,
+ 10,10,10,12,15,18,18,15,18,16,16,15,14,12,12,11,
+ 11,10,10, 9, 8, 9,10,10,10,11,15,18,18,15,18,15,
+ 18,15,14,12,13,11,10,10, 9, 9, 8, 9,10,11,10,11,
+ 15,18,18,13,13,13,14,13,10,11,10,11,10,10, 9, 8,
+ 8, 9, 9,11,10,11,15,18,18,11,11,12,12,11,10,11,
+ 10,11,10, 9, 7, 6, 6, 7, 9,10, 9,11,15,18,18,13,
+ 12,11,10, 8, 8, 8, 9, 9, 8, 7, 5, 4, 4, 6, 8, 8,
+ 9,10,15,18,18,15,13,11, 9, 8, 9, 9,10, 9, 8, 7,
+ 6, 4, 3, 4, 6, 8, 9,10,17,17,18,14,14,11, 9, 9,
+ 9, 9,10,10, 9, 9, 7, 5, 4, 5, 6, 8, 8,12,18,18,
+ 18,14,14,12,11,10, 9, 9, 9,10,10, 9, 8, 6, 6, 6,
+ 7, 7, 8,13,18,18,18,15,15,15,13,12,10,10,11,10,
+ 10, 9, 9, 7, 7, 7, 8, 8,10,15,17,17,18,17,16,16,
+ 15,13,11,10,10,10,10,10,10,10, 9, 9,10,10,14,17,
+ 17,12,18,18,18,17,18,15,12,11,10, 9, 9, 9, 8, 8,
+ 9,12,13,16,15,16,17,16,18,18,18,18,18,18,17,13,
+ 12,11,11,11,11,13,15,16,17,16,12,17,17,16,18,18,
+ 18,18,18,18,18,18,18,16,17,17,18,18,17,18,16,16,
+ 14,16,16,16,
};
static long _vq_pigeonmap_lsp30_0[] = {
1.1.2.3 +106 -106 vorbis/lib/books/Attic/lsp30_1.vqh
Index: lsp30_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/Attic/lsp30_1.vqh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- lsp30_1.vqh 2001/01/02 02:28:12 1.1.2.2
+++ lsp30_1.vqh 2001/01/09 19:13:18 1.1.2.3
@@ -34,114 +34,114 @@
};
static long _vq_lengthlist_lsp30_1[] = {
- 20,20,20,19,20,20,20,20,20,20,20,20,20,20,20,20,
- 18,18,20,17,20,20,20,20,20,20,20,20,17,18,20,18,
- 18,20,20,20,20,20,20,20,19,18,18,20,16,20,19,19,
- 19,19,19,19,18,17,19,16,16,19,19,19,19,19,19,19,
- 19,19,15,15,16,17,19,19,19,19,19,19,19,19,15,15,
- 16,19,19,19,19,19,19,19,19,19,15,15,17,18,18,19,
- 19,19,19,19,19,16,17,17,19,19,19,19,19,19,19,19,
- 19,19,17,17,18,19,19,19,19,19,19,19,19,16,18,18,
- 17,17,18,19,19,19,19,19,19,19,19,17,19,17,19,19,
- 19,19,18,19,18,17,19,17,18,19,19,19,19,19,19,17,
- 19,17,19,16,19,18,19,19,19,19,19,19,19,17,16,17,
- 17,19,19,18,19,19,19,18,19,17,17,15,16,17,19,19,
- 19,19,19,18,17,16,15,13,15,18,19,19,19,19,19,19,
- 19,15,14,14,15,18,19,19,19,19,19,19,19,16,13,13,
- 15,18,18,19,19,19,19,19,19,14,14,13,16,18,18,19,
- 19,19,19,19,18,16,14,16,17,15,17,18,19,19,19,17,
- 19,17,16,17,15,14,18,19,19,19,19,18,19,19,17,17,
- 15,16,19,19,19,19,19,19,19,19,18,19,15,18,19,19,
- 19,19,17,18,19,18,16,16,19,19,19,19,19,19,19,19,
- 19,19,17,14,15,17,19,19,19,19,19,19,19,19,16,14,
- 15,18,18,19,19,19,18,19,19,16,15,14,15,17,18,19,
- 19,19,18,17,16,15,14,14,15,18,18,19,18,18,18,18,
- 17,14,13,13,15,17,19,19,19,19,19,19,16,13,11,13,
- 14,16,18,17,19,19,19,19,19,14,13,13,15,15,16,18,
- 19,19,19,18,19,15,15,14,14,14,18,19,19,19,19,17,
- 17,16,16,16,15,16,17,18,19,19,19,19,17,16,16,16,
- 16,17,17,19,19,19,19,19,17,18,17,13,17,18,19,19,
- 19,19,17,19,19,17,17,15,14,16,19,19,19,19,17,16,
- 17,19,15,14,15,16,19,19,19,19,17,18,17,18,15,13,
- 14,16,19,17,19,18,17,16,16,15,14,14,16,17,17,19,
- 19,18,18,18,16,13,13,13,15,17,17,19,15,15,17,16,
- 13,11,11,12,14,15,18,19,19,18,18,16,14,11,11,11,
- 13,15,17,19,19,19,19,17,15,13,11,12,14,14,16,19,
- 19,19,19,17,17,14,12,13,13,15,16,19,19,15,19,19,
- 15,14,14,15,14,15,18,19,19,18,18,17,16,17,17,16,
- 15,17,19,19,19,19,19,18,19,17,16,14,16,17,19,19,
- 16,17,19,14,14,16,16,15,16,18,19,19,19,19,15,13,
- 13,15,14,15,16,17,19,19,19,19,16,15,12,15,14,14,
- 15,17,17,19,19,18,17,16,14,13,13,13,14,15,16,19,
- 15,15,14,13,13,11,10,12,14,16,17,19,14,12,12,11,
- 10, 9, 9,11,13,14,17,19,17,15,14,13,10, 8, 8,10,
- 12,14,16,18,19,19,17,16,12,10, 9,11,13,14,15,18,
- 17,16,16,16,14,11,11,12,13,15,19,19,16,15,16,16,
- 14,13,14,14,15,16,19,19,18,17,16,17,16,16,15,15,
- 15,17,19,19,19,18,19,18,17,16,13,14,16,17,19,18,
- 15,15,15,14,13,14,13,14,17,17,19,19,17,16,15,14,
- 13,12,12,15,17,18,19,18,18,17,15,13,13,12,12,14,
- 15,16,19,19,15,15,14,13,12,11,11,12,13,16,17,18,
- 12,12,12,10, 9, 8, 7, 9,12,14,17,18,11,12,10, 9,
- 7, 5, 5, 8,11,13,15,18,15,13,12,10, 8, 4, 4, 7,
- 11,13,15,17,16,16,14,12,10, 7, 7, 9,11,13,16,19,
- 15,16,16,14,12,10,10,11,12,15,19,19,16,17,15,15,
- 14,13,13,13,15,15,19,19,18,16,17,16,15,15,13,15,
- 17,17,19,19,18,19,19,15,14,14,14,14,16,18,19,18,
- 19,19,19,17,17,16,14,14,14,16,17,19,17,19,15,14,
- 14,13,13,13,14,16,17,19,16,15,14,14,13,12,11,11,
- 13,15,18,19,15,14,14,14,12,10,10,10,12,15,16,18,
- 14,13,13,12,10, 8, 7, 9,11,14,17,19,15,14,12,10,
- 8, 5, 3, 7,11,13,15,18,16,14,12,10, 8, 4, 3, 6,
- 10,12,16,18,16,15,13,12,10, 6, 6, 8,10,11,15,19,
- 17,15,14,13,11,10, 9, 9, 9,11,16,19,16,15,15,14,
- 13,12,10,10,11,14,17,19,17,17,17,16,14,13,13,14,
- 15,18,18,18,19,17,14,12,13,13,12,15,18,18,18,18,
- 19,19,19,19,19,16,16,15,13,18,18,19,19,19,16,15,
- 15,14,14,12,11,17,16,19,16,17,16,15,14,13,12,10,
- 12,15,17,19,17,18,16,13,13,11,10, 9,13,16,17,19,
- 17,15,14,12,11, 9, 8, 8,12,15,17,19,14,13,12,11,
- 9, 7, 6, 8,12,15,19,18,15,13,12,11, 9, 6, 5, 7,
- 10,13,16,19,15,13,12,11, 9, 8, 7, 7, 9,12,16,19,
- 15,15,14,12,11, 9, 7, 8,10,13,17,19,15,14,14,13,
- 13,11,10,11,12,14,17,19,16,15,13,13,13,13,12,15,
- 15,17,19,19,18,14,12,12,12,12,13,16,17,18,19,19,
- 19,19,19,19,17,16,16,17,15,19,19,19,16,17,16,17,
- 16,17,15,14,13,19,19,19,18,18,17,15,15,14,14,11,
- 14,18,18,19,19,18,16,14,13,13,11, 9,14,16,16,19,
- 17,17,16,13,12,11, 9, 9,13,15,17,19,16,15,13,12,
- 10, 9, 7, 9,12,15,18,19,15,13,12,11,10, 7, 7, 9,
- 12,15,19,19,14,13,12,11,10, 8, 7, 9,11,15,18,19,
- 13,13,13,12,11, 9, 9,11,13,15,19,19,14,13,13,13,
- 12,11,11,13,14,16,19,19,15,13,12,12,13,13,14,15,
- 18,19,19,19,16,13,11,12,13,13,16,17,19,19,19,19,
- 19,19,18,19,19,18,19,19,18,19,19,19,19,19,17,19,
- 18,17,18,18,18,18,19,19,19,18,18,17,17,16,16,14,
- 17,19,19,19,19,18,17,16,14,14,14,12,16,17,17,19,
- 18,19,17,14,14,13,12,11,15,18,19,19,17,16,15,13,
- 12,10, 9,11,14,17,18,19,16,14,13,12,11, 9, 9,13,
- 15,19,19,19,14,14,13,12,10, 9,10,13,15,17,19,19,
- 13,13,13,12,11,11,12,14,15,18,19,19,13,13,13,12,
- 12,12,14,15,18,18,19,19,14,12,11,12,14,14,18,19,
- 19,19,19,18,17,13,12,12,13,15,18,19,19,19,19,19,
+ 20,20,20,20,20,18,18,17,18,20,19,19,19,19,19,19,
+ 18,18,18,17,17,17,19,19,19,19,19,19,19,18,18,17,
+ 16,17,19,19,19,19,19,18,19,17,18,15,15,18,19,19,
+ 19,19,19,18,17,17,17,16,15,17,19,19,19,19,19,19,
+ 19,17,15,16,15,18,19,19,19,19,19,19,18,17,14,14,
+ 15,18,19,19,19,19,19,18,18,15,14,15,17,18,18,18,
+ 19,19,19,19,19,16,16,17,19,16,16,19,19,19,19,18,
+ 19,17,18,16,17,15,18,19,19,19,19,19,18,18,19,17,
+ 16,17,18,19,19,19,19,19,18,19,18,17,16,17,18,19,
+ 19,19,19,18,18,18,18,17,16,17,19,19,19,19,19,19,
+ 19,19,18,16,16,18,19,19,19,19,19,19,19,19,19,15,
+ 14,16,19,19,19,19,19,19,18,18,16,14,14,17,19,19,
+ 19,19,19,18,17,16,15,14,14,18,19,19,19,19,19,18,
+ 17,16,14,13,15,18,19,19,19,19,19,19,17,16,12,13,
+ 15,17,17,19,19,19,19,18,17,14,13,14,17,16,18,19,
+ 19,19,19,18,18,17,15,16,16,15,17,18,19,19,18,17,
+ 17,17,16,16,15,15,18,19,19,19,19,18,19,16,16,17,
+ 15,16,19,19,19,19,19,19,18,19,17,16,15,19,19,19,
+ 19,19,19,19,19,19,17,16,14,15,17,19,19,19,19,19,
+ 19,17,17,15,15,18,19,19,19,19,19,19,18,17,16,15,
+ 14,17,19,19,19,19,19,18,18,17,16,14,15,17,19,19,
+ 19,19,19,17,17,15,14,14,15,17,18,19,19,19,18,17,
+ 16,13,13,13,15,17,19,19,19,19,18,18,16,13,11,12,
+ 14,15,18,18,19,19,19,17,16,14,12,13,14,14,16,19,
+ 19,19,19,18,17,16,14,14,14,14,17,19,19,18,16,17,
+ 17,15,15,15,14,16,17,18,18,19,19,19,17,16,16,16,
+ 16,17,17,19,19,19,18,19,18,18,17,13,16,19,19,19,
+ 19,19,18,18,17,17,17,14,14,15,19,19,19,19,18,19,
+ 19,18,16,15,15,16,19,19,19,18,17,17,18,17,16,14,
+ 14,18,18,17,19,18,18,19,17,15,14,14,15,18,18,19,
+ 19,18,18,16,16,13,13,13,14,17,16,19,16,15,15,15,
+ 13,11,11,12,14,16,18,19,19,16,16,14,13,11,10,11,
+ 13,15,17,18,19,19,19,16,15,12,11,12,14,14,16,19,
+ 19,19,16,17,16,14,12,13,13,15,17,19,17,15,16,17,
+ 15,13,14,15,15,15,18,19,18,18,18,17,15,16,18,16,
+ 15,16,19,19,19,19,19,18,19,17,16,14,16,17,19,19,
+ 19,19,17,13,14,13,15,15,16,18,19,19,19,19,18,15,
+ 13,16,16,15,15,18,19,19,19,18,16,15,16,15,14,14,
+ 15,17,17,18,19,18,18,16,15,14,13,13,14,16,17,19,
+ 17,17,15,13,13,11,11,12,13,15,17,19,14,12,12,11,
+ 10, 9, 9,11,13,15,17,19,15,14,13,12,10, 8, 8,10,
+ 12,14,16,17,17,17,16,15,13,10, 9,11,13,14,16,19,
+ 17,17,16,15,14,12,11,12,13,15,19,19,16,17,17,16,
+ 14,13,14,14,14,16,19,19,18,17,16,16,17,15,15,15,
+ 16,17,19,19,18,19,19,17,16,15,14,14,16,17,19,18,
+ 17,16,16,14,14,14,14,15,16,17,19,19,16,17,17,15,
+ 13,13,13,14,16,18,19,19,17,17,16,15,14,13,13,13,
+ 15,17,19,19,16,15,15,13,12,11,11,11,13,16,17,19,
+ 13,13,12,11,10, 8, 8,10,12,14,17,19,12,12,10, 9,
+ 7, 5, 5, 8,11,13,15,18,13,12,12,10, 8, 4, 4, 7,
+ 11,14,16,18,16,15,14,12,10, 7, 7, 9,12,13,16,18,
+ 15,16,15,14,12,10,10,11,12,15,19,19,16,17,15,15,
+ 15,13,12,13,15,16,19,19,18,17,18,16,15,14,13,15,
+ 17,17,19,19,19,19,18,15,14,14,14,14,16,18,19,18,
+ 17,17,16,15,14,13,14,14,14,17,17,19,15,16,14,13,
+ 13,13,13,13,14,17,17,19,14,14,14,14,13,12,11,11,
+ 13,16,17,19,14,14,14,13,12,10, 9,10,12,15,16,18,
+ 13,14,14,12,10, 8, 7, 9,11,14,17,19,14,14,12,10,
+ 8, 5, 3, 7,11,13,15,17,14,13,12,10, 8, 4, 3, 6,
+ 10,12,15,19,16,14,13,11, 9, 6, 6, 8,10,11,14,19,
+ 16,16,14,12,11,10, 9, 9, 9,11,15,19,17,15,15,14,
+ 13,12,10,10,11,14,17,19,17,17,17,16,14,14,12,14,
+ 15,18,18,18,18,17,14,12,13,13,12,15,18,18,18,18,
+ 19,18,19,17,15,14,15,15,12,16,18,19,17,17,15,15,
+ 15,14,13,12,11,16,17,19,16,16,15,15,14,13,12,10,
+ 12,15,18,19,16,15,15,13,13,11,10, 8,12,16,18,19,
+ 15,15,13,12,11, 9, 8, 8,12,15,17,19,14,13,12,11,
+ 9, 7, 6, 8,12,15,18,18,14,12,12,11, 9, 6, 5, 7,
+ 10,13,17,19,14,13,12,11, 9, 7, 7, 7, 9,12,16,19,
+ 16,15,14,12,11, 9, 7, 8,10,13,17,19,16,15,15,14,
+ 12,11, 9,11,12,14,18,19,17,15,14,14,14,13,13,15,
+ 15,18,19,19,18,14,12,12,12,12,13,16,17,18,19,19,
+ 17,19,17,17,17,16,16,16,16,17,17,18,17,16,16,17,
+ 16,16,15,14,13,17,17,19,17,17,16,15,15,15,14,11,
+ 14,17,18,18,18,17,15,14,14,13,11, 9,13,19,19,18,
+ 17,17,15,13,12,11, 9, 9,13,16,18,19,16,14,13,11,
+ 11, 9, 7, 9,12,15,18,19,14,13,12,11,10, 7, 7, 9,
+ 12,15,19,19,14,13,12,11,10, 8, 7, 9,11,14,18,19,
+ 14,13,13,12,11, 9, 9,11,13,16,19,19,14,13,13,13,
+ 12,11,12,13,13,17,19,19,15,14,13,12,13,13,14,16,
+ 17,19,19,19,17,13,11,12,14,13,16,17,19,19,19,19,
+ 19,18,18,19,19,18,18,19,19,17,18,19,19,19,17,19,
+ 18,17,17,18,19,16,17,19,19,18,17,16,17,15,16,14,
+ 17,16,17,19,18,18,17,16,14,15,14,13,15,16,17,18,
+ 17,18,17,14,13,13,12,11,15,16,18,19,17,16,15,13,
+ 12,10,10,11,14,17,18,19,15,14,13,12,11, 9, 9,12,
+ 15,18,19,19,14,14,13,12,11, 9,10,13,15,18,19,19,
+ 14,13,13,12,12,11,12,15,16,17,19,19,14,13,13,13,
+ 12,12,14,16,18,19,19,19,16,13,12,12,14,15,18,19,
+ 19,19,19,18,17,13,12,13,13,16,18,19,19,19,19,19,
19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,18,19,19,19,19,18,19,18,19,17,19,18,
- 19,19,19,19,19,18,18,16,16,16,17,18,18,19,19,19,
- 19,19,17,15,15,15,14,16,18,19,19,19,17,16,15,14,
- 14,12,13,15,19,19,19,19,15,14,14,13,11,11,13,17,
- 18,19,19,19,14,14,14,13,12,12,13,16,18,19,19,19,
- 13,13,14,14,14,13,16,16,19,19,19,19,14,13,13,14,
- 14,15,18,18,19,19,19,19,14,14,14,14,14,17,19,19,
- 19,19,19,19,16,14,13,13,14,17,19,19,19,19,19,19,
+ 18,19,19,19,18,19,19,19,19,19,18,19,19,19,19,19,
+ 19,19,19,19,18,19,18,17,16,16,17,18,17,19,19,19,
+ 18,18,17,15,15,15,14,17,18,19,19,19,17,17,15,14,
+ 14,12,13,16,19,19,19,19,15,14,14,14,12,11,13,16,
+ 19,19,19,19,14,14,14,13,12,12,13,16,18,19,19,19,
+ 14,14,14,14,14,13,16,16,18,19,19,19,15,13,13,14,
+ 15,15,18,18,19,19,19,19,16,13,14,15,15,18,19,19,
+ 19,19,19,19,18,14,13,13,15,17,19,19,19,19,19,19,
19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,
- 19,19,19,19,19,19,19,19,19,19,19,19,18,19,17,19,
- 19,19,19,19,19,19,19,19,18,17,19,19,19,19,19,19,
- 19,19,19,17,17,17,19,17,19,19,19,19,18,17,16,16,
- 16,15,17,17,19,19,19,19,15,15,15,16,15,15,17,17,
- 18,19,19,19,14,14,16,15,15,15,17,17,19,19,19,19,
- 14,14,15,16,16,16,19,19,19,19,19,19,15,14,15,15,
- 16,17,19,17,19,19,19,19,16,15,14,14,17,18,19,19,
- 19,19,19,19,15,13,13,14,16,17,19,19,19,19,19,19,
+ 18,18,19,19,19,19,19,19,19,19,19,19,18,19,18,19,
+ 19,19,19,19,19,19,19,19,18,18,19,19,19,19,19,19,
+ 19,19,19,17,18,17,18,18,19,19,19,19,18,17,16,17,
+ 16,15,17,17,19,19,19,19,15,15,15,16,16,16,17,17,
+ 18,19,19,19,14,15,16,16,15,16,16,17,19,19,19,19,
+ 15,14,15,16,16,17,18,19,19,19,19,19,15,14,15,16,
+ 16,17,19,17,19,19,19,19,16,16,14,15,16,18,19,19,
+ 19,19,19,19,16,14,13,14,17,18,19,19,19,19,19,19,
};
static long _vq_pigeonmap_lsp30_1[] = {
1.2.2.1 +13 -14 vorbis/lib/books/res0_128_1024_1.vqh
Index: res0_128_1024_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_1.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_1.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -21,17 +20,17 @@
static long _vq_quantlist_res0_128_1024_1[] = {
1,
- 2,
0,
+ 2,
};
static long _vq_lengthlist_res0_128_1024_1[] = {
- 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,11,11, 8,
- 11,11, 5, 8, 8, 8,11,11, 8,11,11, 4, 8, 8, 8,11,
- 11, 8,11,11, 8,11,11,11,15,15,11,15,15, 8,11,11,
- 11,15,15,12,15,15, 5, 8, 8, 8,11,11, 8,11,11, 8,
- 11,11,11,15,15,11,15,15, 8,11,11,12,15,15,11,15,
- 15,
+ 1, 4, 4, 4, 8, 8, 4, 8, 8, 5, 8, 8, 9,12,12, 9,
+ 12,12, 4, 8, 8, 8,12,12, 8,12,12, 5, 8, 8, 9,12,
+ 12, 8,12,12, 9,12,12,12,16,16,13,16,16, 8,12,12,
+ 12,16,16,12,16,16, 5, 8, 8, 8,12,12, 8,12,12, 8,
+ 12,12,13,16,16,12,16,16, 8,12,12,12,16,16,12,16,
+ 16,
};
static float _vq_quantthresh_res0_128_1024_1[] = {
@@ -39,7 +38,7 @@
};
static long _vq_quantmap_res0_128_1024_1[] = {
- 2, 0, 1,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_1 = {
1.1.2.1 +13 -14 vorbis/lib/books/res0_128_1024_2.vqh
Index: res0_128_1024_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_2.vqh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- res0_128_1024_2.vqh 2000/11/08 06:08:13 1.1
+++ res0_128_1024_2.vqh 2001/01/09 19:13:18 1.1.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -21,17 +20,17 @@
static long _vq_quantlist_res0_128_1024_2[] = {
1,
- 2,
0,
+ 2,
};
static long _vq_lengthlist_res0_128_1024_2[] = {
- 3, 4, 4, 4, 6, 6, 5, 6, 6, 4, 6, 6, 6, 8, 8, 6,
- 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8,
- 8, 6, 8, 8, 6, 8, 8, 8,10,10, 8,10,10, 6, 8, 8,
- 8,10,10, 8,10,10, 5, 6, 7, 6, 8, 8, 7, 8, 8, 6,
- 8, 8, 8,10,10, 8,10,10, 6, 8, 8, 8,10,10, 8,10,
- 10,
+ 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6,
+ 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8,
+ 8, 6, 8, 7, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
+ 8, 9, 9, 8, 9, 9, 5, 6, 6, 6, 8, 7, 6, 8, 7, 6,
+ 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 8, 8, 9, 9, 7, 9,
+ 9,
};
static float _vq_quantthresh_res0_128_1024_2[] = {
@@ -39,7 +38,7 @@
};
static long _vq_quantmap_res0_128_1024_2[] = {
- 2, 0, 1,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_2 = {
1.2.2.1 +47 -48 vorbis/lib/books/res0_128_1024_3.vqh
Index: res0_128_1024_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_3.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_3.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_3.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -21,52 +20,52 @@
static long _vq_quantlist_res0_128_1024_3[] = {
2,
- 3,
- 4,
1,
+ 3,
0,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_3[] = {
- 2, 4, 7, 5, 7, 5, 6, 9, 7, 9, 7, 9,13, 9,13, 5,
- 7, 9, 7, 9, 7, 9,13, 9,13, 5, 7, 9, 7, 9, 7, 8,
- 11, 9,11, 9,11,15,12,15, 7, 9,11, 9,11, 9,11,15,
- 11,15, 7, 9,13, 9,12, 9,11,15,11,15,13,15,19,15,
- 18, 9,11,15,12,15,13,15,19,16,18, 5, 7, 9, 7, 9,
- 7, 9,11, 9,11, 9,11,15,11,15, 7, 9,11, 9,11, 9,
- 11,15,11,15, 7, 9,12, 9,13, 9,12,15,12,15,13,15,
- 19,15,18, 9,12,15,12,16,13,15,19,15,18, 5, 7, 9,
- 7, 9, 7, 9,11, 9,11, 9,11,15,12,16, 7, 9,11, 9,
- 11, 9,11,15,12,15, 7, 9,11, 9,11, 9,11,13,11,13,
- 11,13,17,14,17, 9,11,13,11,14,12,14,18,14,18, 9,
- 12,15,12,15,11,14,17,14,17,15,17,18,18,20,12,14,
- 18,14,18,16,17,20,17,21, 7, 9,11, 9,11, 9,11,14,
- 11,13,12,14,18,13,17, 9,11,14,11,14,12,14,18,14,
- 17, 9,12,15,12,15,11,14,18,13,18,15,17,20,17,19,
- 12,14,18,14,18,16,18,20,18,21, 7, 9,13, 9,13, 9,
- 12,16,12,16,13,16,19,15,19, 9,12,15,12,16,13,15,
- 18,16,21, 9,12,15,12,15,11,13,18,14,18,15,18,21,
- 18,19,12,14,18,13,18,15,18,21,17,19,13,16,20,16,
- 19,15,18,21,17,20,19,19,21,20,21,15,18,21,17,20,
- 19,21,21,21,21, 9,12,16,12,16,11,14,18,14,18,15,
- 17,20,17,20,12,14,18,14,18,16,17,21,19,21,13,15,
- 19,16,18,15,18,21,18,20,19,21,21,18,21,16,18,20,
- 18,20,19,21,21,21,20, 5, 7, 9, 7, 9, 7, 9,11, 9,
- 11, 9,12,15,12,15, 7, 9,11, 9,11, 9,12,15,12,15,
- 7, 9,12, 9,11, 9,11,13,11,13,12,14,17,14,17, 9,
- 11,13,11,13,11,13,18,14,17, 9,12,15,12,15,12,14,
- 17,14,18,15,18,19,19,20,12,13,17,14,18,15,17,19,
- 19,20, 7, 9,11, 9,12, 9,11,14,11,14,12,14,17,14,
- 17, 9,11,14,11,13,12,14,18,13,16, 9,12,15,12,15,
- 12,14,18,14,17,16,18,20,18,20,12,14,17,14,18,16,
- 18,20,17,20, 7, 9,13, 9,13, 9,12,16,12,16,13,15,
- 21,16,20, 9,12,16,12,15,13,16,18,16,21, 9,12,15,
- 12,16,12,14,17,14,17,15,18,21,17,20,11,14,17,14,
- 18,15,17,20,18,21,13,15,19,16,19,15,17,20,18,21,
- 18,20,21,21,21,15,17,20,18,21,20,19,21,21,21, 9,
- 12,16,12,15,12,14,18,14,18,15,18,20,18,21,11,14,
- 18,14,19,16,18,19,17,21,13,16,18,16,19,15,18,21,
- 19,21,19,19,21,21,21,15,17,20,17,20,19,21,20,20,
+ 2, 5, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 6, 9, 9, 7,
+ 9, 9,13,13, 7, 9, 9,13,13, 5, 7, 7, 9, 9, 7, 9,
+ 9,11,11, 7, 9, 9,11,11, 9,11,11,15,16, 9,11,11,
+ 15,16, 5, 7, 7, 9, 9, 7, 9, 9,11,11, 7, 9, 9,11,
+ 11, 9,11,11,15,15, 9,11,11,15,15, 7, 9, 9,13,12,
+ 9,12,11,16,15, 9,12,12,15,16,13,15,16,19,21,13,
+ 15,16,20,19, 7, 9, 9,13,12, 9,12,12,15,15, 9,12,
+ 12,15,15,13,16,15,19,20,13,15,15,20,20, 5, 7, 7,
+ 9, 9, 7, 9, 9,12,11, 7, 9, 9,11,11, 9,12,11,15,
+ 16, 9,11,12,16,15, 7, 9, 9,11,11, 9,11,11,13,14,
+ 9,11,11,14,14,12,14,13,18,18,12,14,14,18,17, 7,
+ 9, 9,11,11, 9,11,11,14,14, 9,11,11,14,14,12,14,
+ 14,18,17,12,14,14,18,18, 9,12,12,16,16,12,14,14,
+ 18,17,12,14,14,18,17,16,18,17,20,21,16,19,18,21,
+ 21, 9,12,12,16,16,12,14,14,18,18,12,14,14,18,18,
+ 16,18,17,21,19,16,19,18,20,21, 5, 7, 7, 9, 9, 7,
+ 9, 9,11,11, 7, 9, 9,11,11, 9,11,11,15,16, 9,12,
+ 11,16,15, 7, 9, 9,11,11, 9,11,11,14,13, 9,11,11,
+ 13,14,12,14,14,18,18,11,14,14,17,17, 7, 9, 9,11,
+ 11, 9,11,11,13,14, 9,11,11,13,13,12,14,14,18,18,
+ 11,14,13,17,17, 9,12,12,15,16,12,14,14,18,18,11,
+ 14,14,18,18,16,19,18,20,20,15,17,18,21,21, 9,12,
+ 12,15,15,12,14,14,18,18,12,14,14,19,17,15,17,17,
+ 21,20,15,18,18,20,20, 7, 9, 9,13,13, 9,12,12,16,
+ 16, 9,11,12,16,16,13,16,16,20,19,13,15,15,20,18,
+ 9,12,12,16,16,11,14,14,18,17,11,14,14,18,18,16,
+ 17,18,21,20,15,18,18,20,20, 9,11,12,15,15,11,14,
+ 13,18,17,11,14,14,17,19,16,19,18,21,20,16,19,19,
+ 20,20,13,15,15,19,19,15,18,18,21,21,15,18,17,21,
+ 21,19,20,20,21,21,19,20,20,21,21,13,16,16,19,19,
+ 16,18,18,21,20,15,17,18,21,20,21,21,19,21,20,20,
+ 21,20,21,21, 7, 9, 9,13,13, 9,11,12,15,15, 9,12,
+ 12,16,16,13,15,16,19,18,13,16,15,19,20, 9,11,12,
+ 16,15,12,14,14,18,18,11,14,14,18,18,15,18,17,21,
+ 20,15,18,18,20,21, 9,11,11,15,16,11,14,14,17,18,
+ 11,14,13,18,18,15,18,18,21,21,16,17,17,21,20,13,
+ 15,15,19,19,16,18,18,20,21,15,17,18,21,21,20,21,
+ 20,21,21,20,20,20,21,21,13,16,16,19,19,15,18,17,
+ 20,20,15,18,17,21,20,19,21,21,21,21,19,20,19,21,
20,
};
@@ -75,7 +74,7 @@
};
static long _vq_quantmap_res0_128_1024_3[] = {
- 4, 3, 0, 1, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_3 = {
1.2.2.1 +48 -49 vorbis/lib/books/res0_128_1024_4.vqh
Index: res0_128_1024_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_4.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_4.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_4.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -21,53 +20,53 @@
static long _vq_quantlist_res0_128_1024_4[] = {
2,
- 3,
- 4,
1,
+ 3,
0,
+ 4,
};
static long _vq_lengthlist_res0_128_1024_4[] = {
- 5, 6, 8, 6, 8, 6, 6, 9, 6, 9, 8, 9,11, 9,11, 6,
- 6, 9, 6, 9, 8, 9,11, 9,11, 6, 7, 9, 6, 9, 6, 7,
- 10, 7,10, 9,10,12,10,12, 7, 7,10, 7,10, 9,10,12,
- 10,12, 8, 9,11, 9,11, 9,10,12,10,12,11,12,14,12,
- 14, 9,10,12,10,12,11,12,15,12,14, 6, 7, 9, 7, 9,
- 7, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,10, 9,
- 10,12,10,12, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
- 15,12,14, 9,10,12,10,12,11,12,14,12,14, 6, 7, 9,
- 7, 9, 7, 7,10, 7,10, 9,10,12,10,12, 7, 7,10, 7,
- 10, 9,10,12,10,12, 7, 7,10, 7,10, 7, 8,10, 8,11,
- 10,11,13,11,13, 7, 8,11, 8,11,10,11,13,11,13, 9,
- 10,12,10,12,10,11,13,11,13,12,13,15,13,16,10,11,
- 14,11,13,12,14,15,13,16, 7, 7,10, 8,10, 7, 8,11,
- 8,11,10,11,13,11,13, 7, 8,11, 8,11,10,11,13,11,
- 13, 9,10,12,10,12,10,11,13,11,13,12,13,15,13,15,
- 10,11,13,11,14,12,13,16,13,16, 8, 9,11, 9,11, 9,
- 10,12,10,12,11,12,15,12,15, 9,10,12,10,12,11,12,
- 15,12,15, 9,10,12,10,12,10,11,13,11,13,12,14,15,
- 13,16,10,11,13,11,13,12,14,16,13,16,11,12,15,12,
- 14,12,13,16,13,17,15,15,17,16,18,12,13,16,13,16,
- 15,16,19,16,17, 9,10,12,10,12,10,11,14,11,13,12,
- 14,15,13,16,10,11,13,11,13,12,13,15,14,16,11,12,
- 14,12,15,12,13,16,13,16,14,15,18,15,17,12,13,16,
- 14,16,14,16,18,16,18, 6, 7, 9, 7, 9, 6, 7,10, 7,
- 10, 9,10,12,10,12, 7, 7,10, 7,10, 9,10,12,10,12,
- 7, 7,10, 7,10, 7, 8,11, 8,11,10,11,13,11,13, 7,
- 8,11, 9,11,10,11,13,11,14, 9,10,12,10,12,10,11,
- 13,11,13,12,14,16,13,15,10,11,13,11,13,12,13,15,
- 13,16, 7, 7,10, 8,10, 7, 8,11, 8,11,10,11,13,11,
- 13, 7, 8,11, 8,11,10,11,13,11,13, 9,10,12,10,12,
- 10,11,13,11,13,12,13,16,13,15,10,11,13,11,13,12,
- 13,16,13,15, 8, 9,11, 9,11, 9,10,12,10,12,11,12,
- 14,12,15, 9,10,12,10,12,11,12,15,13,14, 9,10,12,
- 10,12,10,11,14,11,13,12,13,16,13,16,10,11,13,11,
- 13,12,13,17,14,17,11,13,15,12,15,12,13,16,13,16,
- 15,15,19,16,18,12,13,16,13,16,14,15,16,16,18, 9,
- 10,12,10,12,10,11,13,11,14,12,14,15,14,16,10,11,
- 13,11,13,12,13,16,13,15,11,12,14,12,15,12,13,16,
- 14,16,15,16,17,16,17,12,13,16,13,16,15,16,18,15,
- 16,
+ 5, 6, 6, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 8,
+ 9, 9,12,11, 8, 9, 9,11,11, 6, 7, 6, 9, 9, 7, 7,
+ 7,10,10, 7, 7, 7,10,10, 9,10,10,12,13, 9,10,10,
+ 12,13, 6, 7, 6, 9, 9, 6, 7, 7,10,10, 6, 7, 7,10,
+ 10, 9,10,10,13,12, 9,10,10,13,12, 8, 9, 9,12,12,
+ 9,10,10,13,13, 9,10,10,13,13,12,13,13,15,15,12,
+ 13,13,15,15, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
+ 10,13,13,12,13,12,15,15,12,13,13,15,15, 6, 7, 7,
+ 9, 9, 7, 7, 8,10,10, 7, 7, 7,10,10, 9,10,10,13,
+ 13, 9,10,10,13,13, 7, 7, 7,10,10, 7, 8, 8,11,11,
+ 7, 8, 8,11,11,10,11,11,13,14,10,11,11,14,14, 7,
+ 7, 7,10,10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,
+ 11,14,13,10,11,11,14,14, 9,10,10,13,13,10,11,11,
+ 14,14,10,11,11,14,14,13,13,14,16,16,13,14,14,16,
+ 16, 9,10,10,13,13,10,11,11,14,14,10,11,11,14,14,
+ 13,14,14,16,16,13,14,14,16,17, 6, 7, 7, 9, 9, 7,
+ 7, 7,10,10, 7, 7, 7,10,10, 9,10,10,13,13, 9,10,
+ 10,13,13, 7, 7, 7,10,10, 7, 8, 8,11,11, 7, 8, 8,
+ 11,11,10,11,11,14,14,10,11,11,13,14, 6, 7, 7,10,
+ 10, 7, 8, 8,11,11, 7, 8, 8,11,11,10,11,11,14,13,
+ 10,11,11,14,13, 9,10,10,13,13,10,11,11,14,14,10,
+ 11,11,14,14,13,14,14,16,16,13,13,14,16,17, 9,10,
+ 10,13,13,10,11,11,14,14,10,11,11,14,14,13,14,14,
+ 16,16,13,14,13,16,16, 8, 9, 9,12,12, 9,10,10,13,
+ 13, 9,10,10,13,13,12,13,13,16,16,12,13,13,16,15,
+ 9,10,10,13,13,10,11,11,14,14,10,11,11,14,14,13,
+ 14,14,17,17,13,14,14,17,16, 9,10,10,13,13,10,11,
+ 11,14,14,10,11,11,14,14,13,14,14,17,17,13,14,14,
+ 17,17,12,13,13,16,15,12,14,14,16,16,13,14,14,16,
+ 16,15,16,17,17,20,15,17,16,20,18,12,13,13,15,16,
+ 13,14,14,16,16,13,14,14,16,17,15,16,16,19,18,15,
+ 17,16,20,20, 8, 9, 9,12,12, 9,10,10,13,13, 9,10,
+ 10,13,13,12,13,13,15,15,12,13,13,15,16, 9,10,10,
+ 13,13,10,11,11,14,14,10,11,11,14,14,13,14,14,17,
+ 16,13,14,14,16,16, 9,10,10,13,13,10,11,11,14,14,
+ 10,11,11,14,14,13,14,14,16,17,13,14,14,16,16,12,
+ 13,13,16,16,13,14,14,17,16,13,13,14,16,17,15,16,
+ 17,20,18,15,16,16,17,18,12,13,13,15,16,13,14,14,
+ 16,16,12,14,13,16,16,16,16,16,18,20,15,17,16,18,
+ 17,
};
static float _vq_quantthresh_res0_128_1024_4[] = {
@@ -75,7 +74,7 @@
};
static long _vq_quantmap_res0_128_1024_4[] = {
- 4, 3, 0, 1, 2,
+ 3, 1, 0, 2, 4,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_4 = {
1.2.2.1 +23 -19 vorbis/lib/books/res0_128_1024_5.vqh
Index: res0_128_1024_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_5.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_5.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_5.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,41 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_5[] = {
- 3,
- 4,
5,
+ 4,
6,
+ 3,
+ 7,
2,
- 1,
+ 8,
0,
+ 10,
};
static long _vq_lengthlist_res0_128_1024_5[] = {
- 1, 4, 6, 6, 4, 6, 6, 4, 6, 8, 8, 6, 8, 8, 6, 8,
- 11,10, 8,11,11, 6, 9,11,12, 9,11,12, 4, 6, 8, 8,
- 6, 8, 8, 6, 8,11,10, 8,11,11, 6, 9,11,12, 9,11,
- 12,
+ 1, 4, 4, 6, 6, 6, 6, 9, 9, 4, 6, 6, 8, 8, 9, 9,
+ 11,11, 4, 6, 5, 8, 8, 9, 9,11,12, 6, 8, 8,11,11,
+ 12,12,14,14, 6, 8, 8,11,11,12,12,14,14, 7, 9, 9,
+ 12,12,13,13,15,15, 7, 9, 9,12,12,13,14,15,15, 9,
+ 12,12,14,14,15,15,16,16, 9,12,12,14,14,15,15,16,
+ 16,
};
static float _vq_quantthresh_res0_128_1024_5[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
+ -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
};
static long _vq_quantmap_res0_128_1024_5[] = {
- 6, 5, 4, 0, 1, 2, 3,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_5 = {
_vq_quantthresh_res0_128_1024_5,
_vq_quantmap_res0_128_1024_5,
- 7,
- 7
+ 9,
+ 9
};
static static_codebook _vq_book_res0_128_1024_5 = {
- 2, 49,
+ 2, 81,
_vq_lengthlist_res0_128_1024_5,
- 1, -533200896, 1611661312, 3, 0,
+ 1, -531365888, 1611661312, 4, 0,
_vq_quantlist_res0_128_1024_5,
NULL,
&_vq_auxt_res0_128_1024_5,
1.2.2.1 +22 -18 vorbis/lib/books/res0_128_1024_6.vqh
Index: res0_128_1024_6.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_6.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_6.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_6.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,41 +19,46 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_6[] = {
- 3,
- 4,
5,
+ 4,
6,
+ 3,
+ 7,
2,
- 1,
+ 8,
0,
+ 10,
};
static long _vq_lengthlist_res0_128_1024_6[] = {
- 2, 4, 5, 6, 4, 5, 6, 4, 5, 6, 7, 5, 6, 7, 5, 6,
- 8, 9, 7, 8, 9, 6, 8, 9,11, 8,10,11, 4, 5, 6, 7,
- 5, 6, 7, 5, 6, 8, 9, 7, 8, 9, 6, 8,10,11, 8, 9,
+ 3, 4, 4, 5, 5, 6, 6, 7, 7, 4, 5, 5, 6, 6, 7, 7,
+ 8, 8, 4, 5, 4, 6, 6, 7, 7, 8, 8, 6, 6, 6, 8, 8,
+ 8, 8,10,10, 5, 6, 6, 8, 8, 8, 8,10,10, 6, 7, 7,
+ 9, 9, 9, 9,10,10, 6, 7, 7, 9, 9, 9, 9,10,10, 8,
+ 9, 9,10,10,11,11,11,11, 8, 9, 9,10,10,11,11,11,
11,
};
static float _vq_quantthresh_res0_128_1024_6[] = {
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
+ -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
};
static long _vq_quantmap_res0_128_1024_6[] = {
- 6, 5, 4, 0, 1, 2, 3,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_6 = {
_vq_quantthresh_res0_128_1024_6,
_vq_quantmap_res0_128_1024_6,
- 7,
- 7
+ 9,
+ 9
};
static static_codebook _vq_book_res0_128_1024_6 = {
- 2, 49,
+ 2, 81,
_vq_lengthlist_res0_128_1024_6,
- 1, -533200896, 1611661312, 3, 0,
+ 1, -531365888, 1611661312, 4, 0,
_vq_quantlist_res0_128_1024_6,
NULL,
&_vq_auxt_res0_128_1024_6,
1.2.2.1 +76 -23 vorbis/lib/books/res0_128_1024_7.vqh
Index: res0_128_1024_7.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_7.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_7.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_7.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,46 +19,100 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_7[] = {
- 5,
- 6,
- 7,
- 8,
+ 12,
+ 11,
+ 13,
10,
+ 14,
+ 9,
+ 15,
+ 8,
+ 16,
+ 7,
+ 17,
+ 6,
+ 18,
+ 5,
+ 19,
4,
+ 20,
3,
+ 21,
2,
+ 22,
+ 1,
+ 23,
0,
+ 24,
};
static long _vq_lengthlist_res0_128_1024_7[] = {
- 2, 4, 5, 6, 6, 4, 5, 6, 6, 4, 5, 7, 8, 8, 5, 7,
- 8, 8, 6, 7, 9,10,10, 7, 9,10,10, 6, 8,10,11,10,
- 8,10,11,11, 6, 8,10,11,12, 8,10,11,12, 4, 5, 7,
- 8, 8, 5, 7, 8, 8, 6, 7, 9,10,10, 7, 9,10,10, 6,
- 8,10,11,10, 8,10,11,11, 6, 8,10,11,12, 8,10,11,
- 12,
+ 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
+ 8, 9, 9, 9, 9,10,10,10,10, 5, 6, 6, 7, 7, 8, 8,
+ 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
+ 12,12, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9,
+ 9,10,10,10,10,11,11,11,11,12,12, 6, 7, 7, 8, 8,
+ 9, 9,10,10,10,10,11,11,11,11,11,11,11,12,12,12,
+ 12,12,13,13, 6, 7, 7, 8, 8, 9, 9,10,10,10,10,11,
+ 11,11,11,11,11,12,12,12,12,12,12,13,13, 7, 8, 8,
+ 9, 9,10,10,10,10,11,11,11,11,11,11,12,12,12,12,
+ 13,13,13,13,14,14, 7, 8, 8, 9, 9,10,10,10,10,11,
+ 11,11,11,11,11,12,12,13,12,13,13,13,14,14,13, 8,
+ 9, 9,10,10,11,11,11,11,12,12,12,12,12,12,13,13,
+ 13,13,14,14,14,14,14,14, 8, 9, 9,10,10,11,11,11,
+ 11,12,12,12,12,12,12,13,13,13,13,14,14,14,14,14,
+ 14, 8,10,10,11,11,11,11,12,12,12,12,13,13,13,13,
+ 14,13,14,14,14,14,15,15,15,15, 8, 9, 9,11,11,11,
+ 11,12,12,12,12,13,13,13,13,13,13,14,14,14,14,15,
+ 15,15,15, 9,10,10,11,11,12,12,12,12,13,13,13,14,
+ 14,13,14,14,14,14,15,15,15,15,15,16, 9,10,10,11,
+ 11,12,12,12,12,13,13,13,14,14,14,14,14,14,14,14,
+ 15,16,15,15,16, 9,10,10,11,11,12,12,12,13,13,13,
+ 14,13,14,14,15,15,15,15,15,15,16,15,16,15, 8,10,
+ 10,11,11,12,12,13,12,13,13,14,13,14,14,15,15,15,
+ 15,15,15,16,15,16,16, 9,11,11,12,12,12,12,13,13,
+ 14,14,14,14,15,14,15,15,15,16,16,16,16,16,16,16,
+ 9,11,11,12,12,12,12,13,13,14,14,14,14,15,15,15,
+ 15,15,15,16,16,16,16,16,17,10,11,11,12,12,13,13,
+ 14,14,14,14,14,15,15,15,16,16,16,16,16,16,16,16,
+ 17,17,10,11,11,12,12,13,13,13,14,14,14,14,14,15,
+ 15,16,15,15,16,17,16,16,16,16,17,10,12,12,13,13,
+ 13,13,14,14,15,15,15,15,15,15,16,16,16,16,17,17,
+ 16,17,17,17,10,12,12,13,13,14,13,14,14,15,14,15,
+ 15,15,16,16,16,16,16,16,17,16,16,17,17,10,12,12,
+ 13,13,14,14,15,14,15,15,16,15,16,16,16,16,16,16,
+ 16,17,18,17,18,17,11,12,12,13,13,14,14,14,15,15,
+ 15,16,15,16,16,16,16,17,17,17,17,17,17,17,18,11,
+ 13,13,14,14,15,14,15,15,15,16,16,16,16,17,16,17,
+ 18,17,17,17,18,17,17,18,11,12,12,14,14,15,14,15,
+ 15,16,15,16,16,16,16,17,17,16,17,17,17,17,17,17,
+ 17,
};
static float _vq_quantthresh_res0_128_1024_7[] = {
- -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
+ -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5, 10.5, 11.5,
};
static long _vq_quantmap_res0_128_1024_7[] = {
- 8, 7, 6, 5, 0, 1, 2, 3,
- 4,
+ 23, 21, 19, 17, 15, 13, 11, 9,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8, 10, 12, 14, 16, 18, 20, 22,
+ 24,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_7 = {
_vq_quantthresh_res0_128_1024_7,
_vq_quantmap_res0_128_1024_7,
- 9,
- 9
+ 25,
+ 25
};
static static_codebook _vq_book_res0_128_1024_7 = {
- 2, 81,
+ 2, 625,
_vq_lengthlist_res0_128_1024_7,
- 1, -531365888, 1611661312, 4, 0,
+ 1, -529006592, 1611661312, 5, 0,
_vq_quantlist_res0_128_1024_7,
NULL,
&_vq_auxt_res0_128_1024_7,
1.2.2.1 +173 -31 vorbis/lib/books/res0_128_1024_8.vqh
Index: res0_128_1024_8.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_8.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_8.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_8.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,56 +19,199 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_8[] = {
- 11,
- 12,
- 13,
- 14,
- 16,
- 19,
+ 21,
+ 20,
22,
+ 19,
+ 23,
+ 18,
+ 24,
+ 17,
+ 25,
+ 16,
+ 26,
+ 15,
+ 27,
+ 14,
+ 28,
+ 13,
+ 29,
+ 12,
+ 30,
+ 11,
+ 31,
10,
+ 32,
9,
+ 33,
8,
+ 34,
+ 7,
+ 35,
6,
+ 36,
+ 5,
+ 37,
+ 4,
+ 38,
3,
+ 39,
+ 2,
+ 40,
+ 1,
+ 41,
0,
+ 42,
};
static long _vq_lengthlist_res0_128_1024_8[] = {
- 2, 4, 5, 6, 7, 6, 8, 4, 5, 6, 7, 6, 8, 4, 6, 7,
- 8, 8, 8,10, 6, 7, 8, 8, 8,10, 6, 7, 9, 9,10,10,
- 11, 7, 9, 9,10,10,11, 6, 8,10,10,10,10,11, 8,10,
- 10,10,10,11, 7, 9,11,11,11,11,12, 9,11,11,11,11,
- 12, 7, 9,11,11,12,12,13, 9,11,11,12,12,13, 9,11,
- 13,13,13,14,14,11,13,13,13,14,15, 4, 6, 7, 8, 8,
- 8,10, 6, 7, 8, 8, 8,10, 6, 8, 9, 9,10,10,11, 8,
- 9, 9,10,10,11, 7, 8,10,10,10,10,11, 8,10,10,10,
- 10,11, 7, 9,11,11,11,11,12, 9,11,11,11,11,12, 7,
- 9,11,11,11,12,13, 9,11,11,11,12,13, 9,11,13,13,
- 13,13,15,11,13,13,13,14,14,
+ 3, 5, 4, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8,
+ 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9,10,10,10,10,10,10,10,10,10,10, 5, 6, 6, 7, 7,
+ 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+ 10,10,11,11,10,10,10,10,11,11,11,11,11,11,11,11,
+ 12,11,12,12,11,11, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9,
+ 9, 9, 9, 9, 9,10, 9,10,10,10,10,10,10,11,11,10,
+ 10,10,10,11,11,11,11,11,11,11,11,12,12,12,12,11,
+ 11, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,
+ 11,11,11,11,11,11,11,11,12,11,11,11,11,11,12,12,
+ 12,12,12,12,13,12,13,13,13,13,13,12, 6, 7, 7, 8,
+ 8, 9, 9, 9, 9,10,10,10,10,10,10,11,11,11,11,11,
+ 11,11,11,12,12,11,11,12,11,12,12,12,12,12,12,12,
+ 12,13,13,13,13,12,12, 7, 8, 8, 9, 9, 9, 9,10,10,
+ 10,10,11,11,11,11,11,11,12,12,12,12,12,12,13,12,
+ 12,12,12,12,12,12,13,13,13,13,13,13,13,13,14,14,
+ 13,13, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,
+ 11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,13,
+ 13,13,13,13,13,13,13,14,13,14,14,13,13, 8, 9, 9,
+ 10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,12,
+ 13,12,13,13,13,13,13,12,13,13,13,13,13,13,14,14,
+ 14,14,15,14,14,14,14,14, 8, 9, 9,10,10,10,10,11,
+ 11,11,11,11,11,12,11,12,12,12,12,12,13,13,13,13,
+ 13,13,13,13,13,13,13,14,13,14,14,14,14,14,14,15,
+ 14,14,14, 8, 9, 9,10,10,11,11,11,11,11,12,12,12,
+ 12,12,12,12,13,13,13,13,14,13,13,13,13,13,13,13,
+ 14,13,14,14,14,14,15,14,15,15,15,15,14,14, 8, 9,
+ 9,10,10,11,11,11,11,11,11,12,12,12,12,12,12,13,
+ 12,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,
+ 14,15,14,14,15,15,15,14,14, 9,10,10,11,11,11,11,
+ 12,12,12,12,12,12,13,12,13,13,13,13,13,13,14,13,
+ 14,14,14,13,14,14,14,14,14,14,15,15,15,15,15,15,
+ 15,15,15,14, 9,10,10,11,11,11,11,12,11,12,12,12,
+ 12,12,13,13,13,13,13,13,13,14,13,14,13,14,14,14,
+ 14,14,14,15,14,15,14,14,15,15,15,15,15,14,14, 9,
+ 10,10,11,11,11,12,12,12,12,12,13,13,13,13,13,13,
+ 14,13,14,14,14,14,14,14,14,14,14,14,15,15,15,15,
+ 15,15,15,15,15,15,16,16,15,14, 9,10,10,11,11,12,
+ 12,12,12,12,12,13,13,13,13,13,13,14,14,13,14,14,
+ 14,14,14,14,14,14,14,14,14,15,14,15,15,15,15,16,
+ 15,16,15,15,14, 9,10,10,11,11,12,12,12,12,13,13,
+ 13,13,13,13,14,14,14,14,14,14,14,14,14,15,15,14,
+ 15,15,15,15,15,15,15,15,16,15,15,16,16,16,16,15,
+ 10,11,10,11,11,12,12,13,12,13,13,13,13,13,13,14,
+ 14,14,14,14,14,15,14,15,15,15,14,15,15,15,15,15,
+ 15,16,15,16,15,16,15,16,16,16,15,10,11,11,12,12,
+ 12,12,13,13,13,13,14,13,14,13,14,14,15,14,14,15,
+ 14,15,15,15,15,14,15,15,15,15,15,15,16,15,16,15,
+ 16,17,15,17,15,15,10,11,11,12,12,12,12,13,13,13,
+ 13,13,14,14,14,14,13,14,15,15,15,15,15,15,15,15,
+ 14,15,15,16,15,16,15,15,15,16,16,16,15,16,16,15,
+ 15,10,11,11,12,12,13,13,13,13,14,13,14,14,14,14,
+ 15,14,14,14,15,15,15,15,15,15,15,15,15,15,15,15,
+ 16,15,16,16,16,16,16,16,16,17,16,16,10,11,11,12,
+ 12,13,13,13,13,13,13,14,14,14,14,14,14,15,15,16,
+ 15,15,15,16,15,15,15,15,15,15,16,16,15,16,15,17,
+ 16,16,16,17,16,16,16,11,12,12,12,13,13,13,14,13,
+ 14,14,14,14,14,14,15,15,15,15,15,15,16,15,16,16,
+ 15,15,15,16,16,15,16,16,16,16,17,17,17,17,17,16,
+ 16,16,11,11,12,12,12,13,13,14,13,14,14,14,14,14,
+ 14,15,15,15,15,15,15,15,15,16,16,16,15,16,15,17,
+ 15,17,16,16,16,17,16,16,17,16,16,17,17,11,12,12,
+ 13,13,13,13,14,14,14,14,14,14,15,15,15,15,15,15,
+ 16,15,15,16,16,16,16,16,15,16,16,16,17,17,16,16,
+ 17,17,18,17,17,16,16,17,11,12,12,13,13,13,14,14,
+ 14,15,14,14,14,15,15,15,16,16,15,16,15,16,16,16,
+ 16,16,16,16,16,16,16,16,16,17,16,17,17,16,17,16,
+ 17,16,16,10,11,11,12,12,13,13,14,13,14,14,14,14,
+ 14,14,15,14,15,15,16,15,15,16,16,16,16,16,16,16,
+ 16,15,16,16,16,16,16,17,17,16,17,18,17,17,10,11,
+ 11,12,12,13,13,14,14,14,14,14,14,15,15,15,15,15,
+ 15,15,15,16,15,16,16,16,16,17,16,17,17,16,17,16,
+ 17,16,17,17,17,17,17,18,17,10,12,12,13,13,13,13,
+ 14,14,14,14,14,14,15,15,15,15,16,15,16,15,16,15,
+ 16,16,16,17,16,16,16,16,17,17,17,19,18,17,17,18,
+ 18,17,16,16,10,12,12,13,13,13,13,14,14,14,14,15,
+ 15,15,15,16,15,16,15,15,16,16,16,16,16,16,16,16,
+ 18,16,17,17,17,18,17,17,17,17,17,18,18,16,17,11,
+ 12,12,13,13,14,14,14,14,14,14,14,15,15,15,15,15,
+ 15,15,16,16,16,16,16,16,16,16,17,16,17,16,17,18,
+ 17,17,18,17,17,18,17,17,18,16,11,12,12,13,13,14,
+ 13,14,14,15,15,15,15,15,15,15,16,16,15,16,16,15,
+ 16,16,16,17,16,16,17,17,17,17,18,17,17,18,17,17,
+ 16,17,17,17,17,11,12,12,13,13,14,14,15,14,15,15,
+ 15,15,15,15,16,16,15,15,16,16,16,16,17,16,16,16,
+ 17,17,16,18,18,17,18,17,17,17,18,17,17,18,16,16,
+ 11,12,12,13,13,14,14,15,15,15,15,16,15,15,15,15,
+ 16,17,16,16,16,17,16,16,16,17,17,16,17,17,17,17,
+ 17,18,17,17,18,19,18,17,18,17,16,11,13,13,14,14,
+ 14,15,15,15,15,15,15,15,16,15,16,15,16,17,17,17,
+ 16,16,16,16,17,17,17,17,17,17,17,17,19,18,17,18,
+ 17,18,18,17,17,17,11,13,13,14,14,14,14,15,15,15,
+ 15,15,15,16,16,16,16,16,16,16,16,16,16,17,17,17,
+ 18,16,18,17,16,17,17,18,17,18,18,18,17,17,17,17,
+ 17,12,13,13,14,14,15,15,15,15,15,15,16,16,16,16,
+ 16,16,16,16,16,16,16,17,17,16,17,17,16,17,18,17,
+ 18,17,18,16,17,20,17,19,18,18,19,18,11,13,13,14,
+ 14,15,14,15,15,15,15,16,15,16,16,16,16,16,17,17,
+ 16,17,16,18,16,17,17,17,18,18,17,18,17,17,18,17,
+ 18,19,18,18,18,19,17,12,13,13,14,14,15,15,15,15,
+ 15,16,16,15,16,16,16,17,17,16,16,17,16,17,18,17,
+ 17,18,18,18,17,17,18,18,18,18,18,18,18,18,18,18,
+ 18,19,12,13,13,14,14,15,15,15,16,16,15,16,16,16,
+ 16,16,17,17,16,17,17,17,17,17,17,17,17,17,18,18,
+ 17,19,18,18,18,18,17,18,18,17,17,17,17,12,14,13,
+ 15,14,15,15,15,15,15,15,16,16,16,16,17,16,17,17,
+ 17,17,17,17,18,17,17,17,17,17,18,17,17,18,19,19,
+ 18,18,17,18,19,17,18,19,12,13,13,14,15,15,15,15,
+ 16,15,16,16,16,17,17,16,17,17,16,16,17,17,17,18,
+ 18,18,18,17,20,17,17,18,18,18,18,18,18,18,17,19,
+ 19,17,17,12,13,13,14,14,15,15,15,15,15,15,15,15,
+ 16,15,16,16,16,17,16,16,16,16,16,17,17,17,18,17,
+ 17,17,18,17,17,19,18,18,18,17,18,17,19,16,12,13,
+ 13,14,14,14,14,15,15,15,15,15,16,16,16,16,16,17,
+ 16,16,16,17,17,17,16,16,16,17,17,18,18,17,17,17,
+ 17,17,17,18,17,17,18,17,17,
};
static float _vq_quantthresh_res0_128_1024_8[] = {
- -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 4, 6.5, 9.5,
+ -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5,
+ -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5, 10.5,
+ 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
+ 19.5, 20.5,
};
static long _vq_quantmap_res0_128_1024_8[] = {
- 12, 11, 10, 9, 8, 7, 0, 1,
- 2, 3, 4, 5, 6,
+ 41, 39, 37, 35, 33, 31, 29, 27,
+ 25, 23, 21, 19, 17, 15, 13, 11,
+ 9, 7, 5, 3, 1, 0, 2, 4,
+ 6, 8, 10, 12, 14, 16, 18, 20,
+ 22, 24, 26, 28, 30, 32, 34, 36,
+ 38, 40, 42,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_8 = {
_vq_quantthresh_res0_128_1024_8,
_vq_quantmap_res0_128_1024_8,
- 13,
- 13
+ 43,
+ 43
};
static static_codebook _vq_book_res0_128_1024_8 = {
- 2, 169,
+ 2, 1849,
_vq_lengthlist_res0_128_1024_8,
- 1, -529137664, 1611661312, 5, 0,
+ 1, -527106048, 1611661312, 6, 0,
_vq_quantlist_res0_128_1024_8,
NULL,
&_vq_auxt_res0_128_1024_8,
1.2.2.1 +386 -41 vorbis/lib/books/res0_128_1024_9.vqh
Index: res0_128_1024_9.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024_9.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024_9.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024_9.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,78 +19,424 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_1024_9[] = {
- 56,
- 57,
- 58,
- 59,
- 61,
- 64,
- 67,
- 70,
- 73,
- 76,
- 80,
- 84,
- 87,
- 91,
- 95,
- 99,
- 103,
- 107,
+ 150,
+ 149,
+ 151,
+ 148,
+ 152,
+ 147,
+ 153,
+ 146,
+ 154,
+ 145,
+ 155,
+ 144,
+ 156,
+ 143,
+ 157,
+ 142,
+ 158,
+ 141,
+ 159,
+ 140,
+ 160,
+ 139,
+ 161,
+ 138,
+ 162,
+ 137,
+ 163,
+ 136,
+ 164,
+ 135,
+ 165,
+ 134,
+ 166,
+ 133,
+ 167,
+ 132,
+ 168,
+ 131,
+ 169,
+ 130,
+ 170,
+ 129,
+ 171,
+ 128,
+ 172,
+ 127,
+ 173,
+ 126,
+ 174,
+ 125,
+ 175,
+ 124,
+ 176,
+ 123,
+ 177,
+ 122,
+ 178,
+ 121,
+ 179,
+ 120,
+ 180,
+ 119,
+ 181,
+ 118,
+ 182,
+ 117,
+ 183,
+ 116,
+ 184,
+ 115,
+ 185,
+ 114,
+ 186,
+ 113,
+ 187,
112,
+ 188,
+ 111,
+ 189,
+ 110,
+ 190,
+ 109,
+ 191,
+ 108,
+ 192,
+ 107,
+ 193,
+ 106,
+ 194,
+ 105,
+ 195,
+ 104,
+ 196,
+ 103,
+ 197,
+ 102,
+ 198,
+ 101,
+ 199,
+ 100,
+ 200,
+ 99,
+ 201,
+ 98,
+ 202,
+ 97,
+ 203,
+ 96,
+ 204,
+ 95,
+ 205,
+ 94,
+ 206,
+ 93,
+ 207,
+ 92,
+ 208,
+ 91,
+ 209,
+ 90,
+ 210,
+ 89,
+ 211,
+ 88,
+ 212,
+ 87,
+ 213,
+ 86,
+ 214,
+ 85,
+ 215,
+ 84,
+ 216,
+ 83,
+ 217,
+ 82,
+ 218,
+ 81,
+ 219,
+ 80,
+ 220,
+ 79,
+ 221,
+ 78,
+ 222,
+ 77,
+ 223,
+ 76,
+ 224,
+ 75,
+ 225,
+ 74,
+ 226,
+ 73,
+ 227,
+ 72,
+ 228,
+ 71,
+ 229,
+ 70,
+ 230,
+ 69,
+ 231,
+ 68,
+ 232,
+ 67,
+ 233,
+ 66,
+ 234,
+ 65,
+ 235,
+ 64,
+ 236,
+ 63,
+ 237,
+ 62,
+ 238,
+ 61,
+ 239,
+ 60,
+ 240,
+ 59,
+ 241,
+ 58,
+ 242,
+ 57,
+ 243,
+ 56,
+ 244,
55,
+ 245,
54,
+ 246,
53,
+ 247,
+ 52,
+ 248,
51,
+ 249,
+ 50,
+ 250,
+ 49,
+ 251,
48,
+ 252,
+ 47,
+ 253,
+ 46,
+ 254,
45,
+ 255,
+ 44,
+ 256,
+ 43,
+ 257,
42,
+ 258,
+ 41,
+ 259,
+ 40,
+ 260,
39,
+ 261,
+ 38,
+ 262,
+ 37,
+ 263,
36,
+ 264,
+ 35,
+ 265,
+ 34,
+ 266,
+ 33,
+ 267,
32,
+ 268,
+ 31,
+ 269,
+ 30,
+ 270,
+ 29,
+ 271,
28,
+ 272,
+ 27,
+ 273,
+ 26,
+ 274,
25,
+ 275,
+ 24,
+ 276,
+ 23,
+ 277,
+ 22,
+ 278,
21,
+ 279,
+ 20,
+ 280,
+ 19,
+ 281,
+ 18,
+ 282,
17,
+ 283,
+ 16,
+ 284,
+ 15,
+ 285,
+ 14,
+ 286,
13,
+ 287,
+ 12,
+ 288,
+ 11,
+ 289,
+ 10,
+ 290,
9,
+ 291,
+ 8,
+ 292,
+ 7,
+ 293,
+ 6,
+ 294,
5,
+ 295,
+ 4,
+ 296,
+ 3,
+ 297,
+ 2,
+ 298,
+ 1,
+ 299,
0,
+ 300,
};
static long _vq_lengthlist_res0_128_1024_9[] = {
- 2, 4, 4, 4, 4, 5, 6, 6, 7, 7, 8, 9,10,11,12,13,
- 14,14,16, 3, 4, 4, 4, 5, 5, 6, 7, 7, 8, 9,10,11,
- 12,13,14,15,16,
+ 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
+ 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
+ 10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,12,
+ 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,13,14,13,13,14,14,14,14,14,14,14,14,14,14,14,
+ 14,14,14,14,14,14,14,14,14,15,14,14,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,16,16,15,15,16,16,16,16,16,16,16,
+ 16,16,16,16,16,16,16,17,16,16,16,16,17,16,16,16,
+ 17,17,17,16,16,17,17,17,17,16,17,17,17,17,17,17,
+ 17,17,18,17,17,18,17,18,17,17,18,17,19,17,18,19,
+ 17,18,18,18,18,18,19,18,18,18,18,18,18,18,18,19,
+ 18,18,20,19,19,18,19,19,19,19,18,18,18,19,19,19,
+ 19,19,19,19,19,19,19,19,19,19,20,19,20,19,21,19,
+ 21,19,20,19,20,19,20,19,21,18,21,17,17,
};
static float _vq_quantthresh_res0_128_1024_9[] = {
- -53.5, -49, -45, -41, -37, -33, -29.5, -26,
- -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4, -2.5,
- -1.5, -0.5, 0.5, 1.5, 2.5, 4, 6.5, 9.5,
- 12.5, 15.5, 18.5, 22, 26, 29.5, 33, 37,
- 41, 45, 49, 53.5,
+ -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
+ -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
+ -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
+ -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
+ -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
+ -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
+ -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
+ -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
+ -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
+ -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
+ -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
+ -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
+ -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
+ -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
+ -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
+ -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
+ -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
+ -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5,
+ 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
+ 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
+ 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
+ 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
+ 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
+ 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
+ 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
+ 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
+ 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
+ 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
+ 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
+ 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
+ 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
+ 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
+ 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
+ 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
+ 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
+ 146.5, 147.5, 148.5, 149.5,
};
static long _vq_quantmap_res0_128_1024_9[] = {
- 36, 35, 34, 33, 32, 31, 30, 29,
- 28, 27, 26, 25, 24, 23, 22, 21,
- 20, 19, 0, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18,
+ 299, 297, 295, 293, 291, 289, 287, 285,
+ 283, 281, 279, 277, 275, 273, 271, 269,
+ 267, 265, 263, 261, 259, 257, 255, 253,
+ 251, 249, 247, 245, 243, 241, 239, 237,
+ 235, 233, 231, 229, 227, 225, 223, 221,
+ 219, 217, 215, 213, 211, 209, 207, 205,
+ 203, 201, 199, 197, 195, 193, 191, 189,
+ 187, 185, 183, 181, 179, 177, 175, 173,
+ 171, 169, 167, 165, 163, 161, 159, 157,
+ 155, 153, 151, 149, 147, 145, 143, 141,
+ 139, 137, 135, 133, 131, 129, 127, 125,
+ 123, 121, 119, 117, 115, 113, 111, 109,
+ 107, 105, 103, 101, 99, 97, 95, 93,
+ 91, 89, 87, 85, 83, 81, 79, 77,
+ 75, 73, 71, 69, 67, 65, 63, 61,
+ 59, 57, 55, 53, 51, 49, 47, 45,
+ 43, 41, 39, 37, 35, 33, 31, 29,
+ 27, 25, 23, 21, 19, 17, 15, 13,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12, 14, 16, 18,
+ 20, 22, 24, 26, 28, 30, 32, 34,
+ 36, 38, 40, 42, 44, 46, 48, 50,
+ 52, 54, 56, 58, 60, 62, 64, 66,
+ 68, 70, 72, 74, 76, 78, 80, 82,
+ 84, 86, 88, 90, 92, 94, 96, 98,
+ 100, 102, 104, 106, 108, 110, 112, 114,
+ 116, 118, 120, 122, 124, 126, 128, 130,
+ 132, 134, 136, 138, 140, 142, 144, 146,
+ 148, 150, 152, 154, 156, 158, 160, 162,
+ 164, 166, 168, 170, 172, 174, 176, 178,
+ 180, 182, 184, 186, 188, 190, 192, 194,
+ 196, 198, 200, 202, 204, 206, 208, 210,
+ 212, 214, 216, 218, 220, 222, 224, 226,
+ 228, 230, 232, 234, 236, 238, 240, 242,
+ 244, 246, 248, 250, 252, 254, 256, 258,
+ 260, 262, 264, 266, 268, 270, 272, 274,
+ 276, 278, 280, 282, 284, 286, 288, 290,
+ 292, 294, 296, 298, 300,
};
static encode_aux_threshmatch _vq_auxt_res0_128_1024_9 = {
_vq_quantthresh_res0_128_1024_9,
_vq_quantmap_res0_128_1024_9,
- 37,
- 37
+ 301,
+ 301
};
static static_codebook _vq_book_res0_128_1024_9 = {
- 1, 37,
+ 1, 301,
_vq_lengthlist_res0_128_1024_9,
- 1, -524550144, 1611661312, 7, 0,
+ 1, -520962048, 1611661312, 9, 0,
_vq_quantlist_res0_128_1024_9,
NULL,
&_vq_auxt_res0_128_1024_9,
1.2.2.1 +7 -7 vorbis/lib/books/res0_128_1024aux.vqh
Index: res0_128_1024aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_1024aux.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_1024aux.vqh 2000/11/17 11:47:20 1.2
+++ res0_128_1024aux.vqh 2001/01/09 19:13:18 1.2.2.1
@@ -20,13 +20,13 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_1024aux[] = {
- 2, 6,11,10,14,11,14,12,13,16, 5, 3, 5, 6, 9, 8,
- 10, 9,11,14,10, 5, 4, 5, 7, 9, 9,11,13,15, 9, 5,
- 5, 5, 7, 7, 8, 8,10,14,13, 8, 7, 7, 6, 8, 7, 9,
- 11,16, 9, 7, 8, 7, 8, 7, 8, 8,10,13,13, 9, 8, 7,
- 7, 8, 7, 7, 9,14,10, 8, 9, 7, 8, 7, 7, 6, 8,12,
- 10, 9,10, 9, 9, 8, 8, 7, 8,11,11,10,10, 9, 8, 8,
- 7, 6, 7,10,
+ 2, 7,12,10,14,10,14,13,14,16, 5, 4, 7, 7, 8, 7,
+ 10,12,13,13,10, 6, 5, 6, 5, 7, 9,14,15,17, 9, 6,
+ 6, 5, 5, 6, 8,11,13,14,13, 7, 5, 5, 4, 6, 7,12,
+ 14,17, 8, 7, 7, 6, 6, 5, 8, 9,11,14,14, 9, 8, 7,
+ 6, 7, 7, 9,11,14,11,10,11, 9, 9, 7, 7, 7, 9,12,
+ 10,11,13,11,10, 9, 7, 7, 8,10,11,11,13,11,11, 9,
+ 7, 6, 6, 8,
};
static static_codebook _huff_book_res0_128_1024aux = {
1.2.2.1 +13 -14 vorbis/lib/books/res0_128_128_1.vqh
Index: res0_128_128_1.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_1.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128_1.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128_1.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -21,17 +20,17 @@
static long _vq_quantlist_res0_128_128_1[] = {
1,
- 2,
0,
+ 2,
};
static long _vq_lengthlist_res0_128_128_1[] = {
- 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 7,10,10, 7,
- 10,10, 5, 7, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11,
- 11, 8,10,10, 8,10,10,10,12,13,10,13,13, 8,10,10,
- 10,13,13,10,13,13, 5, 8, 8, 8,10,10, 8,10,11, 8,
- 11,10,10,12,13,10,12,13, 8,10,10,11,13,13,10,13,
- 12,
+ 3, 4, 4, 5, 6, 6, 4, 6, 6, 5, 6, 6, 6, 8, 8, 6,
+ 7, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8,
+ 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 8,
+ 8,10, 9, 8, 9, 9, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6,
+ 8, 8, 8,10, 9, 8, 9, 9, 6, 8, 8, 8, 9,10, 8,10,
+ 9,
};
static float _vq_quantthresh_res0_128_128_1[] = {
@@ -39,7 +38,7 @@
};
static long _vq_quantmap_res0_128_128_1[] = {
- 2, 0, 1,
+ 1, 0, 2,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_1 = {
1.2.2.1 +165 -53 vorbis/lib/books/res0_128_128_2.vqh
Index: res0_128_128_2.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_2.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128_2.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128_2.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,75 +19,188 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_128_2[] = {
- 2,
3,
+ 2,
4,
1,
+ 5,
0,
+ 6,
};
static long _vq_lengthlist_res0_128_128_2[] = {
- 2, 4, 6, 4, 6, 4, 7, 9, 7, 9, 7,10,14,10,13, 5,
- 7, 9, 7, 9, 7, 9,13,10,13, 5, 7,10, 7,10, 7, 9,
- 12, 9,12,10,12,14,12,15, 7, 9,12, 9,12,10,12,14,
- 12,14, 7,10,13,10,14, 9,12,14,12,14,12,15,15,15,
- 15,10,12,15,12,15,13,15,15,15,15, 5, 7,10, 7,10,
- 7, 9,12, 9,13, 9,13,15,12,15, 7,10,13,10,11,10,
- 12,15,12,15, 7,10,14,10,15,10,11,15,13,14,14,14,
- 15,14,15, 9,13,15,12,14,13,14,15,14,15, 5, 7, 9,
- 8,10, 7,10,13,10,11,10,12,14,13,15, 7,10,13,10,
- 13,10,13,15,12,14, 7,10,13,10,11,10,12,14,12,14,
- 12,14,15,14,15, 9,11,15,12,14,12,14,15,14,15, 9,
- 12,15,12,15,11,15,15,14,15,14,15,15,15,15,13,13,
- 15,14,15,15,15,15,15,15, 7,10,12,10,12, 9,11,14,
- 12,14,12,13,15,14,15, 9,11,14,12,15,12,15,15,14,
- 15,10,12,15,12,14,12,14,15,13,15,15,15,15,14,15,
- 13,14,15,14,15,15,15,15,15,15, 7,10,13, 9,14,10,
- 12,13,13,14,13,15,15,14,15,10,12,15,13,15,14,15,
- 15,15,15,10,12,15,12,15,12,14,15,13,14,15,15,15,
- 15,15,11,14,15,15,15,14,15,15,15,15,13,14,15,15,
- 15,14,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
- 15,15,15,15,15,10,12,15,13,15,12,13,15,14,15,15,
- 15,15,15,15,12,14,15,14,15,14,14,15,14,15,14,14,
- 15,15,15,14,15,15,14,15,15,15,15,15,15,14,15,15,
- 15,15,15,15,15,15,15, 5, 7,10, 7,10, 7,10,13,10,
- 12,10,13,15,13,14, 7,10,12,10,13,10,12,15,13,15,
- 7, 9,14,10,12, 9,11,15,12,14,12,14,15,15,15, 9,
- 12,15,13,15,12,14,15,15,14,10,12,15,12,14,12,13,
- 15,14,15,14,15,15,15,15,12,15,15,14,15,15,14,15,
- 15,15, 7,10,13,10,13,10,12,14,12,14,13,14,15,14,
- 14,10,12,13,12,15,12,14,15,15,15,10,12,15,13,15,
- 12,14,15,14,15,15,15,15,15,15,12,14,15,15,15,15,
- 14,15,15,15, 7,10,14, 9,15,10,12,15,12,15,14,15,
- 15,14,15,10,12,15,12,15,15,14,15,14,15,10,12,15,
- 13,15,12,14,15,14,15,15,15,15,15,15,13,13,15,13,
- 15,15,15,15,15,15,13,14,15,15,15,14,15,15,14,15,
- 15,15,15,15,15,14,15,15,15,15,15,15,15,15,15,10,
- 12,15,12,15,13,15,15,15,15,15,15,15,15,15,12,14,
- 15,14,15,14,15,15,15,15,15,14,15,15,15,14,15,15,
- 15,15,15,15,15,15,15,14,15,15,15,15,15,15,15,15,
- 15,
+ 4, 5, 5, 7, 7, 9, 9, 5, 7, 7, 8, 8,10,10, 5, 7,
+ 7, 8, 8,11,11, 7, 8, 9,11,11,12,12, 7, 9, 9,11,
+ 11,12,12,10,11,11,13,13,13,14,10,11,11,13,13,14,
+ 13, 6, 7, 7, 9, 8,11,11, 7, 8, 8,10,10,12,12, 7,
+ 8, 8, 9,10,11,12, 9,10,10,11,12,13,13, 9,10,10,
+ 11,12,13,14,11,12,12,13,14,14,14,12,13,12,14,14,
+ 14,14, 6, 7, 7, 8, 9,10,11, 7, 8, 8,10, 9,11,13,
+ 7, 8, 8,10, 9,11,12, 9,10, 9,12,11,13,12, 9,10,
+ 10,12,11,13,12,11,12,12,13,13,14,14,11,12,12,14,
+ 13,14,13, 7, 9, 9,12,11,13,13, 9,10,10,12,13,14,
+ 13, 9,10,10,13,12,13,13,12,12,13,13,13,14,14,12,
+ 13,12,14,14,14,14,13,13,14,14,15,14,16,14,14,14,
+ 16,15,15,15, 7, 9, 9,11,12,12,13, 9,10,10,12,13,
+ 14,13, 9,10,10,12,12,13,12,12,13,12,13,13,15,14,
+ 12,12,12,14,14,14,14,14,13,15,15,13,17,14,13,14,
+ 14,14,14,15,15,10,12,11,14,13,15,15,12,12,13,15,
+ 14,15,15,12,13,13,15,14,17,15,15,14,15,15,15,16,
+ 16,14,14,14,15,14,15,17,15,17,14,15,15,16,17,15,
+ 15,15,15,16,15,17,10,12,12,13,13,15,14,12,13,13,
+ 15,14,15,15,12,13,13,13,14,15,15,14,14,15,15,15,
+ 15,17,14,13,15,15,15,15,16,17,16,14,15,15,15,15,
+ 14,15,14,16,15,17,16, 6, 7, 7, 9, 9,11,11, 7, 8,
+ 8,10,10,12,12, 7, 8, 8,10,10,12,12, 9,10,10,12,
+ 12,14,13, 9,10,10,12,12,13,13,12,12,13,15,13,14,
+ 14,11,12,13,13,13,15,14, 7, 9, 8,10,10,12,12, 8,
+ 9,10,11,11,12,13, 8, 9, 9,11,11,13,12,11,11,12,
+ 12,13,14,14,10,11,11,13,13,13,14,12,13,14,15,15,
+ 15,17,12,13,14,14,14,15,15, 7, 8, 9,10,10,12,12,
+ 8, 9, 9,11,11,12,13, 8, 9, 9,10,11,12,13,11,11,
+ 11,13,12,14,13,11,11,11,12,13,14,16,13,14,13,15,
+ 14,16,15,13,13,14,15,14,17,15, 9,11,10,14,13,15,
+ 13,10,11,12,13,13,15,15,11,11,12,13,13,14,13,12,
+ 13,13,13,13,13,15,13,14,13,14,14,15,15,14,14,17,
+ 15,17,14,15,14,14,15,17,16,15,16, 9,10,11,12,14,
+ 14,14,10,11,11,13,13,14,15,10,11,12,13,13,14,14,
+ 12,13,12,14,13,15,15,13,13,14,15,14,15,14,14,14,
+ 14,16,14,16,14,14,14,14,15,16,15,15,12,13,13,15,
+ 14,15,15,13,13,14,14,15,15,15,13,14,14,15,14,16,
+ 14,14,16,15,15,15,17,15,15,15,15,15,15,17,16,16,
+ 15,15,16,15,15,17,14,15,15,15,17,17,15,13,13,14,
+ 13,14,14,15,13,14,14,15,15,15,15,14,14,14,15,14,
+ 15,15,15,17,14,16,15,15,15,13,14,15,14,15,17,15,
+ 15,15,16,16,14,17,15,16,15,16,16,16,16,16, 6, 7,
+ 7, 9, 9,11,12, 7, 8, 8,10,10,12,12, 7, 8, 8,10,
+ 10,12,12, 9,10,10,12,12,13,13, 9,10,10,13,12,13,
+ 14,12,12,13,13,14,14,14,12,12,12,14,14,15,14, 7,
+ 9, 8,10,10,12,12, 8, 9, 9,11,11,13,12, 8, 9,10,
+ 11,11,13,13,10,12,11,13,13,14,14,10,11,12,12,13,
+ 13,13,13,13,13,15,13,14,14,12,13,14,13,14,14,16,
+ 7, 8, 8,10,10,12,12, 8, 9,10,11,11,12,13, 8,10,
+ 9,11,11,13,12,10,11,11,13,13,13,14,10,11,11,13,
+ 12,14,13,13,14,14,14,14,15,14,13,13,13,15,14,15,
+ 14, 9,10,10,14,13,15,14,11,12,12,14,13,13,14,10,
+ 11,11,14,14,14,14,13,14,14,15,13,16,14,12,12,13,
+ 13,14,13,15,14,14,14,15,15,16,15,14,14,14,14,17,
+ 14,16, 9,10,10,12,12,13,14,10,11,12,13,14,13,14,
+ 10,11,11,13,13,14,14,13,14,14,14,14,14,15,12,13,
+ 13,15,13,15,13,15,14,14,15,15,15,15,14,15,15,17,
+ 14,16,15,12,13,14,15,13,16,15,13,14,13,15,14,15,
+ 15,13,14,14,15,14,14,16,14,15,15,15,15,17,15,14,
+ 14,14,14,15,15,17,15,15,15,17,15,16,17,15,14,15,
+ 17,16,15,17,12,12,14,14,14,15,14,13,14,15,14,15,
+ 16,16,13,14,14,16,15,14,15,14,15,15,15,15,15,16,
+ 14,15,14,15,17,16,16,16,15,17,16,15,16,17,15,14,
+ 15,17,15,17,15, 8,10, 9,12,12,14,14,10,11,11,13,
+ 13,13,13, 9,10,11,13,13,14,14,13,13,13,14,14,15,
+ 15,12,13,12,14,13,15,15,14,14,14,15,15,17,15,14,
+ 14,15,15,15,15,14, 9,11,11,14,13,14,14,11,12,12,
+ 14,13,15,14,11,12,11,14,13,14,14,13,13,14,14,16,
+ 15,15,13,14,14,16,14,16,14,15,15,14,16,15,15,16,
+ 14,15,15,15,15,15,15, 9,11,11,13,13,15,13,10,12,
+ 11,13,14,14,14,10,11,12,13,14,15,14,14,14,14,15,
+ 15,15,15,12,13,14,14,14,15,16,14,15,15,17,15,17,
+ 16,14,15,14,16,15,17,17,12,13,13,14,14,14,15,12,
+ 13,13,14,14,17,15,13,16,13,15,14,15,14,15,14,15,
+ 14,16,14,16,14,14,14,16,14,17,15,15,14,16,14,17,
+ 17,16,15,16,16,15,15,17,16,12,12,13,15,14,15,15,
+ 12,14,14,15,15,15,15,13,14,14,14,14,15,17,14,15,
+ 15,16,14,17,15,15,15,14,14,16,16,16,15,16,14,16,
+ 15,17,16,16,17,15,17,16,15,17,13,14,14,15,15,17,
+ 16,14,14,15,16,15,17,16,15,14,16,16,16,16,15,15,
+ 15,16,15,17,16,16,15,17,16,17,16,15,15,15,16,15,
+ 15,17,16,16,15,17,16,16,17,17,17,14,14,15,15,15,
+ 16,16,14,15,15,17,15,16,17,15,14,15,17,17,15,17,
+ 16,16,15,16,14,15,17,15,16,15,15,14,17,17,16,17,
+ 14,16,15,17,15,15,16,16,17,16,16,17, 8, 9, 9,12,
+ 12,13,14, 9,11,11,12,13,14,15, 9,11,11,13,13,14,
+ 14,12,13,13,14,14,14,14,12,13,14,14,14,15,15,14,
+ 14,15,15,15,15,15,14,15,15,15,14,15,16, 9,11,11,
+ 14,13,14,14,11,12,11,14,13,15,14,11,12,12,13,15,
+ 14,14,13,14,13,15,15,16,15,12,14,14,15,15,14,16,
+ 14,15,15,16,15,15,15,14,14,15,15,16,17,15, 9,10,
+ 11,12,13,15,14,10,12,12,13,14,14,14,10,12,11,14,
+ 14,14,14,13,13,13,14,15,14,15,14,14,13,15,15,15,
+ 16,15,15,15,16,16,15,16,13,17,14,16,15,14,16,12,
+ 14,12,15,14,16,14,13,14,14,15,16,17,15,12,13,13,
+ 15,14,15,15,15,15,14,16,16,15,14,14,14,14,14,15,
+ 14,15,16,15,15,17,16,17,17,17,16,14,15,17,15,17,
+ 12,13,13,14,14,15,15,13,13,14,16,14,14,16,13,13,
+ 13,14,14,15,15,14,15,15,15,15,15,17,14,15,13,15,
+ 14,15,15,14,15,16,15,16,16,16,15,15,15,15,15,17,
+ 14,14,15,15,16,16,16,15,14,16,15,17,14,16,15,14,
+ 15,16,15,14,15,16,14,17,16,16,17,17,17,17,15,15,
+ 15,15,17,16,15,16,15,16,17,16,17,15,15,16,16,16,
+ 15,16,13,16,15,15,16,15,16,14,16,15,15,17,17,15,
+ 13,14,14,15,16,17,17,15,15,15,15,16,16,17,16,17,
+ 14,16,15,17,17,17,17,16,17,17,16,16,16,15,15,17,
+ 16,17,15,11,12,13,14,14,14,15,13,13,14,14,15,14,
+ 17,13,13,14,14,15,17,15,14,15,14,15,15,16,17,14,
+ 15,15,14,16,15,17,15,16,15,17,16,17,16,15,16,15,
+ 16,16,15,17,12,13,13,15,14,15,15,14,14,14,14,17,
+ 16,15,13,14,14,15,15,15,15,15,16,15,17,16,16,17,
+ 15,14,15,15,17,16,17,16,17,16,16,17,17,16,15,15,
+ 15,17,15,17,17,13,13,13,15,15,17,17,13,14,14,15,
+ 15,15,15,13,14,14,14,15,14,15,14,15,15,15,15,15,
+ 15,14,15,14,15,17,15,15,15,16,15,16,17,17,16,16,
+ 15,15,17,17,16,16,14,15,15,15,15,15,15,15,14,16,
+ 16,17,17,16,15,16,16,15,15,16,15,15,15,15,15,17,
+ 16,15,15,17,15,17,17,17,15,16,15,15,15,17,15,15,
+ 15,16,17,16,17,17,16,14,15,14,15,14,17,17,14,15,
+ 15,16,15,17,17,14,15,15,15,17,15,17,15,15,16,15,
+ 16,17,16,15,15,17,16,15,16,17,15,17,15,17,15,17,
+ 16,17,16,15,17,17,17,17,14,16,15,15,17,16,17,15,
+ 15,15,17,16,16,17,16,15,15,17,16,16,16,15,15,15,
+ 16,15,16,16,16,16,15,16,16,17,17,17,15,16,17,17,
+ 16,17,16,17,16,17,15,17,16,14,16,15,15,16,16,17,
+ 15,15,16,16,16,16,17,15,15,16,16,16,17,16,15,15,
+ 15,17,16,17,16,17,17,17,15,17,15,16,16,17,15,17,
+ 16,17,17,17,16,16,17,17,17,17,11,12,12,14,15,15,
+ 15,12,13,13,14,15,16,16,12,14,13,16,14,17,15,15,
+ 15,15,15,15,15,16,15,15,14,16,15,15,17,15,15,15,
+ 16,15,17,16,15,14,16,17,17,15,17,12,13,14,16,14,
+ 15,15,14,14,14,15,16,17,15,13,14,14,14,15,15,17,
+ 15,14,14,15,16,16,16,15,17,15,15,15,16,17,15,17,
+ 16,17,15,15,15,16,16,16,15,16,16,17,12,13,13,14,
+ 14,17,15,13,13,14,14,15,16,17,14,15,14,15,15,15,
+ 16,15,14,17,15,15,15,16,15,15,17,17,17,16,15,15,
+ 15,15,15,16,17,15,16,15,15,17,15,16,17,15,15,14,
+ 16,14,15,16,14,17,15,16,17,15,16,15,15,14,17,14,
+ 16,17,15,16,17,17,16,16,16,15,15,16,15,16,17,16,
+ 17,15,17,17,16,16,16,16,16,15,15,17,15,17,14,14,
+ 15,15,16,17,15,14,15,16,17,15,14,15,15,14,15,15,
+ 15,16,17,16,15,16,16,17,17,17,17,15,15,15,17,17,
+ 16,17,15,17,17,17,17,17,16,16,16,17,17,16,16,16,
+ 15,15,17,15,17,17,14,16,15,15,16,17,16,14,14,15,
+ 16,17,16,17,16,17,16,17,15,17,17,17,14,15,17,17,
+ 17,17,17,17,16,16,17,17,17,16,15,17,17,17,17,17,
+ 17,15,15,16,17,16,16,16,17,15,16,15,15,17,16,15,
+ 15,17,17,17,17,17,17,16,17,17,15,17,16,17,16,17,
+ 16,17,17,17,17,16,17,17,17,17,17,17,16,16,17,17,
+ 17,
};
static float _vq_quantthresh_res0_128_128_2[] = {
- -1.5, -0.5, 0.5, 1.5,
+ -2.5, -1.5, -0.5, 0.5, 1.5, 2.5,
};
static long _vq_quantmap_res0_128_128_2[] = {
- 4, 3, 0, 1, 2,
+ 5, 3, 1, 0, 2, 4, 6,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_2 = {
_vq_quantthresh_res0_128_128_2,
_vq_quantmap_res0_128_128_2,
- 5,
- 5
+ 7,
+ 7
};
static static_codebook _vq_book_res0_128_128_2 = {
- 4, 625,
+ 4, 2401,
_vq_lengthlist_res0_128_128_2,
- 1, -533725184, 1611661312, 3, 0,
+ 1, -533200896, 1611661312, 3, 0,
_vq_quantlist_res0_128_128_2,
NULL,
&_vq_auxt_res0_128_128_2,
1.2.2.1 +76 -23 vorbis/lib/books/res0_128_128_3.vqh
Index: res0_128_128_3.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_3.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128_3.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128_3.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,46 +19,100 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_128_3[] = {
- 5,
- 6,
- 7,
- 8,
+ 12,
+ 11,
+ 13,
10,
+ 14,
+ 9,
+ 15,
+ 8,
+ 16,
+ 7,
+ 17,
+ 6,
+ 18,
+ 5,
+ 19,
4,
+ 20,
3,
+ 21,
2,
+ 22,
+ 1,
+ 23,
0,
+ 24,
};
static long _vq_lengthlist_res0_128_128_3[] = {
- 1, 4, 6, 6, 7, 4, 6, 6, 7, 4, 6, 8, 9, 9, 6, 8,
- 9, 9, 7, 9,10,12,11, 9,11,12,13, 7,10,13,14,15,
- 10,13,13,15, 8,12,13,15,14,12,13,15,15, 4, 6, 8,
- 8, 9, 6, 8, 8, 9, 6, 9,11,12,12, 9,11,12,12, 6,
- 10,12,14,12,10,12,13,13, 8,12,14,15,15,12,15,13,
- 13,
+ 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 9, 8, 9,
+ 9, 9, 9,10,10,10,10, 8, 8, 5, 6, 6, 6, 7, 7, 7,
+ 7, 7, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,
+ 8, 8, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9,
+ 9,10, 9, 9,10,10,10,10,10, 8, 9, 6, 7, 7, 7, 7,
+ 8, 8, 8, 8, 9, 9, 9, 9,10, 9,10,10,11,11,11,11,
+ 11,11,10,10, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 9,
+ 9, 9,10,10,10,10,11,11,11,11,11,10,10, 7, 8, 8,
+ 8, 8, 9, 8, 9, 9, 9, 9,10,10,10,10,11,11,11,11,
+ 12,12,12,12,10,11, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9,
+ 9,10,10,10,10,11,11,11,11,12,11,12,12,10,10, 8,
+ 8, 8, 9, 9, 9, 9,10, 9,10,10,10,10,11,11,11,12,
+ 12,11,12,12,12,13,11,11, 8, 8, 8, 9, 9, 9, 9, 9,
+ 9,10,10,10,10,11,11,11,11,11,12,12,12,12,13,11,
+ 11, 8, 9, 9, 9, 9,10, 9,10,10,10,10,11,10,11,11,
+ 12,11,12,12,12,12,13,12,11,11, 8, 9, 9, 9, 9, 9,
+ 10,10,10,10,11,11,11,11,11,11,12,12,12,12,12,13,
+ 13,11,12, 9,10,10,10,10,10,10,11,11,11,11,12,11,
+ 12,12,12,12,13,13,13,13,14,13,12,12, 9, 9, 9,10,
+ 10,10,10,10,10,11,11,11,11,12,11,12,12,13,12,12,
+ 13,13,13,12,12,10,10,10,10,10,11,11,11,11,11,11,
+ 12,12,12,12,13,13,13,12,12,13,14,13,12,12,10,10,
+ 10,10,10,11,11,11,11,11,12,12,12,12,12,12,12,12,
+ 12,13,13,14,13,12,13,10,11,11,11,11,11,12,11,12,
+ 12,12,13,12,12,13,13,14,13,12,14,13,14,15,13,12,
+ 10,10,10,11,11,11,12,12,11,12,12,13,12,12,13,12,
+ 13,12,14,14,13,14,14,13,12,11,11,11,11,12,12,12,
+ 12,12,12,12,12,13,13,14,13,14,14,14,14,14,14,14,
+ 13,14,10,11,11,12,12,12,12,12,12,12,13,13,13,13,
+ 13,13,13,13,13,15,14,14,14,15,13,11,11,12,12,12,
+ 13,13,13,13,13,13,13,13,13,14,14,13,14,15,14,14,
+ 14,14,14,13,11,12,12,12,12,13,12,13,12,13,13,13,
+ 13,13,13,13,13,13,14,14,14,14,14,13,13,12,12,12,
+ 12,12,12,13,13,14,14,14,14,14,14,14,13,14,13,15,
+ 15,16,14,16,13,15,12,12,12,12,12,13,12,13,13,14,
+ 13,13,13,14,13,15,14,15,13,14,14,14,15,14,14,10,
+ 11,11,11,11,12,12,12,12,12,12,13,13,13,13,13,15,
+ 13,13,14,13,14,15,12,12,10,11,11,12,11,12,12,13,
+ 12,12,12,13,13,13,13,14,13,13,13,14,13,15,14,12,
+ 12,
};
static float _vq_quantthresh_res0_128_128_3[] = {
- -4, -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4,
+ -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5, 10.5, 11.5,
};
static long _vq_quantmap_res0_128_128_3[] = {
- 8, 7, 6, 5, 0, 1, 2, 3,
- 4,
+ 23, 21, 19, 17, 15, 13, 11, 9,
+ 7, 5, 3, 1, 0, 2, 4, 6,
+ 8, 10, 12, 14, 16, 18, 20, 22,
+ 24,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_3 = {
_vq_quantthresh_res0_128_128_3,
_vq_quantmap_res0_128_128_3,
- 9,
- 9
+ 25,
+ 25
};
static static_codebook _vq_book_res0_128_128_3 = {
- 2, 81,
+ 2, 625,
_vq_lengthlist_res0_128_128_3,
- 1, -531365888, 1611661312, 4, 0,
+ 1, -529006592, 1611661312, 5, 0,
_vq_quantlist_res0_128_128_3,
NULL,
&_vq_auxt_res0_128_128_3,
1.2.2.1 +173 -31 vorbis/lib/books/res0_128_128_4.vqh
Index: res0_128_128_4.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_4.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128_4.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128_4.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,56 +19,199 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_128_4[] = {
- 11,
- 12,
- 13,
- 14,
- 16,
- 19,
+ 21,
+ 20,
22,
+ 19,
+ 23,
+ 18,
+ 24,
+ 17,
+ 25,
+ 16,
+ 26,
+ 15,
+ 27,
+ 14,
+ 28,
+ 13,
+ 29,
+ 12,
+ 30,
+ 11,
+ 31,
10,
+ 32,
9,
+ 33,
8,
+ 34,
+ 7,
+ 35,
6,
+ 36,
+ 5,
+ 37,
+ 4,
+ 38,
3,
+ 39,
+ 2,
+ 40,
+ 1,
+ 41,
0,
+ 42,
};
static long _vq_lengthlist_res0_128_128_4[] = {
- 3, 3, 5, 6, 6, 6, 6, 3, 5, 6, 6, 6, 6, 4, 5, 7,
- 8, 8, 7, 8, 5, 7, 8, 8, 7, 7, 7, 8,10,10,11,11,
- 10, 8,10,10,11,10,11,10,10,12,12,13,13,13,11,12,
- 13,15,13,13,11,13,16,16,15,15,14,13,15,15,17,15,
- 17,11,16,16,17,17,17,16,15,16,17,17,17,17,12,16,
- 17,17,17,17,17,16,17,17,17,17,17, 4, 5, 7, 7, 7,
- 7, 8, 5, 7, 7, 8, 7, 7, 7, 8,10,11,10,10,11, 8,
- 10,11,11,10,11, 9,11,12,13,14,12,13,11,12,13,13,
- 13,13,11,14,13,16,16,17,15,13,15,15,15,14,15,12,
- 15,16,17,17,17,17,14,17,15,15,17,16,13,16,16,16,
- 16,16,16,16,15,16,16,16,16,
+ 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 7, 7, 5, 6, 6, 7, 7,
+ 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,
+ 10, 9, 9, 9, 9,10,10,10,10,10, 9, 9, 9, 9, 9, 9,
+ 9,10, 9,10, 7, 7, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8,
+ 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,
+ 10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9,10,10,10, 7,
+ 7, 7, 8, 8, 9, 8, 9, 9, 9, 9,10, 9,10, 9,10,10,
+ 10,10,10,10,10,10,10,10,11,11,11,10,11,11,11,11,
+ 10,10,10,10,10,11,10,11,11,11, 9, 9, 7, 8, 8, 8,
+ 8, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,
+ 10,11,11,10,10,11,11,11,11,11,11,11,10,11,11,11,
+ 11,11,11,11,11, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,
+ 10,10,10,11,11,11,11,11,11,11,11,11,12,11,12,11,
+ 11,11,12,11,11,12,11,12,12,11,11,11,12,11,12,12,
+ 9,10, 9, 9, 9,10, 9,10,10,10,10,10,11,11,11,11,
+ 11,11,11,11,11,11,11,11,11,11,12,11,12,12,12,12,
+ 12,11,12,11,11,11,12,11,11,12,11,10,10, 9,10,10,
+ 10,10,11,11,11,10,11,11,11,12,11,11,12,11,12,12,
+ 11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+ 12,12,12,12,12,12,10,10,10, 9,10,10,10,10,10,11,
+ 11,11,11,11,11,11,11,12,11,12,12,12,11,12,11,12,
+ 12,12,12,12,12,12,13,12,12,12,12,12,12,12,12,12,
+ 12,10,10,10,10,10,11,11,11,11,11,11,12,11,12,12,
+ 12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,13,
+ 12,13,12,12,12,13,12,12,13,13,13,12,11,11,10,10,
+ 10,10,11,11,11,11,11,11,11,12,12,12,12,12,12,12,
+ 12,12,12,13,13,12,12,12,13,13,12,12,13,12,13,13,
+ 12,12,12,13,13,13,13,11,11,11,10,10,11,11,11,11,
+ 12,12,12,12,12,12,12,12,12,13,12,12,12,13,13,12,
+ 13,12,13,13,14,13,13,13,13,13,13,13,14,13,13,13,
+ 13,13,11,11,10,10,11,11,11,11,11,12,12,12,12,12,
+ 12,12,12,12,13,12,13,13,12,12,13,13,13,13,13,12,
+ 12,14,13,13,13,13,13,13,12,13,13,13,13,11,11,11,
+ 11,11,11,11,12,12,12,11,12,12,12,12,13,13,13,12,
+ 12,13,14,13,13,13,13,13,14,14,14,14,13,14,12,12,
+ 13,13,13,13,13,13,14,13,11,12,11,11,11,11,11,12,
+ 12,11,12,12,12,12,12,12,12,13,13,12,13,13,13,13,
+ 13,12,13,13,13,13,13,14,13,13,13,14,14,14,13,13,
+ 13,14,13,11,12,11,11,11,12,12,12,12,12,12,12,13,
+ 12,12,13,13,13,13,13,13,13,13,13,13,14,13,12,13,
+ 14,13,13,13,13,13,14,14,13,14,14,13,16,14,12,13,
+ 11,11,11,12,11,11,12,12,12,12,13,12,13,13,13,13,
+ 12,12,13,13,13,13,14,14,14,13,14,13,13,13,13,14,
+ 13,13,14,14,14,14,14,14,14,12,12,11,12,11,12,12,
+ 12,13,12,12,13,13,13,13,13,13,13,13,13,13,13,13,
+ 13,14,13,13,14,14,14,14,14,13,13,14,14,14,14,14,
+ 14,14,14,14,12,13,11,12,11,12,12,13,12,12,12,13,
+ 12,13,13,13,13,13,13,14,13,14,13,16,13,14,14,14,
+ 13,14,14,15,14,14,14,14,13,14,14,14,14,14,14,12,
+ 12,11,12,12,12,12,12,12,13,12,13,13,14,13,13,13,
+ 14,13,14,14,14,13,14,13,14,13,14,14,14,14,15,13,
+ 14,14,13,14,14,14,14,15,14,14,13,12,11,12,11,12,
+ 12,13,12,12,12,13,13,13,13,13,14,13,13,13,13,15,
+ 13,14,14,14,14,14,14,14,14,14,14,14,15,14,14,15,
+ 15,16,14,15,14,12,12,12,12,12,12,13,12,13,13,13,
+ 13,13,14,14,14,14,14,13,15,14,14,15,14,16,14,14,
+ 14,14,15,15,14,16,13,14,13,14,16,13,15,15,16,15,
+ 13,13,12,12,12,12,12,13,13,13,12,13,13,13,14,14,
+ 13,13,13,14,15,14,14,15,13,14,13,14,14,15,14,14,
+ 15,14,14,15,14,14,14,15,15,14,13,12,12,12,12,12,
+ 13,13,12,13,13,13,14,13,14,13,13,14,14,13,14,14,
+ 14,13,14,14,14,14,14,14,14,15,15,15,15,15,15,14,
+ 14,15,15,15,15,15,13,13,12,12,12,12,13,13,13,12,
+ 13,13,14,13,14,14,14,14,14,14,14,14,14,14,15,14,
+ 14,14,13,14,14,15,15,14,14,15,14,14,15,14,14,15,
+ 14,13,12,12,12,12,13,13,13,13,13,13,13,13,13,14,
+ 14,14,14,14,14,14,14,14,14,15,14,15,14,14,16,15,
+ 14,14,17,15,16,14,17,14,14,14,14,14,13,13,12,12,
+ 12,13,13,13,12,13,13,14,13,13,14,13,14,13,14,14,
+ 14,13,14,16,14,14,14,15,14,14,16,14,14,14,14,15,
+ 15,14,15,15,15,15,16,13,13,12,12,13,13,13,13,13,
+ 13,14,13,14,14,13,13,14,13,15,14,14,14,14,14,15,
+ 14,15,14,14,14,14,16,14,14,14,15,14,14,15,14,14,
+ 14,14,14,13,12,12,12,13,13,14,13,13,13,13,14,14,
+ 13,13,14,14,14,14,14,15,14,14,15,15,15,14,14,13,
+ 15,15,15,14,14,15,15,15,15,15,15,14,16,13,14,12,
+ 13,13,13,14,13,13,14,14,14,14,14,14,14,15,14,14,
+ 14,15,15,14,15,17,16,14,14,14,14,14,15,14,14,14,
+ 14,14,16,16,16,14,14,14,14,13,12,13,13,13,13,14,
+ 13,14,13,14,14,14,13,14,14,15,15,14,14,14,14,15,
+ 14,15,14,14,14,14,15,17,15,16,15,14,16,14,17,15,
+ 15,15,15,13,14,12,12,13,13,12,13,14,13,13,14,13,
+ 15,13,14,14,14,13,15,15,15,14,14,14,15,15,15,15,
+ 16,14,15,15,15,15,14,15,17,14,15,15,14,15,14,13,
+ 12,12,12,13,13,13,13,13,13,13,13,14,15,14,14,14,
+ 15,14,14,14,14,15,14,14,14,15,15,15,16,16,15,15,
+ 16,16,15,15,16,14,15,15,16,13,14,12,12,12,13,13,
+ 13,14,14,14,14,13,14,14,14,14,16,14,15,14,14,15,
+ 15,15,15,14,16,14,16,15,15,15,16,15,15,15,17,15,
+ 14,15,16,15,13,14,12,12,13,13,12,14,13,13,14,13,
+ 13,14,15,15,15,16,14,14,15,14,14,16,16,15,16,14,
+ 15,15,14,15,16,15,14,16,16,15,15,15,16,17,16,13,
+ 15,12,12,13,13,15,13,14,13,14,14,14,14,15,14,16,
+ 14,15,14,14,14,15,15,14,15,14,16,16,17,15,16,15,
+ 17,16,15,15,14,16,14,15,15,17,15,15,12,13,13,13,
+ 13,13,13,13,14,14,14,15,15,13,17,14,14,14,14,16,
+ 16,14,15,16,15,15,15,15,15,15,14,16,16,16,15,15,
+ 16,16,17,16,15,14,14,12,12,13,13,14,14,13,14,14,
+ 13,15,15,14,14,15,17,14,16,15,17,15,15,16,16,17,
+ 15,16,15,17,17,17,14,15,16,15,16,15,16,15,15,15,
+ 15,15,13,12,12,13,13,14,14,15,14,14,15,14,14,14,
+ 15,14,15,17,17,15,14,16,16,16,14,16,17,16,15,15,
+ 15,15,15,15,15,15,17,15,16,16,16,14,16,12,13,13,
+ 13,13,14,13,14,15,15,15,14,14,15,14,16,15,14,15,
+ 17,15,16,16,15,16,17,15,17,16,17,16,15,15,15,15,
+ 16,17,17,16,17,16,15,14,13,13,13,14,13,14,13,15,
+ 14,14,13,15,14,17,14,14,15,15,17,15,15,15,14,15,
+ 15,15,17,15,14,16,17,16,17,16,16,17,16,15,17,15,
+ 16,14,14,11,11,11,12,12,12,12,13,13,13,13,14,13,
+ 13,13,14,14,14,14,14,14,13,14,14,14,14,14,15,14,
+ 14,14,14,14,16,15,15,14,16,14,15,14,13,13,11,11,
+ 11,12,12,12,12,12,12,13,13,13,13,13,13,13,14,14,
+ 14,15,14,14,15,14,15,14,14,16,14,15,14,15,14,14,
+ 15,16,15,14,14,17,14,13,13,
};
static float _vq_quantthresh_res0_128_128_4[] = {
- -9.5, -6.5, -4, -2.5, -1.5, -0.5, 0.5, 1.5,
- 2.5, 4, 6.5, 9.5,
+ -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5, -13.5,
+ -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5, 10.5,
+ 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5, 18.5,
+ 19.5, 20.5,
};
static long _vq_quantmap_res0_128_128_4[] = {
- 12, 11, 10, 9, 8, 7, 0, 1,
- 2, 3, 4, 5, 6,
+ 41, 39, 37, 35, 33, 31, 29, 27,
+ 25, 23, 21, 19, 17, 15, 13, 11,
+ 9, 7, 5, 3, 1, 0, 2, 4,
+ 6, 8, 10, 12, 14, 16, 18, 20,
+ 22, 24, 26, 28, 30, 32, 34, 36,
+ 38, 40, 42,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_4 = {
_vq_quantthresh_res0_128_128_4,
_vq_quantmap_res0_128_128_4,
- 13,
- 13
+ 43,
+ 43
};
static static_codebook _vq_book_res0_128_128_4 = {
- 2, 169,
+ 2, 1849,
_vq_lengthlist_res0_128_128_4,
- 1, -529137664, 1611661312, 5, 0,
+ 1, -527106048, 1611661312, 6, 0,
_vq_quantlist_res0_128_128_4,
NULL,
&_vq_auxt_res0_128_128_4,
1.2.2.1 +367 -45 vorbis/lib/books/res0_128_128_5.vqh
Index: res0_128_128_5.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128_5.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128_5.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128_5.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -1,13 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *
- * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *
- * http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *
+ * by the XIPHOPHORUS Company, http://www.xiph.org/ *
* *
********************************************************************
@@ -20,101 +19,424 @@
#include "codebook.h"
static long _vq_quantlist_res0_128_128_5[] = {
- 102,
- 103,
- 104,
- 105,
- 107,
- 110,
- 113,
- 116,
- 119,
- 122,
- 126,
- 130,
- 133,
- 137,
- 141,
- 145,
+ 150,
149,
+ 151,
+ 148,
+ 152,
+ 147,
153,
+ 146,
+ 154,
+ 145,
+ 155,
+ 144,
+ 156,
+ 143,
+ 157,
+ 142,
158,
+ 141,
+ 159,
+ 140,
+ 160,
+ 139,
+ 161,
+ 138,
+ 162,
+ 137,
163,
+ 136,
+ 164,
+ 135,
+ 165,
+ 134,
+ 166,
+ 133,
+ 167,
+ 132,
168,
+ 131,
+ 169,
+ 130,
+ 170,
+ 129,
+ 171,
+ 128,
+ 172,
+ 127,
173,
+ 126,
174,
+ 125,
+ 175,
+ 124,
+ 176,
+ 123,
+ 177,
+ 122,
+ 178,
+ 121,
+ 179,
+ 120,
180,
+ 119,
+ 181,
+ 118,
+ 182,
+ 117,
+ 183,
+ 116,
+ 184,
+ 115,
+ 185,
+ 114,
186,
+ 113,
+ 187,
+ 112,
+ 188,
+ 111,
+ 189,
+ 110,
+ 190,
+ 109,
+ 191,
+ 108,
192,
+ 107,
+ 193,
+ 106,
+ 194,
+ 105,
+ 195,
+ 104,
+ 196,
+ 103,
+ 197,
+ 102,
198,
- 204,
101,
+ 199,
100,
+ 200,
99,
+ 201,
+ 98,
+ 202,
97,
+ 203,
+ 96,
+ 204,
+ 95,
+ 205,
94,
+ 206,
+ 93,
+ 207,
+ 92,
+ 208,
91,
+ 209,
+ 90,
+ 210,
+ 89,
+ 211,
88,
+ 212,
+ 87,
+ 213,
+ 86,
+ 214,
85,
+ 215,
+ 84,
+ 216,
+ 83,
+ 217,
82,
+ 218,
+ 81,
+ 219,
+ 80,
+ 220,
+ 79,
+ 221,
78,
+ 222,
+ 77,
+ 223,
+ 76,
+ 224,
+ 75,
+ 225,
74,
+ 226,
+ 73,
+ 227,
+ 72,
+ 228,
71,
+ 229,
+ 70,
+ 230,
+ 69,
+ 231,
+ 68,
+ 232,
67,
+ 233,
+ 66,
+ 234,
+ 65,
+ 235,
+ 64,
+ 236,
63,
+ 237,
+ 62,
+ 238,
+ 61,
+ 239,
+ 60,
+ 240,
59,
+ 241,
+ 58,
+ 242,
+ 57,
+ 243,
+ 56,
+ 244,
55,
+ 245,
+ 54,
+ 246,
+ 53,
+ 247,
+ 52,
+ 248,
51,
+ 249,
+ 50,
+ 250,
+ 49,
+ 251,
+ 48,
+ 252,
+ 47,
+ 253,
46,
+ 254,
+ 45,
+ 255,
+ 44,
+ 256,
+ 43,
+ 257,
+ 42,
+ 258,
41,
+ 259,
+ 40,
+ 260,
+ 39,
+ 261,
+ 38,
+ 262,
+ 37,
+ 263,
36,
+ 264,
+ 35,
+ 265,
+ 34,
+ 266,
+ 33,
+ 267,
+ 32,
+ 268,
31,
+ 269,
30,
+ 270,
+ 29,
+ 271,
+ 28,
+ 272,
+ 27,
+ 273,
+ 26,
+ 274,
+ 25,
+ 275,
24,
+ 276,
+ 23,
+ 277,
+ 22,
+ 278,
+ 21,
+ 279,
+ 20,
+ 280,
+ 19,
+ 281,
18,
+ 282,
+ 17,
+ 283,
+ 16,
+ 284,
+ 15,
+ 285,
+ 14,
+ 286,
+ 13,
+ 287,
12,
+ 288,
+ 11,
+ 289,
+ 10,
+ 290,
+ 9,
+ 291,
+ 8,
+ 292,
+ 7,
+ 293,
6,
+ 294,
+ 5,
+ 295,
+ 4,
+ 296,
+ 3,
+ 297,
+ 2,
+ 298,
+ 1,
+ 299,
0,
+ 300,
};
static long _vq_lengthlist_res0_128_128_5[] = {
- 1, 3, 4, 6, 6, 6, 7, 7, 7, 8, 9,11,12,13,15,18,
- 18,18,18,17,17,17,17,17,17,17,17,17, 3, 5, 6, 6,
- 6, 7, 7, 7, 8, 8,11,12,13,15,17,17,17,17,17,17,
- 17,17,17,17,17,17,17,
+ 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,
+ 10,10,10, 8, 9, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,
+ 9, 9,10,10,10,10,10,11,10,10,11,11,11,11,11,11,
+ 11,11,11,11,11,11,12,13,12,12,12,12,12,12,12,12,
+ 12,12,12,13,13,13,13,13,14,13,14,14,14,14,14,15,
+ 14,14,14,15,14,15,14,15,15,15,15,15,15,17,16,17,
+ 15,15,15,17,15,16,16,16,16,15,15,17,17,17,17,17,
+ 17,16,15,17,17,17,17,17,17,17,17,16,17,17,17,17,
+ 17,17,17,16,17,17,17,17,17,17,16,17,17,17,16,17,
+ 17,17,17,17,17,17,17,17,16,17,17,17,17,17,16,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,16,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,16,17,17,17,17,17,
+ 17,17,17,17,17,17,17,17,17,17,17,17,17,
};
static float _vq_quantthresh_res0_128_128_5[] = {
- -99, -93, -87, -81, -75, -71.5, -68.5, -63.5,
- -58.5, -53.5, -49, -45, -41, -37, -33, -29.5,
- -26, -22, -18.5, -15.5, -12.5, -9.5, -6.5, -4,
- -2.5, -1.5, -0.5, 0.5, 1.5, 2.5, 4, 6.5,
- 9.5, 12.5, 15.5, 18.5, 22, 26, 29.5, 33,
- 37, 41, 45, 49, 53.5, 58.5, 63.5, 68.5,
- 71.5, 75, 81, 87, 93, 99,
+ -149.5, -148.5, -147.5, -146.5, -145.5, -144.5, -143.5, -142.5,
+ -141.5, -140.5, -139.5, -138.5, -137.5, -136.5, -135.5, -134.5,
+ -133.5, -132.5, -131.5, -130.5, -129.5, -128.5, -127.5, -126.5,
+ -125.5, -124.5, -123.5, -122.5, -121.5, -120.5, -119.5, -118.5,
+ -117.5, -116.5, -115.5, -114.5, -113.5, -112.5, -111.5, -110.5,
+ -109.5, -108.5, -107.5, -106.5, -105.5, -104.5, -103.5, -102.5,
+ -101.5, -100.5, -99.5, -98.5, -97.5, -96.5, -95.5, -94.5,
+ -93.5, -92.5, -91.5, -90.5, -89.5, -88.5, -87.5, -86.5,
+ -85.5, -84.5, -83.5, -82.5, -81.5, -80.5, -79.5, -78.5,
+ -77.5, -76.5, -75.5, -74.5, -73.5, -72.5, -71.5, -70.5,
+ -69.5, -68.5, -67.5, -66.5, -65.5, -64.5, -63.5, -62.5,
+ -61.5, -60.5, -59.5, -58.5, -57.5, -56.5, -55.5, -54.5,
+ -53.5, -52.5, -51.5, -50.5, -49.5, -48.5, -47.5, -46.5,
+ -45.5, -44.5, -43.5, -42.5, -41.5, -40.5, -39.5, -38.5,
+ -37.5, -36.5, -35.5, -34.5, -33.5, -32.5, -31.5, -30.5,
+ -29.5, -28.5, -27.5, -26.5, -25.5, -24.5, -23.5, -22.5,
+ -21.5, -20.5, -19.5, -18.5, -17.5, -16.5, -15.5, -14.5,
+ -13.5, -12.5, -11.5, -10.5, -9.5, -8.5, -7.5, -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, 7.5, 8.5, 9.5,
+ 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 16.5, 17.5,
+ 18.5, 19.5, 20.5, 21.5, 22.5, 23.5, 24.5, 25.5,
+ 26.5, 27.5, 28.5, 29.5, 30.5, 31.5, 32.5, 33.5,
+ 34.5, 35.5, 36.5, 37.5, 38.5, 39.5, 40.5, 41.5,
+ 42.5, 43.5, 44.5, 45.5, 46.5, 47.5, 48.5, 49.5,
+ 50.5, 51.5, 52.5, 53.5, 54.5, 55.5, 56.5, 57.5,
+ 58.5, 59.5, 60.5, 61.5, 62.5, 63.5, 64.5, 65.5,
+ 66.5, 67.5, 68.5, 69.5, 70.5, 71.5, 72.5, 73.5,
+ 74.5, 75.5, 76.5, 77.5, 78.5, 79.5, 80.5, 81.5,
+ 82.5, 83.5, 84.5, 85.5, 86.5, 87.5, 88.5, 89.5,
+ 90.5, 91.5, 92.5, 93.5, 94.5, 95.5, 96.5, 97.5,
+ 98.5, 99.5, 100.5, 101.5, 102.5, 103.5, 104.5, 105.5,
+ 106.5, 107.5, 108.5, 109.5, 110.5, 111.5, 112.5, 113.5,
+ 114.5, 115.5, 116.5, 117.5, 118.5, 119.5, 120.5, 121.5,
+ 122.5, 123.5, 124.5, 125.5, 126.5, 127.5, 128.5, 129.5,
+ 130.5, 131.5, 132.5, 133.5, 134.5, 135.5, 136.5, 137.5,
+ 138.5, 139.5, 140.5, 141.5, 142.5, 143.5, 144.5, 145.5,
+ 146.5, 147.5, 148.5, 149.5,
};
static long _vq_quantmap_res0_128_128_5[] = {
- 54, 53, 52, 51, 50, 49, 48, 47,
- 46, 45, 44, 43, 42, 41, 40, 39,
- 38, 37, 36, 35, 34, 33, 32, 31,
- 30, 29, 28, 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,
+ 299, 297, 295, 293, 291, 289, 287, 285,
+ 283, 281, 279, 277, 275, 273, 271, 269,
+ 267, 265, 263, 261, 259, 257, 255, 253,
+ 251, 249, 247, 245, 243, 241, 239, 237,
+ 235, 233, 231, 229, 227, 225, 223, 221,
+ 219, 217, 215, 213, 211, 209, 207, 205,
+ 203, 201, 199, 197, 195, 193, 191, 189,
+ 187, 185, 183, 181, 179, 177, 175, 173,
+ 171, 169, 167, 165, 163, 161, 159, 157,
+ 155, 153, 151, 149, 147, 145, 143, 141,
+ 139, 137, 135, 133, 131, 129, 127, 125,
+ 123, 121, 119, 117, 115, 113, 111, 109,
+ 107, 105, 103, 101, 99, 97, 95, 93,
+ 91, 89, 87, 85, 83, 81, 79, 77,
+ 75, 73, 71, 69, 67, 65, 63, 61,
+ 59, 57, 55, 53, 51, 49, 47, 45,
+ 43, 41, 39, 37, 35, 33, 31, 29,
+ 27, 25, 23, 21, 19, 17, 15, 13,
+ 11, 9, 7, 5, 3, 1, 0, 2,
+ 4, 6, 8, 10, 12, 14, 16, 18,
+ 20, 22, 24, 26, 28, 30, 32, 34,
+ 36, 38, 40, 42, 44, 46, 48, 50,
+ 52, 54, 56, 58, 60, 62, 64, 66,
+ 68, 70, 72, 74, 76, 78, 80, 82,
+ 84, 86, 88, 90, 92, 94, 96, 98,
+ 100, 102, 104, 106, 108, 110, 112, 114,
+ 116, 118, 120, 122, 124, 126, 128, 130,
+ 132, 134, 136, 138, 140, 142, 144, 146,
+ 148, 150, 152, 154, 156, 158, 160, 162,
+ 164, 166, 168, 170, 172, 174, 176, 178,
+ 180, 182, 184, 186, 188, 190, 192, 194,
+ 196, 198, 200, 202, 204, 206, 208, 210,
+ 212, 214, 216, 218, 220, 222, 224, 226,
+ 228, 230, 232, 234, 236, 238, 240, 242,
+ 244, 246, 248, 250, 252, 254, 256, 258,
+ 260, 262, 264, 266, 268, 270, 272, 274,
+ 276, 278, 280, 282, 284, 286, 288, 290,
+ 292, 294, 296, 298, 300,
};
static encode_aux_threshmatch _vq_auxt_res0_128_128_5 = {
_vq_quantthresh_res0_128_128_5,
_vq_quantmap_res0_128_128_5,
- 55,
- 55
+ 301,
+ 301
};
static static_codebook _vq_book_res0_128_128_5 = {
- 1, 55,
+ 1, 301,
_vq_lengthlist_res0_128_128_5,
- 1, -522616832, 1611661312, 8, 0,
+ 1, -520962048, 1611661312, 9, 0,
_vq_quantlist_res0_128_128_5,
NULL,
&_vq_auxt_res0_128_128_5,
1.2.2.1 +15 -4 vorbis/lib/books/res0_128_128aux.vqh
Index: res0_128_128aux.vqh
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/books/res0_128_128aux.vqh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- res0_128_128aux.vqh 2000/11/17 11:47:21 1.2
+++ res0_128_128aux.vqh 2001/01/09 19:13:19 1.2.2.1
@@ -20,13 +20,24 @@
#include "codebook.h"
static long _huff_lengthlist_res0_128_128aux[] = {
- 4, 9,11,11,14,15, 3, 2, 6, 9,14,15, 6, 6, 8,10,
- 14,15, 7, 7, 9, 9,11,15, 8, 3, 6, 8,11,13, 6, 2,
- 4, 7,11,14,
+ 13,16,16,15,15,15,14,11,12,15,15,15,11,11,12,15,
+ 15,15,10,15,15,15,15,15,14,15,15,15,15,15,15,15,
+ 15,15,15,15, 8, 9,14,14,15,15, 5, 3, 6,14,15,15,
+ 8, 4, 7,15,15,15,11,11,13,14,15,15,15,13,14,15,
+ 15,15,15,14,14,15,15,15, 8, 9,10,10,15,15, 5, 4,
+ 7,12,15,15, 7, 5, 7,10,15,15,11,10, 9,10,13,15,
+ 14,15,15,15,15,15,15,15,15,15,15,15,10,10,12,13,
+ 15,15, 8, 6, 7,11,14,14, 8, 5, 6, 9,11,14,12, 7,
+ 6, 6,10,12,12, 9,10, 9,11,12,15,12,11,10,12,14,
+ 13,13,14,15,15,15,12, 4, 5,10,13,15,11, 4, 4, 7,
+ 12,14,13, 6, 6, 6,10,12,13, 9, 8, 7, 9,13,15,12,
+ 10, 9,11,13,13,14,15,15,15,15,13, 5, 6,10,15,15,
+ 12, 5, 5, 8,13,14,15, 7, 7, 7,10,13,15,10, 9, 8,
+ 10,13,15,12,10,10,12,14,
};
static static_codebook _huff_book_res0_128_128aux = {
- 2, 36,
+ 3, 216,
_huff_lengthlist_res0_128_128aux,
0, 0, 0, 0, 0,
NULL,
No revision
No revision
1.1.2.1 +201 -0 vorbis/lib/books/Attic/Makefile
1.1.2.1 +201 -0 vorbis/lib/books/Attic/Makefile.in
1.1.2.1 +123 -0 vorbis/lib/books/Attic/lsp9_0.vqh
1.1.2.1 +881 -0 vorbis/lib/books/Attic/lsp9_1.vqh
No revision
No revision
1.7.2.2 +150 -133 vorbis/lib/modes/mode_A.h
Index: mode_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_A.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- mode_A.h 2000/12/27 23:46:38 1.7.2.1
+++ mode_A.h 2001/01/09 19:13:23 1.7.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.7.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.7.2.2 2001/01/09 19:13:23 xiphmont Exp $
********************************************************************/
@@ -23,8 +23,10 @@
#include "vorbis/codec.h"
#include "backends.h"
-#include "books/lsp12_0.vqh"
+#include "books/lsp9_0.vqh"
#include "books/lsp30_0.vqh"
+#include "books/lsp9_1.vqh"
+#include "books/lsp30_1.vqh"
#include "books/res0_128_128aux.vqh"
#include "books/res0_128_1024aux.vqh"
@@ -59,76 +61,77 @@
/* 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 */
- 2, /* nearDCp */
- -40.f, /* nearDCdB */
-
- 1,/* tonemaskp */
+ 1,/* tonemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
- {{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
- {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
+ {
+ {-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*/
+
{-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
{-30.,-35.,-35.,-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.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
- {-30.,-30.,-35.,-37.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
- {-20.,-25.,-30.,-35.,-35.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
- {-20.,-25.,-30.,-33.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*11500*/
- {-20.,-24.,-26.,-32.,-35.,-45.,-55.,-65.,-75.,-90.,-100.}, /*16000*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*16000*/
},
1,/* peakattp */
- {{-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*63*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*88*/
- {-14.,-16.,-18.,-19.,-20.,-21.,-22.,-22.,-28.,-28.,-28.}, /*125*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*175*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*250*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-18.,-28.,-28.,-28.}, /*350*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-28.,-28.,-28.,-28.}, /*500*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*700*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*1400*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*2400*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*4000*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-18.,-20.}, /*5600*/
- { -7., -8., -9.,-10.,-10.,-11.,-12.,-13.,-15.,-16.,-17.}, /*8000*/
- { -6., -7., -9., -9., -9., -9.,-10.,-11.,-12.,-13.,-14.}, /*11500*/
- { -6., -6., -9., -9., -9., -9., -9., -9.,-10.,-11.,-12.}, /*16000*/
+ {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-22.f,-22.f,-22.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*175*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*250*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*350*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-22.f,-22.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-22.f,-22.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*/
},
1,/*noisemaskp */
- -40.f, /* noisemaxsupp */
- .5, /* low window */
- .5, /* high window */
+ -10.f, /* suppress any noise curve over maxspec+n */
+ .5f, /* low window */
+ .5f, /* high window */
5,
5,
- {.000, /*63*/
- .000, /*88*/
- .000, /*125*/
- .000, /*175*/
- .000, /*250*/
- .000, /*350*/
- .000, /*500*/
- .500, /*700*/
- .600, /*1000*/
- .600, /*1400*/
- .500, /*2000*/
- .500, /*2800*/
- .750, /*4000*/
- .850, /*5600*/
- .900, /*8000*/
- .900, /*11500*/
- .950, /*16000*/
+ {.000f, /*63*/
+ .000f, /*88*/
+ .000f, /*125*/
+ .000f, /*175*/
+ .000f, /*250*/
+ .000f, /*350*/
+ .000f, /*500*/
+ .300f, /*700*/
+ .500f, /*1000*/
+ .500f, /*1400*/
+ .500f, /*2000*/
+ .500f, /*2800*/
+ .600f, /*4000*/
+ .700f, /*5600*/
+ .800f, /*8000*/
+ .800f, /*11500*/
+ .900f, /*16000*/
},
- 100.,
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ -22.,
-0., -.004 /* attack/decay control */
};
@@ -145,101 +148,113 @@
/* 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, /* nearDCp */
- -40.f, /* nearDCdB */
-
- 1,/* tonemaskp */
+ 1,/* tonemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
- {{-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*63*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*88*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*125*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*175*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*250*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*350*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*500*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*700*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*1000*/
- {-30.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*/
- {-30.f,-35.f,-35.f,-40.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*4000*/
- {-30.f,-30.f,-35.f,-37.f,-40.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*5600*/
- {-20.f,-25.f,-30.f,-35.f,-35.f,-50.f,-60.f,-70.f,-80.f,-90.f,-100.f}, /*8000*/
- {-20.f,-25.f,-30.f,-33.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f,-100.f}, /*11500*/
- {-20.f,-24.f,-26.f,-32.f,-35.f,-45.f,-55.f,-65.f,-75.f,-90.f,-100.f}, /*16000*/
+ {
+ {-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*/
+ // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*175*/
+ // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*250*/
+ // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*350*/
+ // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*500*/
+ // {-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-99.,-100.}, /*700*/
+
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*63*/
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*88*/
+ // {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*125*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*175*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*250*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*350*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*500*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*700*/
+
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*1000*/
+ {-30.,-35.,-35.,-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.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*4000*/
+ {-30.,-35.,-35.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*5600*/
+ {-30.,-30.,-30.,-40.,-40.,-50.,-60.,-70.,-80.,-90.,-100.}, /*8000*/
+ {-30.,-30.,-30.,-35.,-40.,-40.,-60.,-70.,-80.,-90.,-100.}, /*11500*/
+ {-30.,-30.,-30.,-35.,-35.,-45.,-50.,-50.,-70.,-80.,-90.}, /*16000*/
},
1,/* peakattp */
- {{-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f},
- {-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f,-30.f}},
-
- 1, /* noisemaskp */
- -40.f, /* noisemaxsupp */
- .5, /* low window */
- .5, /* high window */
+ {{-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*63*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*88*/
+ {-14.f,-16.f,-18.f,-19.f,-20.f,-21.f,-22.f,-22.f,-24.f,-24.f,-24.f},/*125*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*175*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-24.f,-24.f,-24.f},/*250*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*350*/
+ {-10.f,-10.f,-10.f,-10.f,-16.f,-16.f,-18.f,-20.f,-22.f,-24.f,-24.f},/*500*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-24.f},/*700*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-14.f,-20.f,-22.f,-24.f,-24.f},/*1000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*1400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2000*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*2400*/
+ {-10.f,-10.f,-10.f,-10.f,-14.f,-14.f,-16.f,-20.f,-22.f,-24.f,-24.f},/*4000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-24.f,-24.f},/*5600*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-12.f,-13.f,-22.f,-24.f,-24.f},/*8000*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-11.f,-22.f,-23.f,-24.f},/*11500*/
+ {-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-10.f,-20.f,-21.f,-24.f},/*16000*/
+ },
+
+ 1,/*noisemaskp */
+ -30.f, /* suppress any noise curve over maxspec+n */
+ .5f, /* low window */
+ .5f, /* high window */
25,
25,
- {.000, /*63*/
- .000, /*88*/
- .000, /*125*/
- .000, /*175*/
- .000, /*250*/
- .000, /*350*/
- .000, /*500*/
- .500, /*700*/
- .600, /*1000*/
- .600, /*1400*/
- .500, /*2000*/
- .500, /*2800*/
- .750, /*4000*/
- .850, /*5600*/
- .900, /*8000*/
- .900, /*11500*/
- .950, /*16000*/
+ {.000f, /*63*/
+ .000f, /*88*/
+ .000f, /*125*/
+ .000f, /*175*/
+ .000f, /*250*/
+ .000f, /*350*/
+ .000f, /*500*/
+ .200f, /*700*/
+ .300f, /*1000*/
+ .400f, /*1400*/
+ .400f, /*2000*/
+ .400f, /*2800*/
+ .600f, /*4000*/
+ .750f, /*5600*/
+ .850f, /*8000*/
+ .900f, /*11500*/
+ .950f, /*16000*/
},
- 100.f,
+ 95.f, /* even decade + 5 is important; saves an rint() later in a
+ tight loop) */
+ -28.,
-0.f, -.004f /* attack/decay control */
};
/* with GNUisms, this could be short and readable. Oh well */
static vorbis_info_time0 _time_set0A={0};
-static vorbis_info_floor0 _floor_set0A={12, 44100, 64, 12,150, 1, {0} };
-static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 1, {1} };
-static vorbis_info_residue0 _residue_set0A={0,128, 32,6,2,
+static vorbis_info_floor0 _floor_set0A={9, 44100, 64, 10,130, 2, {0,1},
+ 0.246f, .392f};
+static vorbis_info_floor0 _floor_set1A={30, 44100, 256, 12,150, 2, {2,3},
+ .086f, .126f};
+static vorbis_info_residue0 _residue_set0A={0,96,16,6,4,
{0,1,1,1,1,1},
- {4,5,6,7,8},
+ {6,7,8,9,10},
{0,99999,9999,9999,9999},
- {99.f,1.5f,2.5f,6.5f,12.5f},
- {5,5,5,5,5},
+ {99.f,1.5f,4.f,12.5f,22.f},
+ {4,4,4,4,4},
{99,99,99,99,99}};
-static vorbis_info_residue0 _residue_set1A={0,1024, 32,10,3,
+static vorbis_info_residue0 _residue_set1A={0,1024, 32,10,5,
{0,1,1,1,1,1,1,1,1,1},
- {9,10,11,12,13,14,15,16,17},
+ {11,12,13,14,15,16,17,18,19},
- {0,8,9999,17,9999,
- 28,9999,9999,9999},
+ {0,8,9999,16,9999,
+ 24,9999,9999,9999},
{99.f,1.5f,1.5f,2.5f,2.5f,
- 4.f,4.f,6.5f,12.5f},
+ 6.5f,6.5f,12.5f,22.f},
{5,5,5,5,5,5,5,5,5},
{99,99,99,99,99,99,99,99,99}};
@@ -254,7 +269,7 @@
/* smallblock, largeblock */
{256, 2048},
/* modes,maps,times,floors,residues,books,psys */
- 2, 2, 1, 2, 2, 18, 2,
+ 2, 2, 1, 2, 2, 20, 2,
/* modes */
{&_mode_set0A,&_mode_set1A},
/* maps */
@@ -266,8 +281,10 @@
/* residue */
{0,0},{&_residue_set0A,&_residue_set1A},
/* books */
- {&_vq_book_lsp12_0, /* 0 */
- &_vq_book_lsp30_0, /* 1 */
+ {&_vq_book_lsp9_0, /* 0 */
+ &_vq_book_lsp9_1, /* 1 */
+ &_vq_book_lsp30_0, /* 2 */
+ &_vq_book_lsp30_1, /* 3 */
&_huff_book_res0_128_128aux,
&_huff_book_res0_128_1024aux,
@@ -292,7 +309,7 @@
/* psy */
{&_psy_set_A0,&_psy_set_A},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 32.f, -32.f, -96.f
+ 256, 30.f, -30.f, -96.f
};
#define PREDEF_INFO_MAX 0
1.3.2.2 +5 -3 vorbis/lib/modes/mode_AA.h
Index: mode_AA.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_AA.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- mode_AA.h 2000/12/27 23:46:38 1.3.2.1
+++ mode_AA.h 2001/01/09 19:13:23 1.3.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.3.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_AA.h,v 1.3.2.2 2001/01/09 19:13:23 xiphmont Exp $
********************************************************************/
@@ -47,7 +47,6 @@
static vorbis_info_psy _psy_set_AA0={
1,/*athp*/
1,/*decayp*/
- 1,/*smoothp*/
-100.,
-140.,
@@ -100,6 +99,7 @@
},
1,/*noisemaskp */
+ 0.,
.5, /* low window */
.5, /* high window */
15,
@@ -124,6 +124,7 @@
},
95.,
+ -32.,
-0., -.004 /* attack/decay control */
};
@@ -131,7 +132,6 @@
static vorbis_info_psy _psy_set_AA={
1,/*athp*/
1,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -184,6 +184,7 @@
},
1,/*noisemaskp */
+ 0.,
.5, /* low window */
.5, /* high window */
25,
@@ -208,6 +209,7 @@
},
95.f,
+ -32.,
-0.f, -.004f /* attack/decay control */
};
1.6.2.2 +3 -2 vorbis/lib/modes/mode_B.h
Index: mode_B.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_B.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- mode_B.h 2000/12/27 23:46:38 1.6.2.1
+++ mode_B.h 2001/01/09 19:13:23 1.6.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.6.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.6.2.2 2001/01/09 19:13:23 xiphmont Exp $
********************************************************************/
@@ -48,7 +48,6 @@
static vorbis_info_psy _psy_set_B={
1,/*athp*/
1,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -101,6 +100,7 @@
},
1,/*noisemaskp */
+ 0.,
.5, /* low window */
.5, /* high window */
25,
@@ -125,6 +125,7 @@
},
110.f,
+ -32.,
-3.f, -.004f /* attack/decay control */
};
1.6.2.2 +5 -3 vorbis/lib/modes/mode_C.h
Index: mode_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_C.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- mode_C.h 2000/12/27 23:46:38 1.6.2.1
+++ mode_C.h 2001/01/09 19:13:24 1.6.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.6.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.6.2.2 2001/01/09 19:13:24 xiphmont Exp $
********************************************************************/
@@ -44,7 +44,6 @@
static vorbis_info_psy _psy_set_C0={
1,/*athp*/
0,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -97,6 +96,7 @@
},
1,/*noisemaskp */
+ 0.,
.5, /* low window */
.5, /* high window */
25,
@@ -121,6 +121,7 @@
},
100.f,
+ -40.,
-6.f, -.006f /* attack/decay control */
};
@@ -128,7 +129,6 @@
static vorbis_info_psy _psy_set_C1={
1,/*athp*/
0,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -181,6 +181,7 @@
},
1,/*noisemaskp */
+ 0.,
.5, /* low window */
.5, /* high window */
25,
@@ -204,6 +205,7 @@
.900, /*16000*/
},
110.f,
+ -40.,
-6.f, -.006f /* attack/decay control */
};
1.7.2.2 +5 -3 vorbis/lib/modes/mode_D.h
Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- mode_D.h 2000/12/27 23:46:38 1.7.2.1
+++ mode_D.h 2001/01/09 19:13:24 1.7.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.7.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.7.2.2 2001/01/09 19:13:24 xiphmont Exp $
********************************************************************/
@@ -46,7 +46,6 @@
static vorbis_info_psy _psy_set_D0 ={
1,/*athp*/
0,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -83,6 +82,7 @@
0,/*noisemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
+ 0.,
.5,
.5,
25,
@@ -90,13 +90,13 @@
{0},
110.f,
+ -40.,
-0.f, -.004f /* attack/decay control */
};
static vorbis_info_psy _psy_set_D1 ={
1,/*athp*/
0,/*decayp*/
- 1,/*smoothp*/
-100.f,
-140.f,
@@ -150,6 +150,7 @@
0,/*noisemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
+ 0.,
.5,
.5,
25,
@@ -157,6 +158,7 @@
{0},
110.f,
+ -40.,
-0.f, -.004f /* attack/decay control */
};
1.4.2.2 +3 -2 vorbis/lib/modes/mode_E.h
Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- mode_E.h 2000/12/27 23:46:38 1.4.2.1
+++ mode_E.h 2001/01/09 19:13:24 1.4.2.2
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.4.2.1 2000/12/27 23:46:38 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.4.2.2 2001/01/09 19:13:24 xiphmont Exp $
********************************************************************/
@@ -46,7 +46,6 @@
static vorbis_info_psy _psy_set_E ={
1,/*athp*/
0,/*decayp*/
- 1,/*smoothp*/
-140.f,
-180.f,
@@ -83,6 +82,7 @@
0,/*noisemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
+ 0.,
.5,
.5,
25,
@@ -90,6 +90,7 @@
{0},
110.f,
+ -42.,
-0.f, -.004f /* attack/decay control */
};
No revision
No revision
1.20.2.1 +15 -16 vorbis/vq/bookutil.c
Index: bookutil.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/bookutil.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- bookutil.c 2000/12/21 21:04:49 1.20
+++ bookutil.c 2001/01/09 19:13:26 1.20.2.1
@@ -12,7 +12,7 @@
********************************************************************
function: utility functions for loading .vqh and .vqd files
- last mod: $Id: bookutil.c,v 1.20 2000/12/21 21:04:49 xiphmont Exp $
+ last mod: $Id: bookutil.c,v 1.20.2.1 2001/01/09 19:13:26 xiphmont Exp $
********************************************************************/
@@ -536,21 +536,20 @@
/* save the book in C header form */
fprintf(out,
- "/********************************************************************\n"
- " * *\n"
- " * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *\n"
- " * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *\n"
- " * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *\n"
- " * PLEASE READ THESE TERMS DISTRIBUTING. *\n"
- " * *\n"
- " * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 *\n"
- " * by 1999 Monty <monty at xiph.org> and The XIPHOPHORUS Company *\n"
- " * http://www.xiph.org/ *\n"
- " * *\n"
- " ********************************************************************\n"
- "\n"
- " function: static codebook autogenerated by vq/somethingorother\n"
- "\n"
+ "/********************************************************************\n"
+ " * *\n"
+ " * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *\n"
+ " * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *\n"
+ " * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *\n"
+ " * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *\n"
+ " * *\n"
+ " * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 *\n"
+ " * by the XIPHOPHORUS Company, http://www.xiph.org/ *\n"
+ " * *\n"
+ " ********************************************************************\n"
+ "\n"
+ " function: static codebook autogenerated by vq/somethingorother\n"
+ "\n"
" ********************************************************************/\n\n");
fprintf(out,"#ifndef _V_%s_VQH_\n#define _V_%s_VQH_\n",name,name);
1.8.2.1 +17 -11 vorbis/vq/latticebuild.c
Index: latticebuild.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/vq/latticebuild.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- latticebuild.c 2000/11/08 03:23:23 1.8
+++ latticebuild.c 2001/01/09 19:13:26 1.8.2.1
@@ -12,7 +12,7 @@
********************************************************************
function: utility main for building codebooks from lattice descriptions
- last mod: $Id: latticebuild.c,v 1.8 2000/11/08 03:23:23 xiphmont Exp $
+ last mod: $Id: latticebuild.c,v 1.8.2.1 2001/01/09 19:13:26 xiphmont Exp $
********************************************************************/
@@ -57,7 +57,7 @@
int main(int argc,char *argv[]){
codebook b;
static_codebook c;
- float *quantlist;
+ double *quantlist;
long *hits;
int entries=-1,dim=-1,quantvals=-1,addmul=-1,sequencep=0;
@@ -98,7 +98,7 @@
line=get_line(in);
if(sscanf(line,"%d %d %d %d",&quantvals,&dim,&addmul,&sequencep)!=4){
if(sscanf(line,"%d %d %d",&quantvals,&dim,&addmul)!=3){
- fprintf(stderr,"Syntax error reading book file (line 1)\n");
+ fprintf(stderr,"Syntax error reading description file (line 1)\n");
exit(1);
}
}
@@ -110,24 +110,29 @@
c.q_sequencep=sequencep;
c.quantlist=_ogg_calloc(quantvals,sizeof(long));
- quantlist=_ogg_malloc(sizeof(long)*c.dim*c.entries);
+ quantlist=_ogg_malloc(sizeof(double)*c.dim*c.entries);
hits=_ogg_malloc(c.entries*sizeof(long));
for(j=0;j<entries;j++)hits[j]=1;
for(j=0;j<entries;j++)c.lengthlist[j]=1;
reset_next_value();
- setup_line(in);
- for(j=0;j<quantvals;j++){
- if(get_line_value(in,quantlist+j)==-1){
+ line=setup_line(in);
+ for(j=0;j<quantvals;j++){
+ char *temp;
+ if(!line || sscanf(line,"%lf",quantlist+j)!=1){
fprintf(stderr,"Ran out of data on line 2 of description file\n");
exit(1);
}
+ temp=strchr(line,',');
+ if(!temp)temp=strchr(line,' ');
+ if(temp)temp++;
+ line=temp;
}
/* gen a real quant list from the more easily human-grokked input */
{
- float min=quantlist[0];
- float mindel=-1;
+ double min=quantlist[0];
+ double mindel=-1;
int fac=1;
for(j=1;j<quantvals;j++)if(quantlist[j]<min)min=quantlist[j];
for(j=0;j<quantvals;j++)
@@ -138,9 +143,10 @@
j=0;
while(j<quantvals){
for(j=0;j<quantvals;j++){
- float test=(quantlist[j]-min)/(mindel/fac);
- if( fabs(rint(test)-test)>.000001) break;
+ double test=fac*(quantlist[j]-min)/mindel;
+ if( fabs(rint(test)-test)>.00001f) break;
}
+ if(fac>100)break;
if(j<quantvals)fac++;
}
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list