From a76df8d09412c12d32d99ddb2ffdcb32cda980d5 Mon Sep 17 00:00:00 2001
From: Sangchul Lee <sc11.lee@samsung.com>
Date: Tue, 25 Aug 2015 22:16:34 +0900
Subject: [PATCH] [all/audio] modify stream-map.json (add master volume and
 reorganize it) [target/resource] add video_decoder resource

Change-Id: I4a76f034814572d4f4b7415222848017f57cdcb4
---
 .../etc/pulse/stream-map.json                 | 52 ++++++++++++++-----
 mmfw-sysconf-target-n4/etc/murphy/murphy.lua  |  6 +++
 .../etc/pulse/stream-map.json                 | 52 ++++++++++++++-----
 mmfw-sysconf-target-u3/etc/murphy/murphy.lua  |  6 +++
 .../etc/pulse/stream-map.json                 | 52 ++++++++++++++-----
 packaging/mmfw-sysconf.spec                   |  2 +-
 6 files changed, 127 insertions(+), 43 deletions(-)

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index 27df234..6ae8cae 100644
--- 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 1fae831..abca530 100644
--- 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 27df234..b94c6fa 100644
--- 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 1fae831..abca530 100644
--- 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 27df234..b94c6fa 100644
--- 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 a085022..e113749 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.14
+Version:    0.2.15
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0
-- 
2.34.1