Commit 4073801c authored by j's avatar j
Browse files

merge changes from /tags/vorbis/libvorbis-1.1.2/

svn path=/branches/vorbis-aotuv/; revision=12031
parent d9a41b23
libvorbis 1.1.2 (2005-11-27) -- "Xiph.Org libVorbis I 20050304"
* fix a serious encoder bug with gcc 4 optimized builds
* documentation and spec fixes
* updated VS2003 and XCode builds
* new draft RTP encapsulation spec
libvorbis 1.1.1 (2005-06-27) -- "Xiph.Org libVorbis I 20050304"
* bug fix to the bitrate management encoder interface
......
aoTuV - Copyright (c) 2003-2005 Aoyumi
libvorbis - Copyright (c) 2002-2005 Xiph.org Foundation
Copyright (c) 2002-2004 Xiph.org Foundation
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......
......@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
SUBDIRS = lib include doc examples win32 debian vq
SUBDIRS = lib include doc examples vq
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
......@@ -10,20 +10,29 @@ m4data_DATA = vorbis.m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
EXTRA_DIST = todo.txt macos macosx autogen.sh \
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
# because of it, breaking make dist. This works just as well.
EXTRA_DIST = \
todo.txt autogen.sh \
libvorbis.spec libvorbis.spec.in \
vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
vorbis-uninstalled.pc.in \
vorbisenc-uninstalled.pc.in \
vorbisfile-uninstalled.pc.in
vorbis.m4 \
vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
vorbis-uninstalled.pc.in \
vorbisenc-uninstalled.pc.in \
vorbisfile-uninstalled.pc.in \
debian macos macosx win32
DISTCHECK_CONFIGURE_FLAGS = --enable-docs
dist-hook:
rm -rf `find $(distdir)/macos -name CVS`
rm -rf `find $(distdir)/debian -name .svn`
rm -rf `find $(distdir)/debian -name "Makefile*"`
rm -rf `find $(distdir)/macos -name .svn`
rm -rf `find $(distdir)/macosx -name CVS`
rm -rf `find $(distdir)/macosx -name .svn`
rm -rf `find $(distdir)/win32 -name .svn`
debug:
$(MAKE) all CFLAGS="@DEBUG@"
......
......@@ -70,10 +70,12 @@ Directory:
CONTACT:
The Ogg homepage is located at 'http://www.xiph.org/ogg/'.
Vorbis's homepage is located at 'http://www.xiph.org/ogg/vorbis/'.
Vorbis's homepage is located at 'http://www.xiph.org/vorbis/'.
Up to date technical documents, contact information, source code and
pre-built utilities may be found there.
The user website for Ogg Vorbis software and audio is http://vorbis.com/
BUILDING FROM TRUNK:
Development source is under subversion revision control at
......
......@@ -104,3 +104,58 @@ int main ()
AC_SUBST(OGG_LIBS)
rm -f conf.oggtest
])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
aoTuV beta4.51 release note
"aoTuV" tunes up Xiph.Org's libvorbis uniquely.
A license is taken as "BSD-style license" as well as original libvorbis.
# NOTICE #
Manuke's patch is used for improvement in the speed of sort processing.
When "#define OPT_SORT" of "lib/psy.h" is deleted, the conventional
processing method is used.
Thanks! Manuke.
aoTuV based on <Xiph.Org libvorbis>
Copyright (c) 2002-2005 Xiph.Org Foundation
Copyright (c) 2003-2005 Aoyumi
AUTHOR : aoyumi <aoyumi@inter7.jp>
\ No newline at end of file
aoTuV beta4.51 technical information
The differences from the aoTuV beta 4.5...
1. The changed part of "scale.h" of Xiph.Org SVN was reflected in aoTuV. This will solve the problem of the compile by gcc4.
2. A part of portion added by beta4.5 had caused memory access violation. Depending on environment, a problem arises in qualiy-1/-2. This problem was corrected.
2005/11/17
Aoyumi
----------------------------------------------------------------------------
aoTuV beta4.5 technical information
The differences from the aoTuV beta 4...
1. M4 code of beta3 was deleted. M5 is added as what is replaced with it. The advantage of this method is that the result stabilized more is obtained. Instead, the change width of the bit rate becomes large rather than before. [32/44.1/48kHz only]
@2. New M4 was added. There is this for the same purpose as M1. However, it is tuned up only in the low bit rate region according to work and individual parameters. [32/44.1/48kHz only]
@3. M2 code was extended. This decreases a specific noise problem. [32/44.1/48kHz only]
...and I mainly tune up tone/noise masking and noise normalization parameters.
The above change is applied below quality3.
2005/11/05
Aoyumi
----------------------------------------------------------------------------
aoTuV beta4a technical information
The differences from the aoTuV beta 4...
1. Adoption of new hypot (point stereo). This works in general better than
dipole/round hypot. And when residue is likely to decrease greatly at the
time of a reverse phase, added code is made to increase the ratio of lossless.
2. Change of ATH curve. This is not a big change.
3. Residue used for threshold calculation of channel coupling is changed.
This one seems to be good selection.
4. HF reduction code of beta3 was deleted. Now, this is not required.
5. The energy deficit of M4 code of beta3 -- correction of a bug Now.
6. The code for pulling downward floor of the frequency range which can
be easy to be heard was added (New M2). This works by the low bit rate and
has a comparatively good trade-off.
7. Change of threshold calculation of noise normalization. Moreover, it
takes phase information into consideration.
...and I mainly tune up tone/noise masking parameters.
2005/06/18
Aoyumi
----------------------------------------------------------------------------
The differences from the aoTuV beta 3...
1. Adoption of new hypot (point stereo). This works in general better than
dipole/round hypot. And when residue is likely to decrease greatly at the
time of a reverse phase, added code is made to increase the ratio of lossless.
2. Change of ATH curve. This is not a big change.
3. Residue used for threshold calculation of channel coupling is changed.
This one seems to be good selection.
4. HF reduction code of beta3 was deleted. Now, this is not required.
5. The energy deficit of M4 code of beta3 -- correction of a bug Now.
6. The code for pulling downward floor of the frequency range which can
be easy to be heard was added (New M2). This works by the low bit rate and
has a comparatively good trade-off.
7. Change of threshold calculation of noise normalization. Moreover, it
takes phase information into consideration.
...and I mainly tune up tone/noise masking and noise compander parameters.
2005/06/18
Aoyumi
----------------------------------------------------------------------------
aoTuV beta3 technical information
The differences from the aoTuV beta 2 and Vorbis 1.1...
1. Dynamic impulse block noise control(q0-10). [32/44.1/48kHz only]
Conspicuous pre-echo is reduced.
2. New ATH curve.
3. In order to cancel that a small sound becomes unstable, the noise level
of low frequency is lowered under specific conditions. (Only below q3)
There is a greatest effect on a piano etc. [32/44.1/48kHz only]
4. The rate of lossless stereo is increased in specific conditions. This
improves many of conspicuous problems which a point stereo causes. (e.g
drumus's hiss/voice, guitar and brass's distortion) [32/44.1/48kHz only]
5. The action of the noise normalization of point stereo is corrected. It
was set to one of the causes of distortion in a long tone (e.g
strings/oboe/high tone voice).
6. The HF reduction code was not working normally. This is corrected and
it retuned up according to the present condition. [32/44.1/48kHz only]
7. The q-2 mode was added in all sampling frequencies. And nominal bitrate
of q-1 are changed into a more nearly average value. Although nominal
bitrate is more large at a low sampling frequency, average bitrate hardly
differs from the former version.
...and I mainly tune up tone/noise masking parameters.
2004/11/21
Aoyumi
......@@ -11,19 +11,19 @@ AC_CANONICAL_TARGET
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE(libvorbis,1.1.1)
AM_INIT_AUTOMAKE(libvorbis,1.1.2)
AM_MAINTAINER_MODE
dnl Library versioning
V_LIB_CURRENT=3
V_LIB_REVISION=0
V_LIB_REVISION=1
V_LIB_AGE=3
VF_LIB_CURRENT=4
VF_LIB_REVISION=0
VF_LIB_REVISION=1
VF_LIB_AGE=1
VE_LIB_CURRENT=2
VE_LIB_REVISION=1
VE_LIB_REVISION=2
VE_LIB_AGE=0
AC_SUBST(V_LIB_CURRENT)
AC_SUBST(V_LIB_REVISION)
......@@ -76,7 +76,6 @@ dnl --------------------------------------------------
dnl Set some target options
cflags_save="$CFLAGS"
ldflags_save="$LDFLAGS"
if test -z "$GCC"; then
case $host in
*-*-irix*)
......@@ -99,6 +98,9 @@ if test -z "$GCC"; then
esac
else
AC_MSG_CHECKING([GCC version])
GCC_VERSION=`$CC -dumpversion`
AC_MSG_RESULT([$GCC_VERSION])
case $host in
*86-*-linux*)
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
......@@ -168,7 +170,6 @@ else
esac
fi
CFLAGS="$CFLAGS $cflags_save"
LDFLAGS="$LDFLAGS $ldflags_save"
dnl --------------------------------------------------
dnl Check for headers
......@@ -234,8 +235,6 @@ lib/books/floor/Makefile
doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
include/Makefile include/vorbis/Makefile
examples/Makefile
win32/Makefile
debian/Makefile
vq/Makefile
libvorbis.spec
vorbis.pc
......
## Process this file with automake to produce Makefile.in
EXTRA_DIST = changelog control copyright libvorbis-dev.docs \
libvorbis-dev.examples libvorbis-dev.install libvorbis0a.install \
libvorbisenc2.install libvorbisfile3.install rules
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment