Marc-André Lureau [Mon, 28 Mar 2011 12:35:16 +0000 (15:35 +0300)]
bluetooth: fix set_volume_cb on sco over pcm
The current implementation is totally bogus, it cast the over_sink
userdata to the bluetooth-device userdata... It was failing nicely
because the previous code had a gentle safe-guard in u->profile ==
PROFILE_HSP, and u->profile was just random.
There is no easy way to associate additional data to a sink or
source. Two solutions seems possible: looking up loaded modules and
check which one was handling the sink/source, or using pa_shared. I
went for the second solution.
Marc-André Lureau [Mon, 28 Mar 2011 12:35:15 +0000 (15:35 +0300)]
bluetooth: use sco_sink/source to start with right state
Note from Tanu Kaskinen: I resolved some conflicts with newer upstream code, so
if this patch is broken, blame me..
Tanu Kaskinen [Mon, 28 Mar 2011 12:35:14 +0000 (15:35 +0300)]
bluetooth: Drop all "#ifdef NOKIA" directives.
The #ifdefs only added clutter. I don't see any reason to not compile the
SCO over PCM support in all the time.
Sean McNamara [Wed, 30 Mar 2011 17:41:02 +0000 (13:41 -0400)]
vala: ChannelMap has no destroy function.
Arun Raghavan [Wed, 30 Mar 2011 19:26:20 +0000 (00:56 +0530)]
bluetooth: Pull a2dp-codecs.h from BlueZ
This pulls a2dp-codecs.h from BlueZ which contains the capabilities
structures for SBC and MPEG. We currently have these manually added to
ipc.h, so pulling this header makes our files identical to upstream.
Tanu Kaskinen [Tue, 22 Mar 2011 10:23:19 +0000 (12:23 +0200)]
alsa-mixer: Check that the kernel driver returns consistent limits with both snd_mixer_selem_get_*_dB_range() and _ask_*_vol_dB().
The check is inspired by a driver that returned higher dB limit from
snd_mixer_selem_get_playback_dB_range() than what _ask_playback_vol_dB()
returned at maximum integer volume.
Tanu Kaskinen [Wed, 23 Mar 2011 10:03:43 +0000 (12:03 +0200)]
alsa-mixer: Make sure that SND_MIXER_SCHN_UNKNOWN isn't used when indexing e->masks.
SND_MIXER_SCHN_UNKNOWN is defined as -1, so that's not a good array index...
Tanu Kaskinen [Wed, 23 Mar 2011 12:52:48 +0000 (14:52 +0200)]
alsa-mixer: Make probing elements with more than two volume channels fail.
This is just a quick hack to prevent array overflow. Correct fix would be to
implement support for more channels.
Maarten Bosmans [Sat, 26 Mar 2011 16:15:43 +0000 (17:15 +0100)]
pactl: Add short output format for list action
Maarten Bosmans [Sat, 26 Mar 2011 16:15:42 +0000 (17:15 +0100)]
pactl: Separate stat and info actions
Maarten Bosmans [Sat, 26 Mar 2011 16:15:41 +0000 (17:15 +0100)]
pactl: Add subcommands to the list command
Maarten Bosmans [Sat, 26 Mar 2011 16:15:40 +0000 (17:15 +0100)]
pactl: Accept more volume specification formats
With this you can specify the volume with 6554, 10%, 0.001 or -60dB,
all resulting in the same volume change.
Tanu Kaskinen [Sun, 27 Mar 2011 20:00:26 +0000 (23:00 +0300)]
sink-input: Add volume_writable to pa_sink_input.
This is pretty cosmetic change; there's no actual functionality added.
Previously the volume_writable information was available through the
pa_sink_input_is_volume_writable() function, but I find it cleaner to have a
real variable.
The sink input introspection variable name was also changed from
read_only_volume to volume_writable for consistency.
Paul Menzel [Tue, 29 Mar 2011 09:49:52 +0000 (11:49 +0200)]
.gitignore: add `.tarball-version`
`.tarball-version` is created by `.git-version-gen`.
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Paul Menzel [Tue, 29 Mar 2011 10:14:27 +0000 (12:14 +0200)]
bluetooth: run `make update-sbc` to pull in build fix for thumb mode
This update pulls in commit
c495077c [1] to fix a build error.
commit
c495077cf8a8c37afd90875ec5a5b16b294be15e
Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
Date: Tue Mar 29 01:57:39 2011 +0300
sbc: better compatibility with ARM thumb/thumb2
ARM assembly optimizations fail to compile in thumb mode, but are fine
for thumb2. Update ifdefs in the code to make use of ARM assembly only
when it is safe and also make sure that no optimizations are missed
when compiling for thumb2.
The problem was reported by Paul Menzel:
https://tango.0pointer.de/pipermail/pulseaudio-discuss/2011-February/009022.html
This patch is tested with OpenEmbedded using `minimal-uclibc` for `MACHINE = "at91sam9260ek"`.
Note that changes to ipc.h from
8f3ef04b had to be manually reapplied.
[1] http://git.kernel.org/?p=bluetooth/bluez.git;a=commit;h=
c495077cf8a8c37afd90875ec5a5b16b294be15e
David Henningsson [Mon, 28 Mar 2011 13:16:12 +0000 (15:16 +0200)]
module-jack-sink/source: protect against null return in jack_get_ports
Just picking up a crash report from Ubuntu, here's the result.
--
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
From
934c52c79bb6faed56a64d6e15f9b285f687afee Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Mon, 28 Mar 2011 14:30:44 +0200
Subject: [PATCH] module-jack-sink/source: protect against null return in jack_get_ports
According to jack_get_ports documentation, it seems like returning NULL
is valid, and that it should be freed using jack_free.
Reported-by: Grayson Peddie
BugLink: http://bugs.launchpad.net/bugs/733424
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Arun Raghavan [Mon, 28 Mar 2011 11:09:53 +0000 (16:39 +0530)]
cork-on-phone: Handle sink-inputs with NULL sinks
It's possible that by the time we receive the unlink hook, the given
sink-input's sink is set to NULL. Handle this gracefully.
Tanu Kaskinen [Sun, 27 Mar 2011 18:35:03 +0000 (21:35 +0300)]
alsa-mixer: Get rid of a compiler warning.
On 64-bit systems LONG_MAX is greater than the largest possible value of a
uint32_t variable, which caused the compiler to warn about a comparison that is
always false. On 32-bit systems pa_atou() can return a value that will overflow
when assigned to e->volume_limit, which has type long, so the comparison was
necessary.
This dilemma is resolved by using pa_atol() instead of pa_atou().
Tanu Kaskinen [Sun, 27 Mar 2011 16:14:54 +0000 (19:14 +0300)]
.gitignore: Add ChangeLog to the ignore list.
Colin Guthrie [Sat, 26 Mar 2011 12:42:43 +0000 (12:42 +0000)]
vala: Fix path error in the last commit.
Alexander Kurtz [Sat, 26 Mar 2011 11:26:46 +0000 (11:26 +0000)]
vala: move GLibMainLoop class into separate file to fix linker errors
Vala uses the name of the *.vapi file to determine the libraries to link
against. Since the pa_glib_mainloop_*() functions are in a separate
library (libpulse-mainloop-glib.so) the corresponding objects in the
Vala bindings have to be in a separate *.vapi file.
If you are compiling an app without the GLib integration you could use:
$ valac --pkg=libpulse test.vala
but if you do use GLib you can use:
$ valac --pkg=libpulse-mainloop-glib test.vala
(libpulse is a dep of the libpulse-mainloop-glib so no need to specify
it explicitly)
Colin Guthrie [Sat, 26 Mar 2011 00:12:09 +0000 (00:12 +0000)]
bluetooth: Fix a double-free-esque error introduced in
8f3ef04b
Colin Guthrie [Fri, 25 Mar 2011 23:43:26 +0000 (23:43 +0000)]
dbus: Do not refcnt the core.
We should not call pa_core_ref() anywhere in the code. Doing so
will prevent proper daemon shutdown as the only call (in daemon/main.c)
to pa_core_unref() should always call free_core() and perform a normal
shutdown (i.e. unload all modules gracefully).
Colin Guthrie [Fri, 25 Mar 2011 23:03:31 +0000 (23:03 +0000)]
daemon: Fix regression introduced in
f1d1447e.
With Tanu's patch, the server no longer starts when a server is configured.
While this is sensible in most circumstances there is a corner case where
we still want to start.
In a typical X11 login, module-x11-publish will be loaded and will thus
set the PULSE_SERVER X11 property on the root window. This then hits the
check introduced in
f1d1447e and exits. If PA had previously crashed
(thus leaving behind it's X11 properties) then this means that we will not
autospawn nor even allow ourselves to be started manually until
pax11publish -r is run to clear out the X11 properties. This is obviously
not desirable.
This patch introduces a more in-depth check of the server. If it looks like
a local unix domain socket, then we do not exit straight away and instead
probe further. This should not pose any problems with e.g. remote SSH
usage as the DBus Machine ID is used in the server string.
Colin Guthrie [Fri, 25 Mar 2011 09:12:51 +0000 (09:12 +0000)]
daemon: Fix some more error paths in the double forking.
As spotted by Tanu Kaskinen:
The first process: daemon_pipe is not closed if the first fork() call
fails. Even if it doesn't fail, the first process never closes
daemon_pipe[0].
The second process: daemon_pipe[1] is not closed if anything fails
between the first and the second fork() call. Also, if the second fork
fails, then the finish section writes to daemon_pipe2[1], even though
only the third process should do that. Also, if anything fails between
the first and the second fork, then the second process never writes
anything to daemon_pipe[1]. I don't know what happens in the first
process in this case - does it get an error or does pa_loop_read() get
stuck.
The third process: No problems :)
Arun Raghavan [Fri, 25 Mar 2011 10:46:56 +0000 (16:16 +0530)]
build: Bump Orc dependency to 0.4.11
0.4.9 errors out at compile time, and might as well bump to 0.4.11 since
that's the version being tested with and has been around for a while
now. Thanks to Paul Menzel <paulepanter@users.sourceforge.net> for
pointing this out.
Sean McNamara [Fri, 25 Mar 2011 05:28:10 +0000 (01:28 -0400)]
vala: delegate FreeCb does not have a target.
Colin Guthrie [Thu, 24 Mar 2011 22:08:59 +0000 (22:08 +0000)]
po: Remove files no longer in the tree (and which didn't have any translations anyway).
File was removed in
c470680e
Alexander Kurtz [Thu, 24 Mar 2011 21:35:17 +0000 (21:35 +0000)]
vala: Some bugfixes for the vala bindings
1. PA uses Vala's "Posix" package (see line 23 of libpulse.vapi).
These dependencies have to be declared in the *.deps file.
2. Fix obvious copy/paste error.
3. Rename the parameter to match the C function. This simplifies
understanding what this parameter means.
4. According to the official documentation the "dev" parameter
for playback/capture streams on connection may be NULL and this
is the default. Change the method definition accordingly.
Colin Guthrie [Thu, 24 Mar 2011 21:27:55 +0000 (21:27 +0000)]
daemon: Fix regression with --start introduced with the double fork in
8e94f653
The previous commit intoduced a double fork which caused a more or less immediate
successful return prior to the hard work of actually starting a daemon.
This patch simply used pipe() to only signal our father when the daemon really
has finished starting.
Vincent Becker [Thu, 24 Mar 2011 10:35:02 +0000 (11:35 +0100)]
log: Correct bad function implementation
Replace wrong implementation of log to file in pa_daemon_conf_set_log_level to pa_daemon_conf_set_log_target
Tanu Kaskinen [Mon, 21 Mar 2011 13:08:35 +0000 (15:08 +0200)]
bluetooth: Get rid of warnings about unused stuff when building against a D-Bus version that doesn't have fd-passing support.
Tanu Kaskinen [Mon, 21 Mar 2011 13:08:34 +0000 (15:08 +0200)]
bluetooth: Don't log an error if an endpoint type is disabled.
It's perfectly normal for BlueZ to disable some endpoint types, so printing a
log message at error level isn't a good idea.
For facilitating an informative message in case some endpoint type is disabled,
the send_and_add_to_pending() function interface is also changed to be more
generic (the pa_bluetooth_device pointer is replaced with a void pointer).
Maarten Bosmans [Tue, 22 Mar 2011 15:02:24 +0000 (16:02 +0100)]
Move compile-time checks around pa_run_from_build_tree to core-util
To make the code cleaner and have the checks all in one place.
Maarten Bosmans [Tue, 22 Mar 2011 15:02:23 +0000 (16:02 +0100)]
win32: Simplify dl_search_path code
And add #include <sys/stat.h>, needed by the code introduced in
f7acd4bd.
Colin Guthrie [Thu, 24 Mar 2011 09:08:05 +0000 (09:08 +0000)]
Merge remote-tracking branch 'zonique/osx'
Daniel Mack [Sun, 20 Mar 2011 16:57:49 +0000 (17:57 +0100)]
osx: add routines for real-time thread scheduling
Code sniplets are based on examples provided by Apple. See
http://developer.apple.com/library/mac/#documentation/Darwin/Conceptual/KernelProgramming/scheduler/scheduler.html
Daniel Mack [Fri, 18 Mar 2011 14:53:38 +0000 (15:53 +0100)]
configure.ac: add --mac-universal directive for OS X
On a system with all depency libs built as multi-arch binaries, this
option can now be used to build fat Mach-O binaries for multiple
architectures.
Daniel Mack [Thu, 17 Mar 2011 11:40:26 +0000 (12:40 +0100)]
osx: add -headerpad_max_install_names to LDFLAGS
This is needed for sufficient padding of library names in linked
binaries.
Daniel Mack [Mon, 14 Mar 2011 13:05:04 +0000 (14:05 +0100)]
osx: re-order module locations
move all Mac OS X related modules to own location.
Daniel Mack [Mon, 14 Mar 2011 12:39:30 +0000 (13:39 +0100)]
module-coreaudio-detect: fix variable assignment in pa__done()
Do not dereference 'u' prior to its assignment.
Colin Guthrie [Sun, 20 Mar 2011 22:31:50 +0000 (22:31 +0000)]
echo-cancel: Fix warning/typo
Paul Menzel [Sun, 20 Mar 2011 22:01:13 +0000 (23:01 +0100)]
tunnel: Remove bogus `{`
Fix mistakes in:
commit
36e7f8a92e8b340dd4034a39a655ba93bcd41886
Author: Colin Guthrie <cguthrie@mandriva.org>
Date: Sun Mar 20 14:09:14 2011 +0000
tunnel: Fix tunnel streams with recent servers
Prompted by bug #750. Thanks to Emil Renner Berthing for the original
patch.
Colin Guthrie [Sun, 20 Mar 2011 14:09:14 +0000 (14:09 +0000)]
tunnel: Fix tunnel streams with recent servers
Prompted by bug #750. Thanks to Emil Renner Berthing for the original
patch.
Colin Guthrie [Sun, 20 Mar 2011 11:44:53 +0000 (11:44 +0000)]
bluetooth: Run 'make update-sbc'
Note that changes to ipc.h from
8f3ef04b had to be manually reapplied.
Colin Guthrie [Sun, 20 Mar 2011 12:05:25 +0000 (12:05 +0000)]
build-sys: Make update-sbc, update-reserve and update-rtkit work in OOT builds
Tanu Kaskinen [Thu, 17 Mar 2011 10:23:42 +0000 (12:23 +0200)]
alsa-mixer: Refactoring: merge element_mute_volume(), element_zero_volume() and element_apply_constant_volume() into a single function.
Tanu Kaskinen [Thu, 17 Mar 2011 10:23:41 +0000 (12:23 +0200)]
alsa-mixer: Implement constant volume.
This change makes it possible to configure an arbitrary constant volume for a
volume element in the path configuration, which is applied when the path is
selected. Note: this is only useful when the exact hardware and driver are
known beforehand.
Maarten Bosmans [Sat, 19 Mar 2011 15:26:47 +0000 (16:26 +0100)]
Get rid of some warnings
Mostly warnings about unused stuff.
Furthermore, the first hunk is a fix for the change in
177948a6.
Finally, comment in AEC_dtd was translated and the code simplified slightly.
CC module_bluetooth_device_la-module-bluetooth-device.lo
modules/bluetooth/module-bluetooth-device.c: In function ‘a2dp_process_render’:
modules/bluetooth/module-bluetooth-device.c:1335:30: warning: pointer targets in passing argument 6 of ‘sbc_encode’
differ in signedness [-Wpointer-sign]
../src/modules/bluetooth/sbc/sbc.h:92:9: note: expected ‘ssize_t *’ but argument is of type ‘size_t *’
CC module_rygel_media_server_la-module-rygel-media-server.lo
modules/module-rygel-media-server.c:383:13: warning: ‘append_property_dict_entry_object_array’ defined but not used [-Wunused-function]
CC module_echo_cancel_la-adrian-aec.lo
modules/echo-cancel/adrian-aec.h:360:15: warning: ‘AEC_getambient’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:368:14: warning: ‘AEC_setgain’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:374:14: warning: ‘AEC_setaes’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:377:16: warning: ‘AEC_max_dotp_xf_xf’ declared ‘static’ but never defined [-Wunused-function]
CC module_echo_cancel_la-module-echo-cancel.lo
modules/echo-cancel/module-echo-cancel.c: In function ‘time_callback’:
modules/echo-cancel/module-echo-cancel.c:266:12: warning: variable ‘fs’ set but not used [-Wunused-but-set-variable]
CC module-virtual-sink.lo
modules/module-virtual-sink.c: In function ‘sink_input_pop_cb’:
modules/module-virtual-sink.c:206:15: warning: variable ‘current_latency’ set but not used [-Wunused-but-set-variable]
Arun Raghavan [Sat, 19 Mar 2011 12:01:50 +0000 (17:31 +0530)]
daemon: Fix missing include - cpu-orc.h
Maarten Bosmans [Sat, 19 Mar 2011 12:59:16 +0000 (13:59 +0100)]
Get rid of some warnings: -Wunsafe-loop-optimizations
pulsecore/core-util.c: In function ‘pa_hexstr’:
pulsecore/core-util.c:1858: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
modules/alsa/alsa-mixer.c: In function ‘pa_alsa_decibel_fix_dump’:
modules/alsa/alsa-mixer.c:3678: warning: cannot optimize possibly infinite loops [-Wunsafe-loop-optimizations]
modules/alsa/alsa-mixer.c: In function ‘pa_alsa_path_set_new’:
modules/alsa/alsa-mixer.c:2640: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
Maarten Bosmans [Sat, 19 Mar 2011 12:59:15 +0000 (13:59 +0100)]
Get rid of some warnings: -Wunused-result
modules/module-default-device-restore.c: In function ‘load’:
modules/module-default-device-restore.c:67: warning: ignoring return value of ‘fgets’,
declared with attribute warn_unused_result [-Wunused-result]
modules/module-default-device-restore.c:88: warning: ignoring return value of ‘fgets’,
declared with attribute warn_unused_result [-Wunused-result]
pulsecore/authkey.c: In function ‘generate’:
pulsecore/authkey.c:58: warning: ignoring return value of ‘ftruncate’,
declared with attribute warn_unused_result [-Wunused-result]
pulsecore/core-util.c: In function ‘pa_make_secure_dir’:
pulsecore/core-util.c:261: warning: ignoring return value of ‘fchown’,
declared with attribute warn_unused_result [-Wunused-result]
Colin Guthrie [Sun, 20 Mar 2011 11:18:19 +0000 (11:18 +0000)]
Merge remote-tracking branch 'mkbosmans/mingw32-build'
Maarten Bosmans [Mon, 14 Mar 2011 09:51:11 +0000 (10:51 +0100)]
module-waveout: Fix record/playback args
Maarten Bosmans [Fri, 11 Mar 2011 14:41:29 +0000 (15:41 +0100)]
module-waveout: Move thread creation
Maarten Bosmans [Sat, 12 Mar 2011 18:41:07 +0000 (19:41 +0100)]
module-waveout: Query device for supported samplerate
Instead of using a fixed list list of supported rates,
ask the wave subsystem whether the rate can be used.
Maarten Bosmans [Tue, 15 Mar 2011 20:06:46 +0000 (21:06 +0100)]
Fix pa_rtclock_from_wallclock
The HAVE_CLOCK_GETTIME macro protects timespec and related functions, nothing of which is used in
pa_rtclock_from_wallclock. And silently just not converting was not the proper solution anyway.
Also add an assert in pulse/mainloop.c to report the integer overflow that was triggered by the wrong
pa_rtclock_from_wallclock. Without the assert, debugging was painful.
Maarten Bosmans [Tue, 1 Mar 2011 15:06:19 +0000 (16:06 +0100)]
Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available
Automatically use replacement function on platforms (win32) where not all arpa/inet.h is available natively.
Maarten Bosmans [Tue, 15 Mar 2011 11:30:42 +0000 (12:30 +0100)]
build: Protect some more variables by ifdefs
This avoids empty directories being created on builds without X11, ALSA, etc.
Maarten Bosmans [Sun, 27 Feb 2011 22:43:54 +0000 (23:43 +0100)]
build: copy instead of link pacat to other utils on win32
This is necessary as symlinks are not supported on Windows. Also use the $(EXEEXT) variable.
Maarten Bosmans [Sun, 27 Feb 2011 22:09:52 +0000 (23:09 +0100)]
Find modules and config files relative to the installed libraries.
Do not use replace %PULSE_ROOT% from the environment.
Vincent Becker [Fri, 18 Mar 2011 10:23:46 +0000 (11:23 +0100)]
log: Add a new log target to a file descriptor
This patch enables logging of text debug messages (pa_log feature) into a file or a device driver.
Example : pulseaudio --log-target=file:./mylog.txt
(Minor tweaks by Colin + Arun)
Maarten Bosmans [Fri, 18 Mar 2011 10:52:30 +0000 (11:52 +0100)]
Update PA_MODULE_USAGE to be in line with actual implementation
Colin Guthrie [Fri, 18 Mar 2011 12:02:10 +0000 (12:02 +0000)]
build-sys: Fix bluetooth update-sbc now that it's in a subfolder.
Colin Guthrie [Fri, 18 Mar 2011 11:47:06 +0000 (11:47 +0000)]
build-sys: Whitespace changes
This just makes some of the bluetooth stuff a little clearer and
standardises on two-tab indents as this seems most common.
Also added two headers to the bluetooth sbc source that were missing.
Colin Guthrie [Fri, 18 Mar 2011 10:01:12 +0000 (10:01 +0000)]
bluetooth: Fix build errors relating to SBC
Daniel Mack [Mon, 14 Mar 2011 14:59:25 +0000 (15:59 +0100)]
alsa: Add two more ALSA audio card profiles
This adds profiles for Native Instruments recently announced
"Trator Audio 6" and "Traktor Audio 10".
Maarten Bosmans [Mon, 14 Mar 2011 15:27:03 +0000 (16:27 +0100)]
Make pulse compile with clang
This fixes the checking of supported compiler flags and the following error message for svolume_mmx:
pulsecore/svolume_mmx.c:157:76: error: invalid use of a cast in a inline asm context requiring an l-value:
remove the cast or build with -fheinous-gnu-extensions
: "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
~~~~~~~~~~~~^~~~~~~
Maarten Bosmans [Sat, 12 Mar 2011 18:45:02 +0000 (19:45 +0100)]
Fix up some double spaces
Maarten Bosmans [Wed, 16 Mar 2011 09:47:20 +0000 (10:47 +0100)]
build-sys: Flip default to no git pull on make dist
Colin Guthrie [Fri, 18 Mar 2011 00:10:27 +0000 (00:10 +0000)]
Merge remote-tracking branch 'vudentz/master'
Maarten Bosmans [Sun, 27 Feb 2011 08:53:59 +0000 (09:53 +0100)]
module-waveout: Add device_name parameter
Also use the name in the source/sink description.
Based on a patch by srirams, from github.
Siarhei Siamashka [Mon, 14 Mar 2011 18:37:42 +0000 (15:37 -0300)]
sbc: add iwmmxt optimization for sbc for pxa series cpu
Benchmarked on ARM PXA platform:
=== Before (4 bands) ====
$ time ./sbcenc_orig -s 4 long.au > /dev/null
real 0m 2.44s
user 0m 2.39s
sys 0m 0.05s
=== After (4 bands) ====
$ time ./sbcenc -s 4 long.au > /dev/null
real 0m 1.59s
user 0m 1.49s
sys 0m 0.10s
=== Before (8 bands) ====
$ time ./sbcenc_orig -s 8 long.au > /dev/null
real 0m 4.05s
user 0m 3.98s
sys 0m 0.07s
=== After (8 bands) ====
$ time ./sbcenc -s 8 long.au > /dev/null
real 0m 1.48s
user 0m 1.41s
sys 0m 0.06s
=== Before (a2dp usage) ====
$ time ./sbcenc_orig -b53 -s8 -j long.au > /dev/null
real 0m 4.51s
user 0m 4.41s
sys 0m 0.10s
=== After (a2dp usage) ====
$ time ./sbcenc -b53 -s8 -j long.au > /dev/null
real 0m 2.05s
user 0m 1.99s
sys 0m 0.06s
Siarhei Siamashka [Mon, 14 Mar 2011 18:35:03 +0000 (15:35 -0300)]
sbc: ARMv6 optimized version of analysis filter for SBC encoder
The optimized filter gets enabled when the code is compiled
with -mcpu=/-march options set to target the processors which
support ARMv6 instructions. This code is also disabled when
NEON is used (which is a lot better alternative). For additional
safety ARM EABI is required and thumb mode should not be used.
Benchmarks from ARM11:
== 8 subbands ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m 35.65s
user 0m 34.17s
sys 0m 1.28s
$ time ./sbcenc.armv6 -b53 -s8 -j test.au > /dev/null
real 0m 17.29s
user 0m 15.47s
sys 0m 0.67s
== 4 subbands ==
$ time ./sbcenc -b53 -s4 -j test.au > /dev/null
real 0m 25.28s
user 0m 23.76s
sys 0m 1.32s
$ time ./sbcenc.armv6 -b53 -s4 -j test.au > /dev/null
real 0m 18.64s
user 0m 15.78s
sys 0m 2.22s
Siarhei Siamashka [Mon, 14 Mar 2011 18:36:07 +0000 (15:36 -0300)]
sbc: added "cc" to the clobber list of mmx inline assembly
In the case of scale factors calculation optimizations, the inline
assembly code has instructions which update flags register, but
"cc" was not mentioned in the clobber list. When optimizing code,
gcc theoretically is allowed to do a comparison before the inline
assembly block, and a conditional branch after it which would lead
to a problem if the flags register gets clobbered. While this is
apparently not happening in practice with the current versions of
gcc, the clobber list needs to be corrected.
Regarding the other inline assembly blocks. While most likely it
is actually unnecessary based on quick review, "cc" is also added
there to the clobber list because it should have no impact on
performance in practice. It's kind of cargo cult, but relieves
us from the need to track the potential updates of flags register
in all these places.
Siarhei Siamashka [Mon, 14 Mar 2011 18:31:30 +0000 (15:31 -0300)]
sbc: faster 'sbc_calculate_bits' function
By using SBC_ALWAYS_INLINE trick, the implementation of 'sbc_calculate_bits'
function is split into two branches, each having 'subband' variable value
known at compile time. It helps the compiler to generate more optimal code
by saving at least one extra register, and also provides more obvious
opportunities for loops unrolling.
Benchmarked on ARM Cortex-A8:
== Before: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m3.989s
user 0m3.602s
sys 0m0.391s
samples % image name symbol name
26057 32.6128 sbcenc sbc_pack_frame
20003 25.0357 sbcenc sbc_analyze_4b_8s_neon
14220 17.7977 sbcenc sbc_calculate_bits
8498 10.6361 no-vmlinux /no-vmlinux
5300 6.6335 sbcenc sbc_calc_scalefactors_j_neon
3235 4.0489 sbcenc sbc_enc_process_input_8s_be_neon
2172 2.7185 sbcenc sbc_encode
== After: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m3.652s
user 0m3.195s
sys 0m0.445s
samples % image name symbol name
26207 36.0095 sbcenc sbc_pack_frame
19820 27.2335 sbcenc sbc_analyze_4b_8s_neon
8629 11.8566 no-vmlinux /no-vmlinux
6988 9.6018 sbcenc sbc_calculate_bits
5094 6.9994 sbcenc sbc_calc_scalefactors_j_neon
3351 4.6044 sbcenc sbc_enc_process_input_8s_be_neon
2182 2.9982 sbcenc sbc_encode
Siarhei Siamashka [Mon, 14 Mar 2011 18:29:38 +0000 (15:29 -0300)]
sbc: slightly faster 'sbc_calc_scalefactors_neon'
Previous variant was basically derived from C and MMX implementations.
Now new variant makes use of 'vmax' instruction, which is available in
NEON and can do this job faster. The same method for calculating scale
factors is also used in 'sbc_calc_scalefactors_j_neon'.
Benchmarked without joint stereo on ARM Cortex-A8:
== Before: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m3.851s
user 0m3.375s
sys 0m0.469s
samples % image name symbol name
26260 34.2672 sbcenc sbc_pack_frame
20013 26.1154 sbcenc sbc_analyze_4b_8s_neon
13796 18.0027 sbcenc sbc_calculate_bits
8388 10.9457 no-vmlinux /no-vmlinux
3229 4.2136 sbcenc sbc_enc_process_input_8s_be_neon
2408 3.1422 sbcenc sbc_calc_scalefactors_neon
2093 2.7312 sbcenc sbc_encode
== After: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m3.796s
user 0m3.344s
sys 0m0.438s
samples % image name symbol name
26582 34.8726 sbcenc sbc_pack_frame
20032 26.2797 sbcenc sbc_analyze_4b_8s_neon
13808 18.1146 sbcenc sbc_calculate_bits
8374 10.9858 no-vmlinux /no-vmlinux
3187 4.1810 sbcenc sbc_enc_process_input_8s_be_neon
2027 2.6592 sbcenc sbc_encode
1766 2.3168 sbcenc sbc_calc_scalefactors_neon
Siarhei Siamashka [Mon, 14 Mar 2011 18:28:31 +0000 (15:28 -0300)]
sbc: ARM NEON optimizations for input permutation in SBC encoder
Using SIMD optimizations for 'sbc_enc_process_input_*' functions provides
a modest, but consistent speedup in all SBC encoding cases.
Benchmarked on ARM Cortex-A8:
== Before: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m4.389s
user 0m3.969s
sys 0m0.422s
samples % image name symbol name
26234 29.9625 sbcenc sbc_pack_frame
20057 22.9076 sbcenc sbc_analyze_4b_8s_neon
14306 16.3393 sbcenc sbc_calculate_bits
9866 11.2682 sbcenc sbc_enc_process_input_8s_be
8506 9.7149 no-vmlinux /no-vmlinux
5219 5.9608 sbcenc sbc_calc_scalefactors_j_neon
2280 2.6040 sbcenc sbc_encode
661 0.7549 libc-2.10.1.so memcpy
== After: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m3.989s
user 0m3.602s
sys 0m0.391s
samples % image name symbol name
26057 32.6128 sbcenc sbc_pack_frame
20003 25.0357 sbcenc sbc_analyze_4b_8s_neon
14220 17.7977 sbcenc sbc_calculate_bits
8498 10.6361 no-vmlinux /no-vmlinux
5300 6.6335 sbcenc sbc_calc_scalefactors_j_neon
3235 4.0489 sbcenc sbc_enc_process_input_8s_be_neon
2172 2.7185 sbcenc sbc_encode
Siarhei Siamashka [Mon, 14 Mar 2011 18:27:30 +0000 (15:27 -0300)]
sbc: ARM NEON optimized joint stereo processing in SBC encoder
Improves SBC encoding performance when joint stereo is used, which
is a typical A2DP configuration.
Benchmarked on ARM Cortex-A8:
== Before: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m5.239s
user 0m4.805s
sys 0m0.430s
samples % image name symbol name
26083 25.0856 sbcenc sbc_pack_frame
21548 20.7240 sbcenc sbc_calc_scalefactors_j
19910 19.1486 sbcenc sbc_analyze_4b_8s_neon
14377 13.8272 sbcenc sbc_calculate_bits
9990 9.6080 sbcenc sbc_enc_process_input_8s_be
8667 8.3356 no-vmlinux /no-vmlinux
2263 2.1765 sbcenc sbc_encode
696 0.6694 libc-2.10.1.so memcpy
== After: ==
$ time ./sbcenc -b53 -s8 -j test.au > /dev/null
real 0m4.389s
user 0m3.969s
sys 0m0.422s
samples % image name symbol name
26234 29.9625 sbcenc sbc_pack_frame
20057 22.9076 sbcenc sbc_analyze_4b_8s_neon
14306 16.3393 sbcenc sbc_calculate_bits
9866 11.2682 sbcenc sbc_enc_process_input_8s_be
8506 9.7149 no-vmlinux /no-vmlinux
5219 5.9608 sbcenc sbc_calc_scalefactors_j_neon
2280 2.6040 sbcenc sbc_encode
661 0.7549 libc-2.10.1.so memcpy
Siarhei Siamashka [Mon, 14 Mar 2011 18:21:53 +0000 (15:21 -0300)]
sbc: fix signedness of parameters
The written parameter of sbc_encode can be negative so it should be
ssize_t instead of size_t.
Siarhei Siamashka [Mon, 14 Mar 2011 18:18:46 +0000 (15:18 -0300)]
sbc: ARM NEON optimization for scale factors calculation
Improves SBC encoding performance when joint stereo is not used.
Benchmarked on ARM Cortex-A8:
== Before: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m4.756s
user 0m4.313s
sys 0m0.438s
samples % image name symbol name
2569 27.6296 sbcenc sbc_pack_frame
1934 20.8002 sbcenc sbc_analyze_4b_8s_neon
1386 14.9064 sbcenc sbc_calculate_bits
1221 13.1319 sbcenc sbc_calc_scalefactors
996 10.7120 sbcenc sbc_enc_process_input_8s_be
878 9.4429 no-vmlinux /no-vmlinux
204 2.1940 sbcenc sbc_encode
56 0.6023 libc-2.10.1.so memcpy
== After: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m4.220s
user 0m3.797s
sys 0m0.422s
samples % image name symbol name
2563 31.3249 sbcenc sbc_pack_frame
1892 23.1239 sbcenc sbc_analyze_4b_8s_neon
1368 16.7196 sbcenc sbc_calculate_bits
961 11.7453 sbcenc sbc_enc_process_input_8s_be
836 10.2176 no-vmlinux /no-vmlinux
262 3.2022 sbcenc sbc_calc_scalefactors_neon
199 2.4322 sbcenc sbc_encode
49 0.5989 libc-2.10.1.so memcpy
Siarhei Siamashka [Mon, 14 Mar 2011 18:17:31 +0000 (15:17 -0300)]
sbc: MMX optimization for scale factors calculation
Improves SBC encoding performance when joint stereo is not used.
Benchmarked on Pentium-M:
== Before: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m1.439s
user 0m1.336s
sys 0m0.104s
samples % image name symbol name
8642 33.7473 sbcenc sbc_pack_frame
5873 22.9342 sbcenc sbc_analyze_4b_8s_mmx
4435 17.3188 sbcenc sbc_calc_scalefactors
4285 16.7331 sbcenc sbc_calculate_bits
1942 7.5836 sbcenc sbc_enc_process_input_8s_be
322 1.2574 sbcenc sbc_encode
== After: ==
$ time ./sbcenc -b53 -s8 test.au > /dev/null
real 0m1.319s
user 0m1.220s
sys 0m0.084s
samples % image name symbol name
8706 37.9959 sbcenc sbc_pack_frame
5740 25.0513 sbcenc sbc_analyze_4b_8s_mmx
4307 18.7972 sbcenc sbc_calculate_bits
1937 8.4537 sbcenc sbc_enc_process_input_8s_be
1801 7.8602 sbcenc sbc_calc_scalefactors_mmx
307 1.3399 sbcenc sbc_encode
Siarhei Siamashka [Mon, 14 Mar 2011 18:16:30 +0000 (15:16 -0300)]
sbc: new 'sbc_calc_scalefactors_j' function added to sbc primitives
The code for scale factors calculation with joint stereo support has
been moved to a separate function. It can get platform-specific
SIMD optimizations later for best possible performance.
But even this change in C code improves performance because of the
use of __builtin_clz() instead of loops similar to what was done
to sbc_calc_scalefactors earlier. Also technically it does loop
unrolling by processing two channels at once, which might be either
good or bad for performance (if the registers pressure is increased
and more data is spilled to memory). But the benchmark from 32-bit
x86 system (pentium-m) shows that it got clearly faster:
$ time ./sbcenc.old -b53 -s8 -j test.au > /dev/null
real 0m1.868s
user 0m1.808s
sys 0m0.048s
$ time ./sbcenc.new -b53 -s8 -j test.au > /dev/null
real 0m1.742s
user 0m1.668s
sys 0m0.064s
Gustavo F. Padovan [Mon, 14 Mar 2011 18:09:50 +0000 (15:09 -0300)]
sbc: Fix redundant null check on calling free()
Issues found by smatch static check: http://smatch.sourceforge.net/
Siarhei Siamashka [Mon, 14 Mar 2011 18:07:38 +0000 (15:07 -0300)]
sbc: added saturated clipping of decoder output to 16-bit
This prevents overflows and audible artefacts for the audio files which
originally had loudness maximized. Music from audio CD disks is an
example of such files, see http://en.wikipedia.org/wiki/Loudness_war
Siarhei Siamashka [Mon, 14 Mar 2011 18:01:19 +0000 (15:01 -0300)]
sbc: ensure 16-byte buffer position alignment for 4 subbands encoding
Buffer position in X array was not always 16-bytes aligned.
Strict 16-byte alignment is strictly required for powerpc altivec
simd optimizations because altivec does not have support for
unaligned vector loads at all.
Luiz Augusto von Dentz [Mon, 14 Mar 2011 17:46:10 +0000 (14:46 -0300)]
build: move sbc related files to its own directory
This should make it easier to apply patches from BlueZ which also uses
sbc subdir for this files.
Luiz Augusto von Dentz [Fri, 14 Jan 2011 12:18:08 +0000 (14:18 +0200)]
bluetooth: add proper handling for bluetooth.nrec property
NREC stands for Noise Reduction and Echo Cancelation, it can be changed
at any point by the headset.
When set to "1" indicates that those algorithms shall be enabled by
default and "0" means the headset probably have them active so they
should be disabled in PA side.
Luiz Augusto von Dentz [Thu, 23 Dec 2010 13:24:39 +0000 (15:24 +0200)]
bluetooth: fix a2dp_process_push
Use minimum bitpool configured to get the maximum block_size possible,
also remove checks for how much has been written when decoding sbc frames
since the block size may change due to bitpool changes.
Luiz Augusto von Dentz [Thu, 23 Dec 2010 11:13:44 +0000 (13:13 +0200)]
bluetooth: reduce bitpool if audio start skipping
When audio skips it could be that there is some bandwidth limitation in
the link e.g. headset doesn't support EDR (< 2.0), and by reducing
the bitpool it may find a better rate that either prevent the skips
completely or at least reduce them.
Luiz Augusto von Dentz [Thu, 2 Dec 2010 12:11:13 +0000 (14:11 +0200)]
bluetooth: handle Acquire API change
Acquire now return input and output MTU of the file descriptor so it is
no longer necessary to get those after acquiring the fd, which less round
trips and faster response time when switching profiles.
Colin Guthrie [Mon, 14 Mar 2011 16:31:00 +0000 (16:31 +0000)]
build-sys: No need to create folder for echo-cancel module.
The ORCC stage does this anyway (and this was buggy anyway as it had an extra
'src/' prefix so never worked properly when it was introduced in d6cdd80).
Thanks to Maarten Bosmans for pointing it out.
Colin Guthrie [Thu, 10 Mar 2011 11:11:51 +0000 (11:11 +0000)]
cork-on-phone: Only cork (and subsequently uncork) streams that are not already corked.
Although by "cork" I really mean "cork+mute" as that's what the module
does.
If e.g. Rhythmbox is paused when a phone call comes in, the current
stream state will be corked and thus we should not track it for future
uncorking when the phone call ends.
Likewise if the stream is just muted (manually) we will not take any
action either when the phone stream is seen first, nor when it
disappears.
Also add some additional debug messages.
Maarten Bosmans [Wed, 9 Mar 2011 09:00:21 +0000 (10:00 +0100)]
build: Use silent rules for generating files
Maarten Bosmans [Wed, 9 Mar 2011 09:00:20 +0000 (10:00 +0100)]
Fixup #include directives according to Coding Style
Use #include "header.h" if functionality of header.h is implemented
and #include <header.h> if functionality of header.h is used.
Maarten Bosmans [Wed, 2 Mar 2011 11:41:26 +0000 (12:41 +0100)]
Fix up according to Coding Style
Only whitespace changes in here
Tanu Kaskinen [Fri, 11 Mar 2011 11:41:28 +0000 (13:41 +0200)]
alsa-mixer: When figuring out the max_dB of a path, use only channels that are used by the path elements.
Without this, p->max_dB could never be less than 0 dB, because the loop at the
end of pa_alsa_path_probe() would reset p->max_dB to 0 as soon as the loop
encountered a channel that wasn't touched by any element.
There was a similar issue for p->min_dB too (it could never be more than 0 dB),
which is also fixed by this patch.
Tanu Kaskinen [Fri, 11 Mar 2011 11:40:51 +0000 (13:40 +0200)]
alsa-mixer: Implement support for setting element specific upper limits for volume.
This feature is mainly useful in embedded systems that have built-in speakers.
In such situations the full audio path is known beforehand, so it's possible to
know what is the maximum sensible volume, and any higher volume can be
disabled.
The volume limit is set in path configuration files in the [Element] section,
using option "volume-limit". The value is the desired maximum volume step of
the volume element.
Tanu Kaskinen [Fri, 11 Mar 2011 11:40:34 +0000 (13:40 +0200)]
dbus: Always accept mono volumes when setting device or stream volume.
pa_sink_set_volume() and friends accept mono volumes too, so no need to impose
unneeded restrictions in the D-Bus API.
Tanu Kaskinen [Fri, 11 Mar 2011 11:40:20 +0000 (13:40 +0200)]
dbusiface-stream: Fix crash when there's no resampling used.