From 2f4f98818c77073e00d3f0942cddf7c9b45d1c2b Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Wed, 12 Aug 2015 19:39:15 +0900 Subject: [PATCH] [audio] update audio configuration files 1. sync emulator configuration with target 2. replace resampler (ffmpeg -> speex-fixed-3) 3. set log level as debug 4. disable module-sound-player (temporally) [Version] 0.2.13 [Profile] Common [Issue Type] Fix bug Change-Id: I315812d5ba83cd19ff805d041c544c9302ec4f65 --- mmfw-sysconf-simulator/etc/pulse/daemon.conf | 17 +++++----- mmfw-sysconf-simulator/etc/pulse/system.pa | 48 +++++++++++++++++++++------- mmfw-sysconf-target-n4/etc/pulse/daemon.conf | 4 +-- mmfw-sysconf-target-n4/etc/pulse/system.pa | 2 +- mmfw-sysconf-target-u3/etc/pulse/daemon.conf | 4 +-- mmfw-sysconf-target-u3/etc/pulse/system.pa | 2 +- packaging/mmfw-sysconf.spec | 2 +- 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/mmfw-sysconf-simulator/etc/pulse/daemon.conf b/mmfw-sysconf-simulator/etc/pulse/daemon.conf index 3a50f8b..b90a02f 100644 --- a/mmfw-sysconf-simulator/etc/pulse/daemon.conf +++ b/mmfw-sysconf-simulator/etc/pulse/daemon.conf @@ -16,15 +16,16 @@ # USA. ## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for -## more information. Default values a commented out. Use either ; or # for +## more information. Default values are commented out. Use either ; or # for ## commenting. -; daemonize = no +daemonize = yes ; fail = yes ; allow-module-loading = yes ; allow-exit = yes ; use-pid-file = yes -; system-instance = no +system-instance = yes +; local-server-type = user ; enable-shm = yes ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB ; lock-memory = no @@ -42,19 +43,19 @@ realtime-priority = 5 ; dl-search-path = (depends on architecture) ; load-default-script-file = yes -; default-script-file = +; default-script-file = /etc/pulse/default.pa -log-target = dlog-color -; log-level = notice +;log-target = dlog +log-level = debug ; log-meta = no ; log-time = no ; log-backtrace = 0 -resample-method = ffmpeg +resample-method = speex-fixed-3 ; enable-remixing = yes ; enable-lfe-remixing = no -; flat-volumes = yes +flat-volumes = no ; rlimit-fsize = -1 ; rlimit-data = -1 diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa index 0414409..5dbd97c 100755 --- a/mmfw-sysconf-simulator/etc/pulse/system.pa +++ b/mmfw-sysconf-simulator/etc/pulse/system.pa @@ -19,14 +19,28 @@ # This startup script is used only if PulseAudio is started in system # mode. +### Custom policy module to route between bt<=speaker +load-module module-policy +#load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 +#load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 fragment_size=8192 +#load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 fragment_size=8192 +#load-module module-alsa-source source_name=alsa_input.8.analog-stereo device=hw:0,8 mmap=0 +#load-module module-alsa-sink sink_name=alsa_output.1.analog-stereo device=hw:0,0 tsched_buffer_size=2048576 +#load-module module-alsa-sink sink_name=alsa_output.1.analog-stereo device=hw:0,0 fragment_size=8192 mmap=1 +#load-module module-alsa-sink sink_name=alsa_output.1.analog-stereo device=hw:0,1 fragment_size=8192 mmap=1 tsched=1 tsched_buffer_size=262144 fixed_latency_range=1 + ### Automatically load driver modules depending on the hardware available -.ifexists module-hal-detect.so -#load-module module-hal-detect -.else -### Alternatively use the static hardware detection module (for systems that -### lack HAL support) +#.ifexists module-udev-detect.so +#load-module module-udev-detect +#.else +### Use the static hardware detection module (for systems that lack udev/hal support) #load-module module-detect -.endif +#.endif + +### Sound Player module +#load-module module-sound-player + +load-module module-role-ducking global=1 volume=0 ### Load several protocols .ifexists module-esound-protocol-unix.so @@ -34,18 +48,26 @@ load-module module-esound-protocol-unix .endif load-module module-native-protocol-unix auth-anonymous=1 -load-module module-bluetooth-discover +load-module module-bluetooth-policy -### Custom policy module to route between bt<=speaker -load-module module-policy +load-module module-bluetooth-discover +#load-module module-bluetooth-discover enable_scmst=true ### Automatically restore the volume of streams and devices #load-module module-stream-restore #load-module module-device-restore -### Automatically restore the default sink/source when changed by the user during runtime +### 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 +.ifexists module-dbus-protocol.so +### If you want to allow TCP connections, set access to "remote" or "local,remote". +load-module module-dbus-protocol access=local +.endif + ### Automatically move streams to the default sink if the sink they are ### connected to dies, similar for sources load-module module-rescue-streams @@ -54,7 +76,7 @@ load-module module-rescue-streams load-module module-always-sink ### Automatically suspend sinks/sources that become idle for too long -load-module module-suspend-on-idle +load-module module-suspend-on-idle timeout=1 ### Enable positioned event sounds #load-module module-position-event-sounds @@ -62,5 +84,7 @@ load-module module-suspend-on-idle ### Set default source (not to use alsa_sink monitor which is index 0) #set-default-source alsa_input.0.analog-stereo -load-module module-remap-sink sink_name=mono_alsa master=alsa_output.0.analog-stereo channels=1 +load-module module-null-sink +#load-module module-remap-sink sink_name=mono_alsa master=alsa_output.1.analog-stereo channels=1 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav +load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav diff --git a/mmfw-sysconf-target-n4/etc/pulse/daemon.conf b/mmfw-sysconf-target-n4/etc/pulse/daemon.conf index 013ea2f..b90a02f 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/daemon.conf +++ b/mmfw-sysconf-target-n4/etc/pulse/daemon.conf @@ -46,12 +46,12 @@ realtime-priority = 5 ; default-script-file = /etc/pulse/default.pa ;log-target = dlog -;log-level = debug +log-level = debug ; log-meta = no ; log-time = no ; log-backtrace = 0 -resample-method = ffmpeg +resample-method = speex-fixed-3 ; enable-remixing = yes ; enable-lfe-remixing = no diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa index 6bfd3a8..5dbd97c 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/system.pa +++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa @@ -38,7 +38,7 @@ load-module module-policy #.endif ### Sound Player module -load-module module-sound-player +#load-module module-sound-player load-module module-role-ducking global=1 volume=0 diff --git a/mmfw-sysconf-target-u3/etc/pulse/daemon.conf b/mmfw-sysconf-target-u3/etc/pulse/daemon.conf index 013ea2f..b90a02f 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/daemon.conf +++ b/mmfw-sysconf-target-u3/etc/pulse/daemon.conf @@ -46,12 +46,12 @@ realtime-priority = 5 ; default-script-file = /etc/pulse/default.pa ;log-target = dlog -;log-level = debug +log-level = debug ; log-meta = no ; log-time = no ; log-backtrace = 0 -resample-method = ffmpeg +resample-method = speex-fixed-3 ; enable-remixing = yes ; enable-lfe-remixing = no diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa index 6bfd3a8..5dbd97c 100755 --- a/mmfw-sysconf-target-u3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa @@ -38,7 +38,7 @@ load-module module-policy #.endif ### Sound Player module -load-module module-sound-player +#load-module module-sound-player load-module module-role-ducking global=1 volume=0 diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 5262ebd..03aba6f 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -2,7 +2,7 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.12 +Version: 0.2.13 Release: 0 Group: Multimedia/Configuration License: Apache-2.0 -- 2.7.4