[TW2][Audio] Modification for TW2 Audio bring-up

Change-Id: Id1238ba456218ca87779dad1a72b5f061a66e743

diff --git a/mmfw-sysconf-target-tw2/etc/pulse/device-map.json b/mmfw-sysconf-target-tw2/etc/pulse/device-map.json
index 859cc76..9f8c7ff 100644 (file)
--- a/mmfw-sysconf-target-tw2/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-tw2/etc/pulse/device-map.json
@@ -1,11 +1,22 @@
 {
        "device-types":[
                {
+                       "device-type":"builtin-speaker",
+                       "playback-devices":{"normal":"alsa:0,0", "call-voice":"alsa:0,0"}
+               },
+               {
                        "device-type":"builtin-mic",
                        "capture-devices":{"normal":"alsa:0,0"}
                }
        ],
        "device-files":{
+               "playback-devices":[
+                       {
+                               "device-string":"alsa:0,0",
+                               "role":{"normal":"rate=48000 mmap=0"
+                               }
+                       },
+               ],
                "capture-devices":[
                        {
                                "device-string":"alsa:0,0",

diff --git a/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json
index dfb6d12..5f379ce 100644 (file)
--- a/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json
@@ -86,7 +86,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
@@ -95,7 +95,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -104,7 +104,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -113,7 +113,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -122,7 +122,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -131,7 +131,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -149,7 +149,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
@@ -158,7 +158,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt-a2dp"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -167,7 +167,7 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt-sco"],
+                       "avail-out-devices":["builtin-speaker","bt-sco"],
                        "avail-frameworks":["audio-io","tone-player","sound-manager"]
                },
                {
@@ -176,7 +176,7 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt-sco"],
+                       "avail-out-devices":["builtin-speaker","bt-sco"],
                        "avail-frameworks":["sound-manager"]
                },
                {
@@ -185,25 +185,7 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt-sco"],
-                       "avail-frameworks":["sound-manager"]
-               },
-               {
-                       "role":"radio",
-                       "priority" : 3,
-                       "route-type" : "auto",
-                       "volume-types":{"in":"none","out":"media"},
-                       "avail-in-devices":["none"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["sound-manager"]
-               },
-               {
-                       "role":"loopback",
-                       "priority" : 2,
-                       "route-type" : "manual",
-                       "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["none"],
-                       "avail-out-devices":["none"],
+                       "avail-out-devices":["builtin-speaker","bt-sco"],
                        "avail-frameworks":["sound-manager"]
                },
                {