diff options
Diffstat (limited to 'meta-rcar-gen3-adas')
4 files changed, 15 insertions, 159 deletions
diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/default.pa b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/default.pa deleted file mode 100644 index 8f1570f..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/default.pa +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. - -# This startup script is used only if PulseAudio is started per-user -# (i.e. not in system mode) - -.nofail - -### Load something into the sample cache -#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga -#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga -#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga -#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga - -.fail - -### Automatically restore the volume of streams and devices -load-module module-device-restore -load-module module-stream-restore -load-module module-card-restore - -### Automatically augment property information from .desktop files -### stored in /usr/share/application -load-module module-augment-properties - -### Should be after module-*-restore but before module-*-detect -load-module module-switch-on-port-available - -### Load audio drivers statically -### (it's probably better to not load these drivers manually, but instead -### use module-udev-detect -- see below -- for doing this automatically) -#load-module module-alsa-sink -#load-module module-alsa-source device=hw:0,0 -#load-module module-oss device="/dev/dsp" sink_name=output source_name=input -#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input -#load-module module-null-sink -#load-module module-pipe-sink - -### 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 - -### Automatically connect sink and source if JACK server is present -.ifexists module-jackdbus-detect.so -.nofail -load-module module-jackdbus-detect channels=2 -.fail -.endif - -### Automatically load driver modules for Bluetooth hardware -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover -.endif - -### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix - -### Network access (may be configured with paprefs, so leave this commented -### here if you plan to use paprefs) -#load-module module-esound-protocol-tcp -#load-module module-native-protocol-tcp -#load-module module-zeroconf-publish - -### Load the RTP receiver module (also configured via paprefs, see above) -#load-module module-rtp-recv - -### Load the RTP sender module (also configured via paprefs, see above) -#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" -#load-module module-rtp-send source=rtp.monitor - -### Load additional modules from GConf settings. This can be configured with the paprefs tool. -### Please keep in mind that the modules configured by paprefs might conflict with manually -### loaded modules. -.ifexists module-gconf.so -.nofail -load-module module-gconf -.fail -.endif - -### 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 - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Honour intended role device property -load-module module-intended-roles - -### Automatically suspend sinks/sources that become idle for too long -load-module module-suspend-on-idle - -### If autoexit on idle is enabled we want to make sure we only quit -### when no local session needs us anymore. -.ifexists module-console-kit.so -load-module module-console-kit -.endif -.ifexists module-systemd-login.so -load-module module-systemd-login -.endif - -### Enable positioned event sounds -load-module module-position-event-sounds - -### Cork music/video streams when a phone stream is active -load-module module-role-cork - -### 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 some devices default -#set-default-sink output -#set-default-source input diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi index b249767..e897b98 100644 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi +++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi @@ -3,7 +3,7 @@ SectionVerb { EnableSequence [ exec "echo Setting defaults for ak4613" - cdev "hw:0" + cdev "hw:ak4613" cset "name='DVC Out Playback Volume' 30%" cset "name='DVC In Capture Volume' 10%" ] @@ -20,11 +20,11 @@ SectionDevice."Headphone".0 { } EnableSequence [ - cdev "hw:0" + cdev "hw:ak4613" cset "name='DVC Out Playback Volume' 30%" ] DisableSequence [ - cdev "hw:0" + cdev "hw:ak4613" cset "name='DVC Out Playback Volume' 0%" ] } @@ -37,12 +37,12 @@ SectionDevice."Mic".0 { } EnableSequence [ - cdev "hw:0" + cdev "hw:ak4613" cset "name='DVC In Capture Volume' 10%" ] DisableSequence [ - cdev "hw:0" + cdev "hw:ak4613" cset "name='DVC In Capture Volume' 0%" ] } diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init index 4f0a03f..db8f965 100755 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init +++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init @@ -26,7 +26,7 @@ done case "$1" in start) echo "Starting pulseaudio" - start-stop-daemon -S -x pulseaudio -- -D --system --disallow-exit + start-stop-daemon -S -x pulseaudio -- -D --system --disallow-exit --log-level=3 --log-target=file:/var/log/pa.log ;; stop) diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa index 47ef8c3..963a7c9 100644 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa +++ b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa @@ -21,14 +21,18 @@ ## use static load order to prevent pulseaudio to auto probe MOST devices ## MOST drivers does not like how pulse probing it and crashes system -## PCM3168A card (Kingfisher only) -load-module module-alsa-sink sink_name=pcm3168a_output device=hw:pcm3168a format=s24-32le channels=8 rate=48000 channel_map=surround-71 -load-module module-alsa-source source_name=pcm3168a_input device=hw:pcm3168a format=s24-32le channels=8 rate=48000 channel_map=surround-71 + ## Onboard sound (All R-Car 3 boards) ## use ALSA card plugin to run UCM and initial controls setup +.fail load-module module-alsa-card device_id=ak4613 rate=48000 use_ucm=1 tsched=yes sink_name=ak4613_output source_name=ak4613_input + +## Kingfisher specific devices (may not present) +.nofail +## PCM3168A card (Kingfisher only) +load-module module-alsa-card device_id=pcm3168a sink_name=pcm3168a_output source_name=pcm3168a_input format=s24-32le rate=48000 ## Radio input (Kingfisher only) -load-module module-alsa-source source_name=radio device=hw:radio channels=2 rate=48000 +load-module module-alsa-card device_id=radio source_name=radio rate=48000 ## WL18xx PCM interface (Kingfisher only) load-module module-alsa-card device_id=wl18xx rate=48000 sink_name=bt_output source_name=bt_input @@ -72,6 +76,7 @@ load-module module-bluetooth-discover headset=auto set-default-sink ak4613_output set-default-source ak4613_input + # For Kingfisher board set default source and sink to multichannel soundcard set-default-sink pcm3168a_output set-default-source pcm3168a_input |