The branch, master has been updated
via f8cfc34f15e6d34ce6da22872c0cb5315666a10b (commit)
via dde5a6e4cf76722bff44db7eca4ca814189f48d9 (commit)
via 014593a3ae35f2f731ebaf9cb4994a0d3d3852dc (commit)
via 294acfcec533960a5ebade2f47a47aaf466dee39 (commit)
via 15c1bc21fc55814ebda298e0bcb62caf9bc3573b (commit)
via 77b036fc99b7097137189a5fa62285d2f25f3811 (commit)
via 48ec7b123cb44066e58787608c5b9bdb2e070998 (commit)
from c555bc2b0f0b4de22bc5de366fd252b8bba7c381 (commit)
- Shortlog ------------------------------------------------------------
f8cfc34 Update 2.99.2
dde5a6e Merge tag 'upstream/2.99.2'
294acfc debian/patches/0001-Switch-the-default-resample-quality-to-1.patch:
15c1bc2 debian/shlibs.local: Add libpulsecore to shlibs & update versions
77b036f debian/pulse.conf: No longer need to load asound.conf and .asoundrc
directly
48ec7b1 debian/control: Bump cdbs build-depends
Summary of changes:
.gitignore | 34 ++-
.tarball-version | 2 +-
.version | 2 +-
Makefile.am | 16 +-
Makefile.in | 16 +-
PROTOCOL | 340 ++++++++++++++++++++
config.h.in | 5 +
configure | 54 ++--
configure.ac | 11 +-
debian/changelog | 12 +-
debian/control | 2 +-
...-Switch-the-default-resample-quality-to-1.patch | 84 +++++
...se-the-fixed-point-speex-resampler-on-ARM.patch | 78 +++++
debian/patches/series | 3 +-
debian/pulse.conf | 2 -
debian/shlibs.local | 3 +-
doxygen/.gitignore | 4 +
m4/.gitignore | 16 +
man/.gitignore | 6 +
man/pulse-daemon.conf.5 | 4 +-
man/pulse-daemon.conf.5.xml.in | 7 +-
po/.gitignore | 16 +
src/.gitignore | 73 +++++
src/Makefile.am | 4 +-
src/Makefile.in | 4 +-
src/daemon/.gitignore | 3 +
src/modules/alsa/alsa-sink.c | 26 +-
src/modules/alsa/alsa-source.c | 12 +-
src/modules/alsa/alsa-ucm.c | 2 +-
src/modules/alsa/alsa-util.c | 17 +-
src/modules/alsa/alsa-util.h | 2 +-
.../alsa/mixer/paths/analog-input.conf.common | 6 +-
.../mixer/paths/analog-output-speaker-always.conf | 13 +
.../alsa/mixer/paths/analog-output-speaker.conf | 13 +
src/modules/alsa/mixer/paths/analog-output.conf | 6 +
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 6 +
src/modules/bluetooth/module-bluetooth-device.c | 2 +-
src/modules/jack/module-jack-sink.c | 5 +-
src/modules/macosx/module-coreaudio-device.c | 9 +-
src/modules/module-combine-sink.c | 5 +-
src/modules/module-device-restore.c | 16 +-
src/modules/module-esound-sink.c | 5 +-
src/modules/module-null-sink.c | 22 +-
src/modules/module-pipe-sink.c | 7 +-
src/modules/module-solaris.c | 13 +-
src/modules/module-tunnel.c | 5 +-
src/modules/module-waveout.c | 11 +-
src/modules/oss/module-oss.c | 5 +-
src/modules/raop/module-raop-sink.c | 5 +-
src/modules/xen/module-xenpv-sink.c | 7 +-
src/pulse/.gitignore | 1 +
src/pulse/introspect.h | 8 +-
src/pulse/mainloop.c | 9 +-
src/pulse/stream.c | 20 +-
src/pulse/stream.h | 20 +-
src/pulsecore/resampler.c | 5 +-
src/pulsecore/sink-input.c | 11 +-
src/pulsecore/sink.c | 9 +-
src/pulsecore/source-output.c | 11 +-
src/pulsecore/source.c | 3 +
src/tests/alsa-time-test.c | 118 +++----
61 files changed, 980 insertions(+), 256 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit f8cfc34f15e6d34ce6da22872c0cb5315666a10b
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 23:03:12 2012 +0100
Update 2.99.2
diff --git a/debian/changelog b/debian/changelog
index b36dee4..386033f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (2.99.1-1) UNRELEASED; urgency=low
+pulseaudio (2.99.2-1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
* debian/rules: use xz compression for binary packages. (Patch by Ansgar
@@ -39,7 +39,7 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
* Added, Use fix point resampler on ARM
- -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 22:48:30 +0100
+ -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 23:02:56 +0100
pulseaudio (2.1-2) experimental; urgency=low
commit dde5a6e4cf76722bff44db7eca4ca814189f48d9
Merge: 294acfcec533960a5ebade2f47a47aaf466dee39
014593a3ae35f2f731ebaf9cb4994a0d3d3852dc
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 23:01:38 2012 +0100
Merge tag 'upstream/2.99.2'
Upstream version 2.99.2
Conflicts:
.gitignore
commit 294acfcec533960a5ebade2f47a47aaf466dee39
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 22:49:46 2012 +0100
debian/patches/0001-Switch-the-default-resample-quality-to-1.patch:
* debian/patches/0001-Switch-the-default-resample-quality-to-1.patch:
* Added, Switch to a lower speex resampler quality level
* debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
* Added, Use fix point resampler on ARM
diff --git a/debian/changelog b/debian/changelog
index afc8901..b36dee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,12 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* Removed. All fixed upstream
* debian/shlibs.local: Add libpulsecore to shlibs & update versions
+ * debian/patches/0001-Switch-the-default-resample-quality-to-1.patch:
+ * Added, Switch to a lower speex resampler quality level
+ * debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+ * Added, Use fix point resampler on ARM
- -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:41:58 +0100
+ -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 22:48:30 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch
b/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch
new file mode 100644
index 0000000..2e00421
--- /dev/null
+++ b/debian/patches/0001-Switch-the-default-resample-quality-to-1.patch
@@ -0,0 +1,84 @@
+From 32382f01bb65cc81acb835b79ef6f64935bc9524 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <[email protected]>
+Date: Sun, 25 Nov 2012 21:10:00 +0100
+Subject: [PATCH 1/2] Switch the default resample quality to 1
+
+Swithc the standard quality level of the speex resampler down a notch
+from -3 to -1 to lower cpu usage by the resampler. This has been
+dicussed for a while, without real oposition and has been the default in
+at least Ubuntu for a while.
+---
+ man/pulse-daemon.conf.5.xml.in | 2 +-
+ src/daemon/daemon.conf.in | 2 +-
+ src/pulsecore/core.c | 2 +-
+ src/pulsecore/resampler.c | 6 +++---
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+index c270d2b..43257a6 100644
+--- a/man/pulse-daemon.conf.5.xml.in
++++ b/man/pulse-daemon.conf.5.xml.in
+@@ -100,7 +100,7 @@ USA.
+ desktop CPUs the float point resampler is a lot faster, and it
+ also offers slightly better quality. See the output of
+ <opt>dump-resample-methods</opt> for a complete list of all
+- available resamplers. Defaults to <opt>speex-float-3</opt>. The
++ available resamplers. Defaults to <opt>speex-float-1</opt>. The
+ <opt>--resample-method</opt> command line option takes precedence.
+ Note that some modules overwrite or allow overwriting of the
+ resampler to use.</p>
+diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
+index dff97ae..2089058 100644
+--- a/src/daemon/daemon.conf.in
++++ b/src/daemon/daemon.conf.in
+@@ -54,7 +54,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; log-time = no
+ ; log-backtrace = 0
+
+-; resample-method = speex-float-3
++; resample-method = speex-float-1
+ ; enable-remixing = yes
+ ; enable-lfe-remixing = no
+
+diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
+index e4f9140..a9f1b7d 100644
+--- a/src/pulsecore/core.c
++++ b/src/pulsecore/core.c
+@@ -141,7 +141,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared,
size_t shm_size) {
+ c->disable_remixing = FALSE;
+ c->disable_lfe_remixing = FALSE;
+ c->deferred_volume = TRUE;
+- c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
++ c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
+
+ for (j = 0; j < PA_CORE_HOOK_MAX; j++)
+ pa_hook_init(&c->hooks[j], c);
+diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
+index a13e700..5f8e9bd 100644
+--- a/src/pulsecore/resampler.c
++++ b/src/pulsecore/resampler.c
+@@ -235,7 +235,7 @@ pa_resampler* pa_resampler_new(
+
+ if (method == PA_RESAMPLER_AUTO) {
+ #ifdef HAVE_SPEEX
+- method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
++ method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
+ #else
+ if (flags & PA_RESAMPLER_VARIABLE_RATE)
+ method = PA_RESAMPLER_TRIVIAL;
+@@ -552,10 +552,10 @@ pa_resample_method_t pa_parse_resample_method(const char
*string) {
+ return m;
+
+ if (pa_streq(string, "speex-fixed"))
+- return PA_RESAMPLER_SPEEX_FIXED_BASE + 3;
++ return PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
+
+ if (pa_streq(string, "speex-float"))
+- return PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
++ return PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
+
+ return PA_RESAMPLER_INVALID;
+ }
+--
+1.7.10.4
+
diff --git
a/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
b/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
new file mode 100644
index 0000000..a41875e
--- /dev/null
+++ b/debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
@@ -0,0 +1,78 @@
+From 00fbfcc27ffa179eb88c8a9627c1e928b0593d0e Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <[email protected]>
+Date: Sun, 25 Nov 2012 21:46:38 +0100
+Subject: [PATCH 2/2] Use the fixed point speex resampler on ARM
+
+Switch to use the speex fixed point resampler method by default on ARM.
+Traditionately there wasn't any standard floating point hardware, so for
+those machines it's an obvious choise. On machine using the hardfloat
+ABI floating point still isn't an obvious win over integer performance,
+it's of equal performance on some machines, but slower on others.
+---
+ man/pulse-daemon.conf.5.xml.in | 2 ++
+ src/daemon/daemon.conf.in | 2 ++
+ src/pulsecore/core.c | 4 ++++
+ src/pulsecore/resampler.c | 4 ++++
+ 4 files changed, 12 insertions(+)
+
+diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+index 43257a6..3eccd77 100644
+--- a/man/pulse-daemon.conf.5.xml.in
++++ b/man/pulse-daemon.conf.5.xml.in
+@@ -101,6 +101,8 @@ USA.
+ also offers slightly better quality. See the output of
+ <opt>dump-resample-methods</opt> for a complete list of all
+ available resamplers. Defaults to <opt>speex-float-1</opt>. The
++ available resamplers. Defaults to <opt>speex-float-1</opt> on most
++ achitectures and <opt>speex-fixed-1</opt> on ARM. The
+ <opt>--resample-method</opt> command line option takes precedence.
+ Note that some modules overwrite or allow overwriting of the
+ resampler to use.</p>
+diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
+index 2089058..7c43cee 100644
+--- a/src/daemon/daemon.conf.in
++++ b/src/daemon/daemon.conf.in
+@@ -54,6 +54,8 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; log-time = no
+ ; log-backtrace = 0
+
++# resample-method defaults to speex-float-1 on most architectures,
++# speex-fixed-1 on ARM
+ ; resample-method = speex-float-1
+ ; enable-remixing = yes
+ ; enable-lfe-remixing = no
+diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
+index a9f1b7d..38f0d9b 100644
+--- a/src/pulsecore/core.c
++++ b/src/pulsecore/core.c
+@@ -141,7 +141,11 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t
shared, size_t shm_size) {
+ c->disable_remixing = FALSE;
+ c->disable_lfe_remixing = FALSE;
+ c->deferred_volume = TRUE;
++#ifdef __arm__
++ c->resample_method = PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
++#else
+ c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
++#endif
+
+ for (j = 0; j < PA_CORE_HOOK_MAX; j++)
+ pa_hook_init(&c->hooks[j], c);
+diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
+index 5f8e9bd..30817cb 100644
+--- a/src/pulsecore/resampler.c
++++ b/src/pulsecore/resampler.c
+@@ -235,7 +235,11 @@ pa_resampler* pa_resampler_new(
+
+ if (method == PA_RESAMPLER_AUTO) {
+ #ifdef HAVE_SPEEX
++# ifdef __arm__
++ method = PA_RESAMPLER_SPEEX_FIXED_BASE + 1;
++# else
+ method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 1;
++# endif
+ #else
+ if (flags & PA_RESAMPLER_VARIABLE_RATE)
+ method = PA_RESAMPLER_TRIVIAL;
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..6e7c1f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-
+0001-Switch-the-default-resample-quality-to-1.patch
+0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
commit 15c1bc21fc55814ebda298e0bcb62caf9bc3573b
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 20:42:50 2012 +0100
debian/shlibs.local: Add libpulsecore to shlibs & update versions
diff --git a/debian/changelog b/debian/changelog
index dee4979..afc8901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,8 +33,9 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* Removed. All fixed upstream
+ * debian/shlibs.local: Add libpulsecore to shlibs & update versions
- -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:23:21 +0100
+ -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:41:58 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 4192d27..f1e095a 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1,2 @@
-libpulsecommon 2.1 libpulse0 (= ${binary:Version})
+libpulsecommon 2.99 libpulse0 (= ${binary:Version})
+libpulsecore 2.99 pulseaudio (= ${binary:Version})
commit 77b036fc99b7097137189a5fa62285d2f25f3811
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 20:24:14 2012 +0100
debian/pulse.conf: No longer need to load asound.conf and .asoundrc directly
diff --git a/debian/changelog b/debian/changelog
index 72e2bae..dee4979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,13 +26,15 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/{pulseaudio.install,apport-hook.py}: Install apport hook
* Split out the libpulsedsp into its own package
* debian/control: Bump cdbs build-depends
+ * debian/pulse.conf: No longer need to load asound.conf and .asoundrc
+ directly
* debian/control: Update-builddepends
* debian/patches/0001_man_page_typos.patch:
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* Removed. All fixed upstream
- -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:19:33 +0100
+ -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:23:21 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/pulse.conf b/debian/pulse.conf
index 2f8325f..0813d04 100644
--- a/debian/pulse.conf
+++ b/debian/pulse.conf
@@ -10,8 +10,6 @@ hook_func.pulse_load_if_running {
func pulse_load_if_running
files [
"/usr/share/alsa/pulse-alsa.conf"
- "/etc/asound.conf"
- "~/.asoundrc"
]
errors false
}
commit 48ec7b123cb44066e58787608c5b9bdb2e070998
Author: Sjoerd Simons <[email protected]>
Date: Sun Nov 25 20:20:03 2012 +0100
debian/control: Bump cdbs build-depends
diff --git a/debian/changelog b/debian/changelog
index f2b5914..72e2bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,13 +25,14 @@ pulseaudio (2.99.1-1) UNRELEASED; urgency=low
* debian/pulseaudio.install: Install module-switch-on-port-available
* debian/{pulseaudio.install,apport-hook.py}: Install apport hook
* Split out the libpulsedsp into its own package
+ * debian/control: Bump cdbs build-depends
* debian/control: Update-builddepends
* debian/patches/0001_man_page_typos.patch:
debian/patches/remove-analog-mono.patch
debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
* Removed. All fixed upstream
- -- Sjoerd Simons <[email protected]> Sat, 17 Nov 2012 15:34:20 +0100
+ -- Sjoerd Simons <[email protected]> Sun, 25 Nov 2012 20:19:33 +0100
pulseaudio (2.1-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d187aad..5219a2e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Pulseaudio maintenance team
<[email protected]
Uploaders: Sjoerd Simons <[email protected]>,
Martin-Ãric Racine <[email protected]>
Build-Depends: debhelper (>= 8.1.3),
- cdbs,
+ cdbs (>= 0.4.93),
dh-autoreconf,
intltool,
libasound2-dev (>= 1.0.19) [linux-any],
--
pulseaudio packaging
_______________________________________________
pkg-pulseaudio-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
