diff options
| author | Monty <xiphmont@xiph.org> | 1999-12-30 07:27:06 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 1999-12-30 07:27:06 +0000 |
| commit | 685d0681535cf41a80023e30ebb00be4aa76d4be (patch) | |
| tree | 8115c4d8a10d2ecc132a61b8e502b41fe8f44652 | |
| parent | 05f29765bfb3ace521b77cc9e31705eb0b5dffc0 (diff) | |
| download | libvorbis-git-685d0681535cf41a80023e30ebb00be4aa76d4be.tar.gz | |
Minor build fixes, integrate XMMS into the autoconfed stuff
Extend copyright notices to 2000
Add RCS Id tags to all files
Monty
svn path=/trunk/vorbis/; revision=218
44 files changed, 185 insertions, 193 deletions
diff --git a/Makefile.in b/Makefile.in index 8e3a0669..9dd4b1d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # vorbis makefile configured for use with gcc on any platform -# $Id: Makefile.in,v 1.3 1999/12/30 03:46:16 xiphmont Exp $ +# $Id: Makefile.in,v 1.4 1999/12/30 07:26:22 xiphmont Exp $ ############################################################################### # # @@ -17,7 +17,11 @@ @SET_MAKE@ -SUBDIRS = lib examples #cmdline +SUBDIRS = lib vq examples # cmdline xmms all debug profile selftest target clean: @for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $(MFLAGS) $@) || exit 1; done + -rm -f *~ + +distclean: clean + -rm -f Makefile config.* @@ -1929,7 +1929,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -2018,7 +2018,7 @@ EOF cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile"} +CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index dc3c3f61..ce579a30 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.7 1999/12/30 03:46:18 xiphmont Exp $ +# $Id: configure.in,v 1.8 1999/12/30 07:26:25 xiphmont Exp $ AC_INIT(lib/mdct.c) #AC_CONFIG_HEADER(config.h) @@ -184,4 +184,4 @@ AC_SUBST(RANLIB) #AC_SUBST(LIBGTKDIR) AC_SUBST(pthread_lib) -AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile) +AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile) diff --git a/examples/chaining_example.c b/examples/chaining_example.c index 92998803..d15167a0 100644 --- a/examples/chaining_example.c +++ b/examples/chaining_example.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: illustrate simple use of chained bitstream and vorbisfile.a - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 02 1999 + last mod: $Id: chaining_example.c,v 1.2 1999/12/30 07:26:26 xiphmont Exp $ ********************************************************************/ diff --git a/examples/decoder_example.c b/examples/decoder_example.c index 8cd8bc83..cd41e721 100644 --- a/examples/decoder_example.c +++ b/examples/decoder_example.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: simple example decoder - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: decoder_example.c,v 1.2 1999/12/30 07:26:27 xiphmont Exp $ ********************************************************************/ diff --git a/examples/encoder_example.c b/examples/encoder_example.c index c84cd83b..3a7a7305 100644 --- a/examples/encoder_example.c +++ b/examples/encoder_example.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: simple example encoder - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: encoder_example.c,v 1.2 1999/12/30 07:26:28 xiphmont Exp $ ********************************************************************/ diff --git a/include/codec.h b/include/codec.h index 49fef7a4..4874d906 100644 --- a/include/codec.h +++ b/include/codec.h @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** - function: codec headers - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 29 1999 + function: libvorbis codec headers + last mod: $Id: codec.h,v 1.2 1999/12/30 07:26:29 xiphmont Exp $ ********************************************************************/ diff --git a/include/vorbisfile.h b/include/vorbisfile.h index 6e9d5b5a..27794e94 100644 --- a/include/vorbisfile.h +++ b/include/vorbisfile.h @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 04 1999 + last mod: $Id: vorbisfile.h,v 1.2 1999/12/30 07:26:30 xiphmont Exp $ ********************************************************************/ diff --git a/lib/Makefile.in b/lib/Makefile.in index 4c2af962..4d3971b2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,6 +1,6 @@ # vorbis makefile configured for use with gcc on any platform -# $Id: Makefile.in,v 1.16 1999/12/30 03:46:19 xiphmont Exp $ +# $Id: Makefile.in,v 1.17 1999/12/30 07:26:31 xiphmont Exp $ ############################################################################### # # @@ -75,5 +75,5 @@ clean: -rm -f *.o *.a test* *~ *.out ogg config.* tone distclean: clean - -rf -f Makefile + -rm -f Makefile diff --git a/lib/analysis.c b/lib/analysis.c index 1de59990..31adfb9f 100644 --- a/lib/analysis.c +++ b/lib/analysis.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: single-block PCM analysis - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: analysis.c,v 1.18 1999/12/30 07:26:32 xiphmont Exp $ ********************************************************************/ diff --git a/lib/bitwise.c b/lib/bitwise.c index 2b8f87ae..20cccd91 100644 --- a/lib/bitwise.c +++ b/lib/bitwise.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: packing variable sized words into an octet stream - author: Monty <monty@xiph.org> - modifications by: Monty - last modification date: Aug 04 1999 + last mod: $Id: bitwise.c,v 1.5 1999/12/30 07:26:33 xiphmont Exp $ ********************************************************************/ diff --git a/lib/bitwise.h b/lib/bitwise.h index c614946d..0e56e939 100644 --- a/lib/bitwise.h +++ b/lib/bitwise.h @@ -5,13 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: packing variable sized words into an octet stream + last mod: $Id: bitwise.h,v 1.3 1999/12/30 07:26:34 xiphmont Exp $ ********************************************************************/ diff --git a/lib/block.c b/lib/block.c index a3b5f9fe..1d3320c7 100644 --- a/lib/block.c +++ b/lib/block.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: PCM data vector blocking, windowing and dis/reassembly - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 22 1999 + last mod: $Id: block.c,v 1.18 1999/12/30 07:26:35 xiphmont Exp $ Handle windowing, overlap-add, etc of the PCM vectors. This is made more amusing by Vorbis' current two allowed block sizes. diff --git a/lib/envelope.c b/lib/envelope.c index ffcc2374..cbc08609 100644 --- a/lib/envelope.c +++ b/lib/envelope.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: PCM data envelope analysis and manipulation - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 22 1999 + last mod: $Id: envelope.c,v 1.12 1999/12/30 07:26:36 xiphmont Exp $ Preecho calculation. diff --git a/lib/envelope.h b/lib/envelope.h index d0b885be..79840ea3 100644 --- a/lib/envelope.h +++ b/lib/envelope.h @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: PCM data envelope analysis and manipulation - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 22 1999 + last mod: $Id: envelope.h,v 1.7 1999/12/30 07:26:37 xiphmont Exp $ ********************************************************************/ diff --git a/lib/framing.c b/lib/framing.c index af355732..46c0a9ec 100644 --- a/lib/framing.c +++ b/lib/framing.c @@ -5,21 +5,19 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and the XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and the XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: code raw [Vorbis] packets into framed OggSquish stream and decode Ogg streams back into raw packets - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Jul 22 1999 + last mod: $Id: framing.c,v 1.12 1999/12/30 07:26:38 xiphmont Exp $ note: The CRC code is directly derived from public domain code by - Ross Williams (ross@guest.adelaide.edu.au). See framing.txt for - details. + Ross Williams (ross@guest.adelaide.edu.au). See docs/framing.html + for details. ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: maintain the info structure, info <-> header packets - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 04 1999 + last mod: $Id: info.c,v 1.11 1999/12/30 07:26:39 xiphmont Exp $ ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: LPC low level routines - author: Monty <monty@xiph.org> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: lpc.c,v 1.10 1999/12/30 07:26:40 xiphmont Exp $ ********************************************************************/ @@ -5,13 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: LPC low level routines + last mod: $Id: lpc.h,v 1.5 1999/12/30 07:26:41 xiphmont Exp $ ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: LSP (also called LSF) conversion routines - author: Monty <monty@xiph.org> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: lsp.c,v 1.4 1999/12/30 07:26:42 xiphmont Exp $ The LSP generation code is taken (with minimal modification) from "On the Computation of the LSP Frequencies" by Joseph Rothweiler @@ -5,12 +5,18 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * + ******************************************************************** + + function: LSP (also called LSF) conversion routines + last mod: $Id: lsp.h,v 1.3 1999/12/30 07:26:43 xiphmont Exp $ + ********************************************************************/ + #ifndef _V_LSP_H_ #define _V_LSP_H_ @@ -5,18 +5,15 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: modified discrete cosine transform power of two length transform only [16 <= n ] - - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 10 1999 + last mod: $Id: mdct.c,v 1.13 1999/12/30 07:26:44 xiphmont Exp $ Algorithm adapted from _The use of multirate filter banks for coding of high quality digital audio_, by T. Sporer, K. Brandenburg and @@ -5,13 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: modified discrete cosine transform prototypes + last mod: $Id: mdct.h,v 1.8 1999/12/30 07:26:45 xiphmont Exp $ ********************************************************************/ @@ -5,13 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** - function: #ifdef jail to whip a few platforms into the UNIX ideal. + function: #ifdef jail to whip a few platforms into the UNIX ideal. + last mod: $Id: os.h,v 1.2 1999/12/30 07:26:46 xiphmont Exp $ ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: random psychoacoustics (not including preecho) - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 15 1999 + last mod: $Id: psy.c,v 1.7 1999/12/30 07:26:47 xiphmont Exp $ ********************************************************************/ @@ -5,14 +5,15 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: random psychoacoustics (not including preecho) - + last mod: $Id: psy.h,v 1.4 1999/12/30 07:26:48 xiphmont Exp $ + ********************************************************************/ #ifndef _V_PSY_H_ diff --git a/lib/smallft.c b/lib/smallft.c index cd423758..278948a9 100644 --- a/lib/smallft.c +++ b/lib/smallft.c @@ -1,8 +1,22 @@ -/****************************************************************** - * CopyPolicy: GNU Public License 2 applies - * Copyright (C) 1998 Monty xiphmont@mit.edu, monty@xiph.org - * - * FFT implementation from OggSquish, minus cosine transforms, +/******************************************************************** + * * + * THIS FILE IS PART OF THE Ogg Vorbis 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * http://www.xiph.org/ * + * * + ******************************************************************** + + function: fft transform + last mod: $Id: smallft.c,v 1.6 1999/12/30 07:26:49 xiphmont Exp $ + +********************************************************************/ + +/* FFT implementation from OggSquish, minus cosine transforms, * minus all but radix 2/4 case. In Vorbis we only need this * cut-down version. * @@ -13,8 +27,7 @@ * packing following R_0, I_n, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1, * it follows R_0, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1, I_n like the * FORTRAN version - * - ******************************************************************/ + */ #include <stdlib.h> #include <string.h> diff --git a/lib/smallft.h b/lib/smallft.h index b6ca5445..2142f868 100644 --- a/lib/smallft.h +++ b/lib/smallft.h @@ -1,10 +1,20 @@ -/****************************************************************** - * CopyPolicy: GNU Public License 2 applies - * Copyright (C) 1998-1999 Monty xiphmont@mit.edu, monty@xiph.org - * - * Stripped down FFT implementation from OggSquish. - * - ******************************************************************/ +/******************************************************************** + * * + * THIS FILE IS PART OF THE Ogg Vorbis 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 OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * http://www.xiph.org/ * + * * + ******************************************************************** + + function: fft transform + last mod: $Id: smallft.h,v 1.4 1999/12/30 07:26:50 xiphmont Exp $ + +********************************************************************/ #ifndef _V_SMFT_H_ #define _V_SMFT_H_ diff --git a/lib/spectrum.c b/lib/spectrum.c index 91f0bfa9..d0eb5b01 100644 --- a/lib/spectrum.c +++ b/lib/spectrum.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: spectrum envelope and residue code/decode - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: spectrum.c,v 1.7 1999/12/30 07:26:51 xiphmont Exp $ ********************************************************************/ diff --git a/lib/spectrum.h b/lib/spectrum.h index a602062c..39a611cd 100644 --- a/lib/spectrum.h +++ b/lib/spectrum.h @@ -5,10 +5,15 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * + ******************************************************************** + + function: spectrum envelope and residue code/decode + last mod: $Id: spectrum.h,v 1.3 1999/12/30 07:26:52 xiphmont Exp $ + ********************************************************************/ #ifndef _V_SPECT_H_ diff --git a/lib/synthesis.c b/lib/synthesis.c index 9f114b27..5236b528 100644 --- a/lib/synthesis.c +++ b/lib/synthesis.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: single-block PCM synthesis - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Oct 07 1999 + last mod: $Id: synthesis.c,v 1.10 1999/12/30 07:26:53 xiphmont Exp $ ********************************************************************/ diff --git a/lib/vorbisfile.c b/lib/vorbisfile.c index a4f16892..b756f7ad 100644 --- a/lib/vorbisfile.c +++ b/lib/vorbisfile.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: vorbisfile.c,v 1.11 1999/12/30 07:26:54 xiphmont Exp $ ********************************************************************/ diff --git a/lib/window.c b/lib/window.c index 9dd08ab6..ed2dc251 100644 --- a/lib/window.c +++ b/lib/window.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: window functions - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Nov 16 1999 + last mod: $Id: window.c,v 1.3 1999/12/30 07:26:55 xiphmont Exp $ ********************************************************************/ diff --git a/lib/window.h b/lib/window.h index 64424016..e76961ca 100644 --- a/lib/window.h +++ b/lib/window.h @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: window functions - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Jul 27 1999 + last mod: $Id: window.h,v 1.2 1999/12/30 07:26:56 xiphmont Exp $ ********************************************************************/ diff --git a/lib/xlogmap.h b/lib/xlogmap.h index f845b1f3..823d5f09 100644 --- a/lib/xlogmap.h +++ b/lib/xlogmap.h @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** - function: linear x scale -> log x scale mappings (with bias) - author: Monty <monty@xiph.org> - modifications by: Monty - last modification date: Aug 18 1999 + function: linear x scale -> log x scale mappings (with bias) + last mod: $Id: xlogmap.h,v 1.2 1999/12/30 07:26:57 xiphmont Exp $ ********************************************************************/ diff --git a/vq/Makefile.in b/vq/Makefile.in index 5833cbf2..2fc556f8 100644 --- a/vq/Makefile.in +++ b/vq/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.3 1999/12/28 03:41:52 xiphmont Exp $ +# $Id: Makefile.in,v 1.4 1999/12/30 07:26:58 xiphmont Exp $ ############################################################################### # # @@ -57,3 +57,6 @@ $(OFILES): $(HFILES) clean: -rm -f *.o *.a test* *~ *.out *.m config.* \ lspvqtrain + +distclean: clean + -rm -f Makefile @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: utility main for building codebooks from training sets - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 15 1999 + last mod: $Id: build.c,v 1.7 1999/12/30 07:26:59 xiphmont Exp $ ********************************************************************/ diff --git a/vq/lspdata.c b/vq/lspdata.c index 2d2dda31..75785ad5 100644 --- a/vq/lspdata.c +++ b/vq/lspdata.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: metrics and quantization code for LSP VQ codebooks - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 24 1999 + last mod: $Id: lspdata.c,v 1.7 1999/12/30 07:27:00 xiphmont Exp $ ********************************************************************/ @@ -1,6 +1,3 @@ -#include "lsp16.vqh" -#define CODEBOOK _vq_book_lsp16 - /******************************************************************** * * * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. * @@ -8,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: utility main for loading/testing/running finished codebooks - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 28 1999 + last mod: $Id: run.c,v 1.2 1999/12/30 07:27:01 xiphmont Exp $ ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: utility main for training codebooks - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 23 1999 + last mod: $Id: train.c,v 1.11 1999/12/30 07:27:02 xiphmont Exp $ ********************************************************************/ @@ -5,13 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** function: prototypes for extermal metrics specific to data type + last mod: $Id: vqext.h,v 1.6 1999/12/30 07:27:03 xiphmont Exp $ ********************************************************************/ @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** - function: build a VQ codebook - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 27 1999 + function: train a VQ codebook + last mod: $Id: vqgen.c,v 1.25 1999/12/30 07:27:04 xiphmont Exp $ ********************************************************************/ @@ -5,10 +5,15 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * + ******************************************************************** + + function: build a VQ codebook + last mod: $Id: vqgen.h,v 1.8 1999/12/30 07:27:05 xiphmont Exp $ + ********************************************************************/ #ifndef _VQGEN_H_ diff --git a/vq/vqsplit.c b/vq/vqsplit.c index 99a891d8..3f3ab460 100644 --- a/vq/vqsplit.c +++ b/vq/vqsplit.c @@ -5,16 +5,14 @@ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. * * PLEASE READ THESE TERMS DISTRIBUTING. * * * - * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999 * - * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company * + * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 * + * by Monty <monty@xiph.org> and The XIPHOPHORUS Company * * http://www.xiph.org/ * * * ******************************************************************** - function: build a VQ codebook - author: Monty <xiphmont@mit.edu> - modifications by: Monty - last modification date: Dec 10 1999 + function: build a VQ codebook and the encoding decision 'tree' + last mod: $Id: vqsplit.c,v 1.7 1999/12/30 07:27:06 xiphmont Exp $ ********************************************************************/ |