[all/audio] modify stream-map.json (add master volume and reorganize it)

[target/resource] add video_decoder resource

Change-Id: I4a76f034814572d4f4b7415222848017f57cdcb4

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index 27df234308df855c6ae2f4e222e78118bbbd9b0b..6ae8cae707224a9071cb19010cd22bfb64e075a8 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
@@ -1,11 +1,48 @@
 {
+       "volumes":[
+               {
+                       "type":"master",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"media",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"system",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"alarm",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"notification",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voice",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"ringtone",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voip",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"call",
+                       "is-hal-volume":0,
+               },
+       ],
        "streams":[
                {
                        "role":"media",
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -15,7 +52,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -25,7 +61,6 @@
                        "priority" : 4,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -35,7 +70,6 @@
                        "priority" : 3,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -45,7 +79,6 @@
                        "priority" : 4,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -55,7 +88,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -65,7 +97,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
@@ -75,7 +106,6 @@
                        "priority" : 5,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -85,7 +115,6 @@
                        "priority" : 6,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -95,7 +124,6 @@
                        "priority" : 5,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["audio-io","tone-player"],
@@ -105,7 +133,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -115,7 +142,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -125,7 +151,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker","audio-jack"],
                        "avail-frameworks":["sound-manager"],
@@ -135,7 +160,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],

diff --git a/mmfw-sysconf-target-n4/etc/murphy/murphy.lua b/mmfw-sysconf-target-n4/etc/murphy/murphy.lua
index 1fae83118ca0ac3ef24b6099b00895625f8192d3..abca530e2bbfd9fa0da2bed80232e72911f78292 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/murphy/murphy.lua
+++ b/mmfw-sysconf-target-n4/etc/murphy/murphy.lua
@@ -77,6 +77,12 @@ resource.class {
      sync_release = true
 }
 
+resource.class {
+     name = "video_decoder",
+     shareable = false,
+     sync_release = true
+}
+
 resource.class {
      name = "camera",
      shareable = false,

diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index 27df234308df855c6ae2f4e222e78118bbbd9b0b..b94c6fa5cc28f3369a8547b7eea77b536867ea96 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -1,11 +1,48 @@
 {
+       "volumes":[
+               {
+                       "type":"master",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"media",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"system",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"alarm",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"notification",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voice",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"ringtone",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voip",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"call",
+                       "is-hal-volume":1,
+               },
+       ],
        "streams":[
                {
                        "role":"media",
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -15,7 +52,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -25,7 +61,6 @@
                        "priority" : 4,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -35,7 +70,6 @@
                        "priority" : 3,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -45,7 +79,6 @@
                        "priority" : 4,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -55,7 +88,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -65,7 +97,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
@@ -75,7 +106,6 @@
                        "priority" : 5,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -85,7 +115,6 @@
                        "priority" : 6,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -95,7 +124,6 @@
                        "priority" : 5,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["audio-io","tone-player"],
@@ -105,7 +133,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -115,7 +142,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -125,7 +151,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker","audio-jack"],
                        "avail-frameworks":["sound-manager"],
@@ -135,7 +160,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],

diff --git a/mmfw-sysconf-target-u3/etc/murphy/murphy.lua b/mmfw-sysconf-target-u3/etc/murphy/murphy.lua
index 1fae83118ca0ac3ef24b6099b00895625f8192d3..abca530e2bbfd9fa0da2bed80232e72911f78292 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/murphy/murphy.lua
+++ b/mmfw-sysconf-target-u3/etc/murphy/murphy.lua
@@ -77,6 +77,12 @@ resource.class {
      sync_release = true
 }
 
+resource.class {
+     name = "video_decoder",
+     shareable = false,
+     sync_release = true
+}
+
 resource.class {
      name = "camera",
      shareable = false,

diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index 27df234308df855c6ae2f4e222e78118bbbd9b0b..b94c6fa5cc28f3369a8547b7eea77b536867ea96 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -1,11 +1,48 @@
 {
+       "volumes":[
+               {
+                       "type":"master",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"media",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"system",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"alarm",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"notification",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voice",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"ringtone",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"voip",
+                       "is-hal-volume":0,
+               },
+               {
+                       "type":"call",
+                       "is-hal-volume":1,
+               },
+       ],
        "streams":[
                {
                        "role":"media",
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -15,7 +52,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -25,7 +61,6 @@
                        "priority" : 4,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -35,7 +70,6 @@
                        "priority" : 3,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -45,7 +79,6 @@
                        "priority" : 4,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -55,7 +88,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -65,7 +97,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
@@ -75,7 +106,6 @@
                        "priority" : 5,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -85,7 +115,6 @@
                        "priority" : 6,
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
@@ -95,7 +124,6 @@
                        "priority" : 5,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["audio-io","tone-player"],
@@ -105,7 +133,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -115,7 +142,6 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
@@ -125,7 +151,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker","audio-jack"],
                        "avail-frameworks":["sound-manager"],
@@ -135,7 +160,6 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index a0850227eddaf4bf46a91ed80a1f93dc1c6aa859..e11374928dbd8c6fb6ce3b561760908ea8db8794 100644 (file)
--- 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.14
+Version:    0.2.15
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0