Hello community, here is the log from the commit of package alsa-plugins checked in at Thu Mar 15 01:11:53 CET 2007. -------- --- alsa-plugins/alsa-plugins-a52.changes 2007-02-08 16:57:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins-a52.changes 2007-03-14 17:24:38.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 14 17:24:24 CET 2007 - tiwai@suse.de + +- updated to version 1.0.14rc3: + * added rate-lavc resampler plugin + +------------------------------------------------------------------- --- alsa-plugins/alsa-plugins.changes 2007-02-08 16:56:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2007-03-14 17:24:21.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 14 17:23:03 CET 2007 - tiwai@suse.de + +- updated to version 1.0.14rc3: + * fix input/output_frames calculation in samplerate plugin + * added speex rsampler plugin + +------------------------------------------------------------------- Old: ---- alsa-plugins-1.0.14rc2.tar.bz2 New: ---- alsa-plugins-1.0.14rc3.tar.bz2 alsa-plugins-hg-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins-a52.spec ++++++ --- /var/tmp/diff_new_pack.X28839/_old 2007-03-15 01:11:26.000000000 +0100 +++ /var/tmp/diff_new_pack.X28839/_new 2007-03-15 01:11:26.000000000 +0100 @@ -12,16 +12,16 @@ Name: alsa-plugins-a52 BuildRequires: alsa-devel ffmpeg-devel pkg-config -%define package_version 1.0.14rc2 +%define package_version 1.0.14rc3 URL: http://www.alsa-project.org/ Summary: A52 Encoding Plug-In for the ALSA Library Version: 1.0.13 -Release: 10 +Release: 15 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.bz2 -# Patch1: alsa-plugins-hg-fixes.diff +Patch1: alsa-plugins-hg-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,16 +35,18 @@ %prep %setup -n alsa-plugins-%{package_version} -# %patch1 -p1 +%patch1 -p1 %build %{?suse_update_config:%{suse_update_config -f}} autoreconf -fi %configure make -C a52 +make -C rate-lavc %install make -C a52 DESTDIR="$RPM_BUILD_ROOT" install +make -C rate-lavc DESTDIR="$RPM_BUILD_ROOT" install rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.la %clean @@ -54,9 +56,14 @@ %defattr(-, root, root) %doc COPYING %doc doc/a52.txt +%doc doc/lavcrate.txt %{_libdir}/alsa-lib/libasound_module_pcm_a52.so +%{_libdir}/alsa-lib/libasound_module_rate_*.so -%changelog -n alsa-plugins-a52 +%changelog +* Wed Mar 14 2007 - tiwai@suse.de +- updated to version 1.0.14rc3: + * added rate-lavc resampler plugin * Thu Feb 08 2007 - tiwai@suse.de - split from alsa-plugins.spec to its own file for build service (#243582) ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.X28839/_old 2007-03-15 01:11:26.000000000 +0100 +++ /var/tmp/diff_new_pack.X28839/_new 2007-03-15 01:11:26.000000000 +0100 @@ -12,16 +12,16 @@ Name: alsa-plugins BuildRequires: alsa-devel dbus-1-devel jack-devel libsamplerate-devel pulseaudio-devel -%define package_version 1.0.14rc2 +%define package_version 1.0.14rc3 URL: http://www.alsa-project.org/ Summary: Extra Plug-Ins for the ALSA Library Version: 1.0.13 -Release: 10 +Release: 15 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.bz2 -# Patch1: alsa-plugins-hg-fixes.diff +Patch1: alsa-plugins-hg-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,7 +80,7 @@ %prep %setup -n %{name}-%{package_version} -# %patch1 -p1 +%patch1 -p1 %build %{?suse_update_config:%{suse_update_config -f}} @@ -102,6 +102,7 @@ %doc doc/upmix.txt %doc doc/vdownmix.txt %doc doc/samplerate.txt +%doc doc/speexrate.txt %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so @@ -128,7 +129,11 @@ %{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so -%changelog -n alsa-plugins +%changelog +* Wed Mar 14 2007 - tiwai@suse.de +- updated to version 1.0.14rc3: + * fix input/output_frames calculation in samplerate plugin + * added speex rsampler plugin * Thu Feb 08 2007 - tiwai@suse.de - update to version 1.0.14rc2 - just repackaging from 1.0.14rc1a - split internal sub package to its own spec file ++++++ alsa-plugins-1.0.14rc2.tar.bz2 -> alsa-plugins-1.0.14rc3.tar.bz2 ++++++ ++++ 2927 lines of diff (skipped) ++++++ alsa-plugins-hg-fixes.diff ++++++ diff -r 056fbbe54729 doc/Makefile.am --- a/doc/Makefile.am Mon Feb 26 10:20:40 2007 +0100 +++ b/doc/Makefile.am Wed Mar 07 18:15:48 2007 +0100 @@ -1,2 +1,3 @@ EXTRA_DIST = README-pcm-oss README-jack EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo \ - upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt + upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt \ + speexrate.txt diff -r 056fbbe54729 doc/speexrate.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/speexrate.txt Wed Mar 07 18:15:23 2007 +0100 @@ -0,0 +1,29 @@ +Rate Converter Plugin Using Speex Resampler +=========================================== + +The plugin in rate subdirectory is an external rate converter using +the Speex resampler (aka Public Parrot Hack) by Jean-Marc Valin. You can +use this rate converter plugin by defining a rate PCM with "converter" +parameter, such as: + + pcm.my_rate { + type rate + slave.pcm "hw" + converter "speexrate" + } + +The plug plugin has also a similar field, "rate_converter". + +Or, more easily, define a global variable "defaults.pcm.rate_converter", +which is used as the default converter type by plug and rate plugins: + + defaults.pcm.rate_converter "speexrate" + +Write the above in your ~/.asoundrc or /etc/asound.conf. + +The following converter types are available: + + - speexrate_best Use quality 10 (equivalent to SRC_SINC_BEST_QUALITY) + - speexrate_medium Use quality 5 (equivalent to SRC_SINC_MEDIUM_QUALITY) + - speexrate Use quality 3 (equivalent to SRC_SINC_FASTEST) + diff -r 056fbbe54729 pulse/pcm_pulse.c --- a/pulse/pcm_pulse.c Mon Feb 26 10:20:40 2007 +0100 +++ b/pulse/pcm_pulse.c Wed Mar 07 15:51:40 2007 +0100 @@ -643,23 +643,8 @@ static int pulse_hw_constraint(snd_pcm_p if (err < 0) return err; - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE, - 8000, 48000); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, - 1, 4294967295U); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS, - 2, 4294967295U); - if (err < 0) - return err; - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, - 1, 4294967295U); + 1, 4 * 1024 * 1024); if (err < 0) return err; diff -r 056fbbe54729 rate-lavc/Makefile.am --- a/rate-lavc/Makefile.am Mon Feb 26 10:20:40 2007 +0100 +++ b/rate-lavc/Makefile.am Thu Mar 08 12:51:30 2007 +0100 @@ -8,6 +8,8 @@ libasound_module_rate_lavcrate_la_SOURCE libasound_module_rate_lavcrate_la_SOURCES = rate_lavcrate.c libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@ +noinst_HEADERS = gcd.h + install-exec-hook: rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_higher.so diff -r 056fbbe54729 a/rate-lavc/gcd.h --- /dev/null 2007-03-07 23:17:00.000000000 +0100 +++ b/rate-lavc/gcd.h 2007-02-20 12:42:22.000000000 +0100 @@ -0,0 +1,56 @@ +/* + * Fast implementation of greatest common divisor using the binary algorithm. + * Copyright (c) 2007 Nicholas Kain + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/* computes gcd using binary algorithm */ +static int gcd(int a, int b) +{ + int s,d; + + if (!a || !b) + return a | b; + + for (s=0; ((a|b)&1) == 0; ++s) { + a >>= 1; + b >>= 1; + } + + while ((a&1) == 0) + a >>= 1; + + do { + while ((b&1) == 0) { + b >>= 1; + } + if (a>= 1; + } while (b); + + return a << s; +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de