[Audio][RPI3] Update stream-map/device-map json properly for RPI3

[Version] 0.2.113
[Profile] Common
[Issue Type] Enhancement

Change-Id: I5a020bc212534762c1f54493d400b7b611513ddd

diff --git a/mmfw-sysconf-target-rpi3/etc/pulse/device-map.json b/mmfw-sysconf-target-rpi3/etc/pulse/device-map.json
index f7c7f0e..d818cd0 100644 (file)
--- a/mmfw-sysconf-target-rpi3/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-rpi3/etc/pulse/device-map.json
@@ -2,42 +2,14 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "playback-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"builtin-receiver",
-                       "playback-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"builtin-mic",
-                       "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"audio-jack",
-                       "playback-devices":{"normal":"alsa:0,0"},
-                       "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"hdmi",
-                       "playback-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"bt-sco",
-                       "playback-devices":{"normal":"alsa:0,0"},
-                       "capture-devices":{"normal":"alsa:0,0"}
+                       "playback-devices":{"normal":"alsa:1,0"}
                }
        ],
        "device-files":{
                "playback-devices":[
                        {
-                               "device-string":"alsa:0,0",
-                               "role":{"normal":"rate=44100"}
-                       }
-               ],
-               "capture-devices":[
-                       {
-                               "device-string":"alsa:0,0",
-                               "role":{"normal":"rate=44100"}
+                               "device-string":"alsa:1,0",
+                               "role":{"normal":"mmap=0 tsched=0 rate=44100"}
                        }
                ]
        }

diff --git a/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json b/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json
index 3b74807..0226c89 100644 (file)
--- a/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json
@@ -85,8 +85,8 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "avail-in-devices":["audio-jack","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-in-devices":["usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "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":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "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":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "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":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "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":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "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":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
@@ -139,7 +139,7 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
+                       "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"]
                },
@@ -148,99 +148,9 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"]
-               },
-               {
-                       "role":"ringtone-voip",
-                       "priority" : 5,
-                       "route-type" : "auto-all",
-                       "volume-types":{"in":"none","out":"ringtone"},
-                       "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
-               },
-               {
-                       "role":"ringtone-call",
-                       "priority" : 6,
-                       "route-type" : "auto-all",
-                       "volume-types":{"in":"none","out":"ringtone"},
-                       "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
-               },
-               {
-                       "role":"voip",
-                       "priority" : 5,
-                       "route-type" : "manual",
-                       "volume-types":{"in":"none","out":"voip"},
-                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"]
-               },
-               {
-                       "role":"call-voice",
-                       "priority" : 6,
-                       "route-type" : "manual",
-                       "volume-types":{"in":"none","out":"call"},
-                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
-                       "avail-frameworks":["sound-manager"]
-               },
-               {
-                       "role":"call-video",
-                       "priority" : 6,
-                       "route-type" : "manual",
-                       "volume-types":{"in":"none","out":"call"},
-                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","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":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"]
-               },
-               {
-                       "role":"loopback",
-                       "priority" : 2,
-                       "route-type" : "manual",
-                       "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["audio-jack","usb-audio"],
-                       "avail-frameworks":["sound-manager"]
-               },
-               {
-                       "role":"loopback-mirroring",
-                       "priority" : 3,
-                       "route-type" : "auto",
-                       "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"]
                },
-               {
-                       "role":"ext-media",
-                       "priority" : 3,
-                       "route-type" : "manual-ext",
-                       "volume-types":{"in":"none","out":"media"},
-                       "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["bt-a2dp","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
-               },
-               {
-                       "role":"solo",
-                       "priority" : 2,
-                       "route-type" : "auto",
-                       "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
-                       "avail-frameworks":["wav-player","tone-player"]
-               }
        ]
 }

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 14e164f..64b92e4 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -1,6 +1,6 @@
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.112
+Version:    0.2.113
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1 and Apache-2.0