From cc37fc4bc6925e47ec1f8210c5f106952a45d7bf Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Wed, 30 Dec 2015 16:47:17 +0900 Subject: [PATCH] [target-tm1/audio] Modify device-map.json for support call-voice, add ringbacktone-call stream type to stream-map.json Change-Id: I676bd7ea8e44624d478aa4844c2ad490298f8240 Signed-off-by: Sangchul Lee --- mmfw-sysconf-target-tm1/etc/pulse/device-map.json | 14 ++++++++++---- mmfw-sysconf-target-tm1/etc/pulse/stream-map.json | 13 +++++++++++-- packaging/mmfw-sysconf.spec | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json index c771256..2aeda8b 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json +++ b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json @@ -5,14 +5,14 @@ "builtin" : true, "direction":["out"], "avail-condition":["pulse"], - "playback-devices":{"normal":"alsa:sprdphone,0"} + "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"} }, { "device-type":"builtin-receiver", "builtin" : true, "direction":["out"], "avail-condition":["pulse"], - "playback-devices":{"normal":"alsa:sprdphone,0"} + "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"} }, { "device-type":"builtin-mic", @@ -26,7 +26,7 @@ "builtin":false, "direction":["both","out"], "avail-condition":["pulse","dbus"], - "playback-devices":{"normal":"alsa:sprdphone,0"}, + "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"}, "capture-devices":{"normal":"alsa:sprdphone,0"} }, { @@ -49,7 +49,7 @@ "builtin":false, "direction":["both"], "avail-condition":["pulse","dbus"], - "playback-devices":{"normal":"alsa:sprdphone,0"}, + "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"}, "capture-devices":{"normal":"alsa:sprdphone,0"} }, { @@ -74,6 +74,12 @@ "role":{ "normal":"rate=44100", } + }, + { + "device-string":"alsa:VIRTUALAUDIOW,0", + "role":{ + "call-voice":"rate=16000 channels=1 tsched=0 alternate_rate=16000", + } } ], "capture-devices":[ diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json index 08732f0..432e861 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json @@ -119,6 +119,15 @@ "avail-out-devices":["audio-jack","bt","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, + { + "role":"ringbacktone-call", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"call"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","bt","builtin-receiver","builtin-speaker"], + "avail-frameworks":["wav-player","tone-player"], + }, { "role":"voip", "priority" : 5, @@ -135,7 +144,7 @@ "volume-types":{"in":"none","out":"call"}, "avail-in-devices":["builtin-mic","audio-jack","bt"], "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"], - "avail-frameworks":["sound-manager","tone-player"], + "avail-frameworks":["sound-manager"], }, { "role":"call-video", @@ -144,7 +153,7 @@ "volume-types":{"in":"none","out":"call"}, "avail-in-devices":["builtin-mic","audio-jack","bt"], "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"], - "avail-frameworks":["sound-manager","tone-player"], + "avail-frameworks":["sound-manager"], }, { "role":"radio", diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index f005f98..97694b9 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.39 +Version: 0.2.40 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0 -- 2.34.1