aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2014-10-13 16:20:40 +0300
committerHolger Behrens <holger.behrens@windriver.com>2014-10-17 17:29:14 +0200
commit76b5b3aa1a36a2687637132a1283dacc7a7baedc (patch)
tree06b96025647fbde9f7f76695dd1c7a7fc9864856
parentc7bd2f32b49d50618474dd21a5f874938a6ec482 (diff)
downloadmeta-ivi-76b5b3aa1a36a2687637132a1283dacc7a7baedc.tar.gz
meta-ivi-76b5b3aa1a36a2687637132a1283dacc7a7baedc.tar.bz2
meta-ivi-76b5b3aa1a36a2687637132a1283dacc7a7baedc.zip
pulseaudio: Add conf files specific for AM PoC
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Holger Behrens <holger.behrens@windriver.com>
-rwxr-xr-xmeta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/am_poc.pa62
-rw-r--r--meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/daemon_conf.patch23
-rw-r--r--meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend9
3 files changed, 93 insertions, 1 deletions
diff --git a/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/am_poc.pa b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/am_poc.pa
new file mode 100755
index 0000000..a5e090e
--- /dev/null
+++ b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/am_poc.pa
@@ -0,0 +1,62 @@
+.nofail
+
+.fail
+
+load-module module-null-sink
+load-module module-pipe-sink
+load-module module-loopback
+
+
+
+### Automatically restore the volume of streams and devices
+#load-module module-stream-restore
+#load-module module-card-restore
+
+### Automatically load driver modules depending on the hardware available
+#.ifexists module-udev-detect.so
+#load-module module-udev-detect
+#.else
+### Use the static hardware detection module (for systems that lack udev support)
+#load-module module-detect
+#.endif
+
+### Load several protocols
+#.ifexists module-esound-protocol-unix.so
+#load-module module-esound-protocol-unix
+#.endif
+#load-module module-native-protocol-unix
+load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+#load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+#load-module module-rescue-streams
+
+load-module module-alsa-sink sink_name=master device=hw:0,0
+load-module module-remap-sink sink_name="AlsaPrimary"
+load-module module-remap-sink sink_name="AlsaSecondary"
+
+#load-module module-jack-sink
+#load-module module-jack-source
+#load-module module-jackdbus-detect
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Modules to allow autoloading of filters (such as echo cancellation)
+### on demand. module-filter-heuristics tries to determine what filters
+### make sense, and module-filter-apply does the heavy-lifting of
+### loading modules and rerouting streams.
+load-module module-filter-heuristics
+load-module module-filter-apply
+
+#Make the specified sink (identified by its symbolic name) the default sink.
+set-default-sink null
+# Make the specified source (identified by its symbolic name) the default source.
+set-default-source null-monitor
+
diff --git a/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/daemon_conf.patch b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/daemon_conf.patch
new file mode 100644
index 0000000..e5696c7
--- /dev/null
+++ b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio/daemon_conf.patch
@@ -0,0 +1,23 @@
+Index: pulseaudio-5.0/src/daemon/daemon.conf.in
+===================================================================
+--- pulseaudio-5.0.orig/src/daemon/daemon.conf.in 2014-01-23 20:57:55.000000000 +0200
++++ pulseaudio-5.0/src/daemon/daemon.conf.in 2014-10-13 16:02:28.370170957 +0300
+@@ -90,3 +90,18 @@
+ ; enable-deferred-volume = yes
+ ; deferred-volume-safety-margin-usec = 8000
+ ; deferred-volume-extra-delay-usec = 0
++
++enable-shm=yes
++shm-size-bytes=8388608 #8MB # setting this 0 will use the system-default, usually 64 MiB
++exit-idle-time=-1
++high-priority=yes
++nice-level=-11
++realtime-scheduling=yes
++realtime-priority=5
++resample-method=trivial
++flat-volumes=no
++default-sample-format = s16le
++default-sample-rate = 44100
++default-sample-channels = 2
++default-fragment-size-msec = 3
++default-fragments = 8
diff --git a/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 2ff6c5d..c56bb05 100644
--- a/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-ivi-demo/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,3 +1,10 @@
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " file://client_conf.patch"
+SRC_URI_append = " file://client_conf.patch \
+ file://daemon_conf.patch \
+ file://am_poc.pa \
+"
+
+do_install_append() {
+ cp ${WORKDIR}/am_poc.pa ${D}/etc/pulse
+}