RPCS3/soundtouch
1
0
Fork 0
mirror of https://github.com/RPCS3/soundtouch.git synced 2024-11-08 12:02:28 +01:00
Code Issues Projects Releases Wiki Activity

Fixes in Automake files & removed CR+LFs

Browse Source
This commit is contained in:
oparviai 2008-02-17 14:20:52 +00:00
parent dbf41511af
commit 3ed4049f3e
10 changed files with 1489 additions and 1498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING.TXT
View File

@ -117,7 +117,7 @@ be combined with the library in order to run.
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
other authoried 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".

2
Makefile.am
View File

@ -67,4 +67,4 @@ dist-hook:
# flag to aclocal where to find m4 macros for tests
ACLOCAL_AMFLAGS = -I config/m4
AUTOMAKE_OPTIONS = foreign

66
README.html
View File

@ -48,10 +48,10 @@ for more information.</p>
<h3>2.1. Building in Microsoft Windows</h3>
<p>Project files for Microsoft Visual C++ 6.0 and Visual C++ .NET are
supplied with the source code package. Please notice that SoundTouch
library uses processor-specific optimizations for Pentium III and AMD
library uses processor-specific optimiations for Pentium III and AMD
processors that require a processor pack upgrade for
the Visual Studio 6.0 to be installed in order to support these
optimizations. The processor pack upgrade can be downloaded from
optimiations. The processor pack upgrade can be downloaded from
Microsoft site at this URL:</p>
<p><a
href="http://msdn.microsoft.com/vstudio/downloads/tools/ppack/default.aspx">
@ -74,7 +74,7 @@ creates these directories automatically.
</p>
<p>Also other C++ compilers than Visual C++ can be
used, but project or makefiles then have to be adapted accordingly.
Performance optimizations are written in Visual C++ compatible
Performance optimiations are written in Visual C++ compatible
syntax, they may or may not be compatible with other compilers. If
using GCC (Gnu C Compiler) compiler package such as DJGPP or Cygwin,
please see next chapter for instructions. </p>
@ -83,7 +83,7 @@ please see next chapter for instructions. </p>
practically any platform supporting GNU compiler (GCC) tools.
SoundTouch have been tested with gcc version 3.3.4., but it
shouldn't be very specific about the gcc version. Assembler-level
performance optimizations for GNU platform are currently available in
performance optimiations for GNU platform are currently available in
x86 platforms only, they are automatically disabled and replaced with
standard C routines in other processor platforms.</p>
<p>To build and install the binaries, run the
@ -126,9 +126,9 @@ tested
to compile in GNU/Linux platform. However, in past it's happened that
new
gcc versions aren't necessarily compatible with the assembler setttings
used in the optimized routines. <b>If you have problems getting the
used in the optimied routines. <b>If you have problems getting the
SoundTouch library compiled, try the workaround of disabling the
optimizations</b> by editing the file "include/STTypes.h" and removing
optimiations</b> by editing the file "include/STTypes.h" and removing
the following definition there:</p>
<blockquote>
<pre>#define ALLOW_OPTIMIZATIONS 1</pre>
@ -167,7 +167,7 @@ to process stereo sound as two separate mono channels, this isn't
recommended because processing the channels separately would
result in losing the phase coherency between the channels, which
consequently would ruin the stereo effect.</p>
<p>Sample rates between 8000-48000Hz are
<p>Sample rates between 8000-48000H are
supported.</p>
<h3>3.2. Processing latency</h3>
<p>The processing and latency constraints of
@ -179,8 +179,8 @@ used. If the rate transposing effect alone is used, the latency
requirement
is much shorter, see section 'About algorithms'.</li>
<li>Processing CD-quality sound (16bit stereo
sound with 44100Hz sample rate) in real-time or faster is possible
starting from processors equivalent to Intel Pentium 133Mhz or better,
sound with 44100H sample rate) in real-time or faster is possible
starting from processors equivalent to Intel Pentium 133Mh or better,
if using the "quick" processing algorithm. If not using the "quick"
mode or
if floating point sample data are being used, several times more CPU
@ -228,7 +228,7 @@ original duration but increased pitch.</li>
</ul>
<h3>3.4 Tuning the algorithm parameters</h3>
<p>The time-stretch algorithm has few
parameters that can be tuned to optimize sound quality for
parameters that can be tuned to optimie sound quality for
certain application. The current default parameters have been
chosen by iterative if-then analysis (read: "trial and error")
to obtain best subjective sound quality in pop/rock music
@ -278,7 +278,7 @@ smaller value on this.</li>
<p>Notice that these parameters can also be
set during execution time with functions "<strong>TDStretch::setParameters()</strong>"
and "<strong>SoundTouch::setSetting()</strong>".</p>
<p>The table below summarizes how the
<p>The table below summaries how the
parameters can be adjusted for different applications:</p>
<table border="1">
<tbody>
@ -344,8 +344,8 @@ value increases computation burden</td>
</tr>
</tbody>
</table>
<h3>3.5 Performance Optimizations </h3>
<p><strong>General optimizations:</strong></p>
<h3>3.5 Performance Optimiations </h3>
<p><strong>General optimiations:</strong></p>
<p>The time-stretch routine has a 'quick' mode
that substantially speeds up the algorithm but may degrade the
sound quality by a small amount. This mode is activated by
@ -354,22 +354,22 @@ of SETTING_USE_QUICKSEEK and value "1", i.e. </p>
<blockquote>
<p>setSetting(SETTING_USE_QUICKSEEK, 1);</p>
</blockquote>
<p><strong>CPU-specific optimizations:</strong></p>
<p><strong>CPU-specific optimiations:</strong></p>
<ul>
<li>Intel MMX optimized routines are used with
<li>Intel MMX optimied routines are used with
compatible CPUs when 16bit integer sample type is used. MMX
optimizations are available both in Win32 and Gnu/x86 platforms.
optimiations are available both in Win32 and Gnu/x86 platforms.
Compatible processors are Intel PentiumMMX and later; AMD K6-2, Athlon
and later. </li>
<li>Intel SSE optimized routines are used with
<li>Intel SSE optimied routines are used with
compatible CPUs when floating point sample type is used. SSE
optimizations are currently implemented for Win32 platform only.
optimiations are currently implemented for Win32 platform only.
Processors compatible with SSE extension are Intel processors starting
from Pentium-III, and AMD processors starting from Athlon XP. </li>
<li>AMD 3DNow! optimized routines are used with
<li>AMD 3DNow! optimied routines are used with
compatible CPUs when floating point sample type is used, but SSE
extension isn't supported . 3DNow! optimizations are currently
implemented for Win32 platform only. These optimizations are used in
extension isn't supported . 3DNow! optimiations are currently
implemented for Win32 platform only. These optimiations are used in
AMD K6-2 and Athlon (classic) CPU's; better performing SSE routines are
used with AMD processor starting from Athlon XP. </li>
</ul>
@ -485,11 +485,11 @@ using either integer (e.g. "-tempo=123") or decimal (e.g.
<li>The &quot;-naa&quot; and/or "-quick" switches can be
used to reduce CPU usage while compromising some sound quality </li>
<li>The BPM detection algorithm works by detecting
repeating low-frequency (&lt;250Hz) sound patterns and thus works
repeating low-frequency (&lt;250H) sound patterns and thus works
mostly with most rock/pop music with bass or drum beat. The BPM
detection doesn't work on pieces such as classical music without
distinct, repeating bass frequency patterns. Also pieces with varying
tempo, varying bass patterns or very complex bass patterns (jazz, hiphop) may produce odd BPM readings. <br>
tempo, varying bass patterns or very complex bass patterns (ja, hiphop) may produce odd BPM readings. <br>
<br>
In cases when the bass pattern drifts a bit around a nominal beat rate
(e.g. drummer is again drunken :), the BPM algorithm may report
@ -534,10 +534,10 @@ of the file &quot;orig.wav&quot; and adjusts the tempo to match
</strong></p>
<ul>
<li>Changed static class declaration to GCC 4.x compiler compatible syntax.</li>
<li>Enabled MMX/SSE-optimized routines also for GCC compilers. Earlier
the MMX/SSE-optimized routines were written in compiler-specific inline
<li>Enabled MMX/SSE-optimied routines also for GCC compilers. Earlier
the MMX/SSE-optimied routines were written in compiler-specific inline
assembler, now these routines are migrated to use compiler intrinsic
syntax which allows compiling the same MMX/SSE-optimized source code with
syntax which allows compiling the same MMX/SSE-optimied source code with
both Visual C++ and GCC compilers. </li>
<li>Set floating point as the default sample format and added switch to
the GNU configure script for selecting the other sample format.</li>
@ -551,13 +551,13 @@ the GNU configure script for selecting the other sample format.</li>
error </li>
<li>Implemented separate processing routines for integer and
floating arithmetic to allow improvements to floating point routines
(earlier used algorithms mostly optimized for integer arithmetic also
(earlier used algorithms mostly optimied for integer arithmetic also
for floating point samples) </li>
<li>Fixed a bug that distorts sound if sample rate changes during the
sound stream </li>
<li>Fixed a memory leak that appeared in MMX/SSE/3DNow! optimized
<li>Fixed a memory leak that appeared in MMX/SSE/3DNow! optimied
routines </li>
<li>Reduced redundant code pieces in MMX/SSE/3DNow! optimized
<li>Reduced redundant code pieces in MMX/SSE/3DNow! optimied
routines vs. the standard C routines.</li>
<li>MMX routine incompatibility with new gcc compiler versions </li>
<li>Other miscellaneous bug fixes </li>
@ -575,8 +575,8 @@ SAMPLETYPE definitions.</li>
<p><strong>v1.2.0: </strong></p>
<ul>
<li>Added support for 32bit floating point sample
data type with SSE/3DNow! optimizations for Win32 platform (SSE/3DNow!
optimizations currently not supported in GCC environment)</li>
data type with SSE/3DNow! optimiations for Win32 platform (SSE/3DNow!
optimiations currently not supported in GCC environment)</li>
<li>Replaced 'make-gcc' script for GNU environment
by master Makefile</li>
<li>Added time-stretch routine configurability to
@ -587,8 +587,8 @@ SoundTouch main class</li>
<ul>
<li>Moved SoundTouch under lesser GPL license (LGPL). This allows using SoundTouch library in programs that aren't
released under GPL license. </li>
<li>Changed MMX routine organization so that MMX
optimized routines are now implemented in classes that are derived from
<li>Changed MMX routine organiation so that MMX
optimied routines are now implemented in classes that are derived from
the basic classes having the standard non-mmx routines. </li>
<li>MMX routines to support gcc version 3. </li>
<li>Replaced windows makefiles by script using the .dsw files </li>

4
bootstrap
View File

@ -16,11 +16,11 @@ then
rm -rf configure libtool aclocal.m4 `find . -name Makefile.in` autom4te*.cache config/config.guess config/config.h.in config/config.sub config/depcomp config/install-sh config/ltmain.sh config/missing config/mkinstalldirs config/stamp-h config/stamp-h.in
#gettextize files
#gettextie files
#rm -f ABOUT-NLS config/config.rpath config/m4/codeset.m4 config/m4/gettext.m4 config/m4/glibc21.m4 config/m4/iconv.m4 config/m4/intdiv0.m4 config/m4/inttypes-pri.m4 config/m4/inttypes.m4 config/m4/inttypes_h.m4 config/m4/isc-posix.m4 config/m4/lcmessage.m4 config/m4/lib-ld.m4 config/m4/lib-link.m4 config/m4/lib-prefix.m4 config/m4/progtest.m4 config/m4/stdint_h.m4 config/m4/uintmax_t.m4 config/m4/ulonglong.m4 po/Makefile.in.in po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin
else
export AUTOMAKE="automake --add-missing --foreign"
export AUTOMAKE="automake --add-missing --foreign --copy"
autoreconf -fisv && rm -f `find . -name "*~"` && rm -f ChangeLog
exit $?
fi

13
config/am_include.mk
View File

@ -32,19 +32,6 @@
INCLUDES=-I$(top_srcdir)/include
## CXXFLAGS is also automatically added to the $(CXX) macro at compile time, and
## is passed down to the children as well
## I list these here in case there needs to always be some flags passed to the compiler
CXXFLAGS=@CXXFLAGS@
## LDFLAGS will be added at link time
## note that the -l flags are set by the LIBS macro that is set by configure
## This line doesn't need to be here, configure will add LDFLAGS on it's own,
## but I'm leaving here as a place to add LDFLAGS if so desired
LDFLAGS=@LDFLAGS@
# doc directory
pkgdocdir=$(prefix)/doc/@PACKAGE@

3
configure.ac
View File

@ -35,7 +35,6 @@ AC_LANG(C++)
dnl ############################################################################
dnl # Checks for programs #
dnl ############################################################################
CXXFLAGS= dnl AC_PROG_CXX automatically sets CXXFLAGS to -g -O2 if g++ is the C++ compiler and CXXFLAGS hasn't been set, so by setting CXXFLAGS, we can avoid this.
AC_PROG_CXX
#AC_PROG_AWK
AC_PROG_CC
@ -109,7 +108,7 @@ dnl add whatever functions you might want to check for here
dnl ############################################################################
dnl # Internationalization and Localization #
dnl # Internationaliation and Localiation #
dnl ############################################################################
#AM_GNU_GETTEXT_VERSION([0.11.5])
#AM_GNU_GETTEXT([external])

11
source/SoundTouch/Makefile.am
View File

@ -30,13 +30,18 @@ noinst_HEADERS=AAFilter.h cpu_detect.h cpu_detect_x86_gcc.cpp FIRFilter.h RateTr
lib_LTLIBRARIES=libSoundTouch.la
# the mmx_gcc.cpp and cpu_detect_x86_gcc.cpp may need to be conditionally included here from things discovered in configure.ac
libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp
# libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp mmx_optimized.cpp sse_optimized.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp
libSoundTouch_la_SOURCES=AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86_gcc.cpp
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include
# AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include
AM_CXXFLAGS=-O3 -fcheck-new -I../../include
# other linking flags to add
#libSoundTouch_la_LIBADD=
noinst_LTLIBRARIES = libSoundTouchOpt.la
libSoundTouch_la_LIBADD = libSoundTouchOpt.la
libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp
libSoundTouchOpt_la_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include