From: Sangchul Lee Date: Wed, 14 Jun 2017 03:02:30 +0000 (+0900) Subject: [All][Audio] Add voice-recognition-service stream rule X-Git-Tag: submit/tizen/20170614.045837^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d244e2097db06a4cd668550d9648bbdc7f9dbe94;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git [All][Audio] Add voice-recognition-service stream rule Change-Id: Ica6f3a285e7a7b601dfb553be3b64bfc81a45696 Signed-off-by: Sangchul Lee --- diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json index 8c1cc43..7d23b68 100644 --- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json +++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["audio-jack","builtin-mic"], + "avail-out-devices":["none"], + "avail-frameworks":["audio-io"] + }, { "role":"ringtone-voip", "priority" : 5, diff --git a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json index e32bbf6..84f37e9 100644 --- a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "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, diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json index 18eec12..c48442f 100644 --- a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "manual", + "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, diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json index c44f7db..b116847 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["audio-jack","builtin-mic"], + "avail-out-devices":["none"], + "avail-frameworks":["audio-io"] + }, { "role":"ringtone-voip", "priority" : 5, diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json index 26efd34..b116847 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json @@ -6,7 +6,7 @@ "minreq-ms":-1, "tlength-ms":100, "prebuf-ms":0, - "maxlength":-1, + "maxlength":-1 }, { "type":"mid", @@ -14,7 +14,7 @@ "minreq-ms":-1, "tlength-ms":200, "prebuf-ms":0, - "maxlength":-1, + "maxlength":-1 }, { "type":"high", @@ -22,7 +22,7 @@ "minreq-ms":-1, "tlength-ms":400, "prebuf-ms":0, - "maxlength":-1, + "maxlength":-1 }, { "type":"voip", @@ -30,7 +30,7 @@ "minreq-ms":20, "tlength-ms":100, "prebuf-ms":0, - "maxlength":-1, + "maxlength":-1 }, { "type":"default", @@ -38,46 +38,46 @@ "minreq-ms":-1, "tlength-ms":200, "prebuf-ms":-1, - "maxlength":-1, - }, + "maxlength":-1 + } ], "volumes":[ { "type":"master", - "is-hal-volume":1, + "is-hal-volume":1 }, { "type":"media", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"system", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"alarm", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"notification", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"voice", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"ringtone", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"voip", - "is-hal-volume":0, + "is-hal-volume":0 }, { "type":"call", - "is-hal-volume":1, - }, + "is-hal-volume":1 + } ], "streams":[ { @@ -87,7 +87,7 @@ "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["audio-jack","builtin-mic"], "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"], + "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"] }, { "role":"system", @@ -96,7 +96,7 @@ "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"alarm", @@ -105,7 +105,7 @@ "volume-types":{"in":"none","out":"alarm"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"notification", @@ -114,7 +114,7 @@ "volume-types":{"in":"none","out":"notification"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"emergency", @@ -123,7 +123,7 @@ "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], "avail-out-devices":["builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"voice-information", @@ -132,7 +132,7 @@ "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"voice-recognition", @@ -141,7 +141,16 @@ "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["audio-jack","builtin-mic"], "avail-out-devices":["none"], - "avail-frameworks":["audio-io"], + "avail-frameworks":["audio-io"] + }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["audio-jack","builtin-mic"], + "avail-out-devices":["none"], + "avail-frameworks":["audio-io"] }, { "role":"ringtone-voip", @@ -150,7 +159,7 @@ "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"], + "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"] }, { "role":"ringtone-call", @@ -159,7 +168,7 @@ "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"ringbacktone-call", @@ -168,7 +177,7 @@ "volume-types":{"in":"none","out":"call"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-receiver","builtin-speaker"], - "avail-frameworks":["wav-player","tone-player"], + "avail-frameworks":["wav-player","tone-player"] }, { "role":"voip", @@ -177,7 +186,7 @@ "volume-types":{"in":"none","out":"voip"}, "avail-in-devices":["builtin-mic","audio-jack","bt-sco"], "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"], - "avail-frameworks":["audio-io","tone-player","sound-manager"], + "avail-frameworks":["audio-io","tone-player","sound-manager"] }, { "role":"call-voice", @@ -186,7 +195,7 @@ "volume-types":{"in":"none","out":"call"}, "avail-in-devices":["builtin-mic","audio-jack","bt-sco"], "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"], - "avail-frameworks":["sound-manager"], + "avail-frameworks":["sound-manager"] }, { "role":"call-video", @@ -195,7 +204,7 @@ "volume-types":{"in":"none","out":"call"}, "avail-in-devices":["builtin-mic","audio-jack","bt-sco"], "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"], - "avail-frameworks":["sound-manager"], + "avail-frameworks":["sound-manager"] }, { "role":"radio", @@ -204,7 +213,7 @@ "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","builtin-speaker"], - "avail-frameworks":["sound-manager"], + "avail-frameworks":["sound-manager"] }, { "role":"loopback", @@ -213,7 +222,7 @@ "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["builtin-mic","usb-audio"], "avail-out-devices":["builtin-speaker","usb-audio","bt-a2dp"], - "avail-frameworks":["sound-manager"], + "avail-frameworks":["sound-manager"] }, { "role":"loopback-mirroring", @@ -222,7 +231,7 @@ "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["forwarding"], "avail-out-devices":["none"], - "avail-frameworks":["audio-io"], + "avail-frameworks":["audio-io"] }, { "role":"ext-media", @@ -231,7 +240,7 @@ "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["none"], "avail-out-devices":["bt-a2dp"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { "role":"solo", @@ -240,7 +249,7 @@ "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"], - "avail-frameworks":["wav-player","tone-player"], - }, + "avail-frameworks":["wav-player","tone-player"] + } ] } diff --git a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json index dfb6d12..3d2e37b 100644 --- a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["none"], + "avail-frameworks":["audio-io"] + }, { "role":"ringtone-voip", "priority" : 5, diff --git a/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json index fc4b4d4..dab2fb9 100644 --- a/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-tw2/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "priority" : 3, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["none"], + "avail-frameworks":["audio-io"] + }, { "role":"ringtone-voip", "priority" : 5, diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json index 741eba1..3b74807 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json @@ -143,6 +143,15 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, + { + "role":"voice-recognition-service", + "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, diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 170b650..2b8a669 100755 --- 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.106 +Version: 0.2.107 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0