[all/audio] Add latency category in stream-map.json

Latency information including buffer attributes are moved from Audio HAL.
Now, stream-map has three categories, latenices, volume and streams.

Change-Id: I7ee4ab74372e2355eacc53a7f5adc3fe0504371b
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index d38f08a47c046b8e95662b22f23d76b1ca132e07..d67fed27cf044c2966870328e9e18f6253a547d3 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
index 27d0a010d9f75dd17475d4b5c9b3405cff2c2061..52854160ce3ab4b6c5a2929b24fd38e711e7dd30 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
index 976f8dde05c595883a95c5faf5e9edbd7df74297..192185b72b36aa320d119d2bb0bd4b162b1fdabc 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index e92674dab7a8a6d6aa5c84e44bcd085ba0a4aea7..c112095098b29587dd9ab8af1e3fcd216ba01ecc 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
index 90221f93aca4a8945e2fbaba04ddabebf082a0dd..51a8554c1aa8eade9a1b09d37705998352a18d4b 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
index 02d50b7cdeb30ca62d7d0396b641753c34031916..c7599e48202006ac27f503f9b5146b7d8a6217d4 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index a553cb3a3dcba078fd58b3d59eff0fa633ab4769..b227e8ff5d5d2f2bcefaadd96b597ab0ec77a693 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -1,4 +1,38 @@
 {
+       "latencies":[
+               {
+                       "type":"low",
+                       "fragsize-ms":25,
+                       "minreq-ms":-1,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"mid",
+                       "fragsize-ms":50,
+                       "minreq-ms":-1,
+                       "tlength-ms":200,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"high",
+                       "fragsize-ms":75,
+                       "minreq-ms":-1,
+                       "tlength-ms":400,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+               {
+                       "type":"voip",
+                       "fragsize-ms":20,
+                       "minreq-ms":20,
+                       "tlength-ms":100,
+                       "prebuf-ms":0,
+                       "maxlength":-1,
+               },
+       ],
        "volumes":[
                {
                        "type":"master",

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 46b7a8940d53522358d8d323a61d73d443dfd3b3..e97738cfd2738209f7def9c96e6323b80bc07948 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.69
+Version:    0.2.70
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0