diff options
author | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-09-19 12:23:59 +0200 |
---|---|---|
committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-08 15:57:27 +0200 |
commit | 04bb36a2bf5eac8d605c9e63b5cc9c1cf79be905 (patch) | |
tree | cd1bb95ecc7afadcbfa892312cf2701e7f958be0 /4a-hal-cfg-reference | |
parent | e1b9634b554d91012edef2a564a9dcfb25cae503 (diff) |
hal-bt: Enrich 'halmixer' section in plugin init
Enrich 'halmixer' section with bluetooth specific 'source' and 'stream'
during hal-bt plugin initialization.
Some parameters must be passed to plugin using 'params' key in controller
json plugin section.
This allows to get rid of must of the additional configuration when using
bluetooth in a hal.
Change-Id: I5820e75307a3394eca80cf783e7bc4c31c2d7659
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal-cfg-reference')
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-intel-minnow-bt.json | 203 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-intel-minnow.json | 11 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-intel-qemu-bt.json | 217 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-intel-qemu.json | 11 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-rcar-m3-bt.json | 228 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-rcar-m3.json | 11 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-rcar-m3kf-bt.json | 248 | ||||
-rw-r--r-- | 4a-hal-cfg-reference/hal-4a-rcar-m3kf.json | 11 |
8 files changed, 44 insertions, 896 deletions
diff --git a/4a-hal-cfg-reference/hal-4a-intel-minnow-bt.json b/4a-hal-cfg-reference/hal-4a-intel-minnow-bt.json deleted file mode 100644 index 0a17a4e..0000000 --- a/4a-hal-cfg-reference/hal-4a-intel-minnow-bt.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/pci-0000:00:1b.0", - "version": "0.9", - "api": "4a-hal-intel-minnow-bt", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Intel Minnow device", - "author": "Jonathan Aillet", - "date": "2018-06-13" - }, - "resources": [ - { - "uid": "hal-bt", - "info": "Bluetooth hal plugin to get selected bluetooth device as an input by tweaking softmixer configuration", - "libs": ["hal-bt.ctlso"] - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-master-playback-volume", - "alsa": { - "name": "IEC958 Playback Default", - "value": 100 - } - }, - { - "uid": "agl-pcm-playback-switch", - "alsa": { - "name": "IEC958 Playback Switch", - "value": 1 - } - } - ], - "halmixer": { - "uid": "intel-minnow", - "mixerapi": "smixer", - "prefix": "intel-minnow", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 10 - }, - { - "uid": "ramp-normal", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-slow", - "delay": 50, - "up": 2, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : { - "uid": "INTEL-MINNOW", - "cardid": "hw:PCH", - "device": 3, - "params": { - "rate": 48000 - }, - "sink": { - "channels": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - } - }, - "captures": [ - { - "uid": "bluetooth", - "pcmplug_params": "bluealsa_proxy", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "bluetooth-right", - "port": 0 - }, - { - "uid": "bluetooth-left", - "port": 1 - } - ] - } - } - ], - "zones": [ - { - "uid": "full-stereo", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - }, - { - "uid": "front-seats", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "verb": "multimedia", - "zone": "full-stereo", - "volume": 60, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "navigation", - "verb": "navigation", - "zone": "front-seats", - "volume": 70, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "emergency", - "verb": "emergency", - "zone": "front-seats", - "volume": 60, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "bluetooth_stream", - "verb": "bluetooth_stream", - "zone": "front-seats", - "source" : "bluetooth", - "volume": 85, - "mute": false, - "params": { - "rate" : 48000, - "format": "S16_LE", - "channels": 2 - } - }, - { - "uid": "radio_stream", - "verb": "radio_stream", - "zone": "full-stereo", - "volume": 70, - "mute": true, - "params": { - "rate" : 48000 - } - } - ] - } -} diff --git a/4a-hal-cfg-reference/hal-4a-intel-minnow.json b/4a-hal-cfg-reference/hal-4a-intel-minnow.json index 39276fc..9a5effb 100644 --- a/4a-hal-cfg-reference/hal-4a-intel-minnow.json +++ b/4a-hal-cfg-reference/hal-4a-intel-minnow.json @@ -9,6 +9,17 @@ "author": "Jonathan Aillet", "date": "2018-06-13" }, + "resources": [ + { + "uid": "hal-bt", + "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration", + "params": { + "channels": 2, + "zone": "front-seats" + }, + "libs": ["hal-bt.ctlso"] + } + ], "controls": [ { "uid": "ping", diff --git a/4a-hal-cfg-reference/hal-4a-intel-qemu-bt.json b/4a-hal-cfg-reference/hal-4a-intel-qemu-bt.json deleted file mode 100644 index f9b2948..0000000 --- a/4a-hal-cfg-reference/hal-4a-intel-qemu-bt.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/pci-0000:00:03.0", - "version": "0.9", - "api": "4a-hal-intel-qemu-bt", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for QEMU Intel device", - "author": "Jonathan Aillet", - "date": "2018-07-10" - }, - "resources": [ - { - "uid": "hal-bt", - "info": "Bluetooth hal plugin to get selected bluetooth device as an input by tweaking softmixer configuration", - "libs": ["hal-bt.ctlso"] - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-master-playback-volume", - "alsa": { - "name": "Master Playback Volume", - "value": 100 - } - }, - { - "uid": "agl-master-playback-switch", - "alsa": { - "name": "Master Playback Switch", - "value": 1 - } - }, - { - "uid": "agl-capture-volume", - "alsa": { - "name": "Capture Volume" - } - } - ], - "halmixer": { - "uid": "intel", - "mixerapi": "smixer", - "prefix": "intel-qemu", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 10 - }, - { - "uid": "ramp-normal", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-slow", - "delay": 50, - "up": 2, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : { - "uid": "INTEL-QEMU", - "path": "/dev/snd/by-path/pci-0000:00:03.0", - "params": { - "rate": 48000 - }, - "sink": { - "controls": { - "volume": { - "name": "Master Playback Volume", - "value": 80 - }, - "mute": { - "name": "Master Playback Switch" - } - }, - "channels": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - } - }, - "captures": [ - { - "uid": "bluetooth", - "pcmplug_params": "bluealsa_proxy", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "bluetooth-right", - "port": 0 - }, - { - "uid": "bluetooth-left", - "port": 1 - } - ] - } - } - ], - "zones": [ - { - "uid": "full-stereo", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - }, - { - "uid": "front-seats", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "verb": "multimedia", - "zone": "full-stereo", - "volume": 60, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "navigation", - "verb": "navigation", - "zone": "front-seats", - "volume": 70, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "emergency", - "verb": "emergency", - "zone": "front-seats", - "volume": 60, - "mute": false, - "params": { - "rate": 48000 - } - }, - { - "uid": "bluetooth_stream", - "verb": "bluetooth_stream", - "zone": "front-seats", - "source" : "bluetooth", - "volume": 85, - "mute": false, - "params": { - "rate" : 48000, - "format": "S16_LE", - "channels": 2 - } - }, - { - "uid": "radio_stream", - "verb": "radio_stream", - "zone": "full-stereo", - "volume": 70, - "mute": true, - "params": { - "rate" : 48000 - } - } - ] - } -} diff --git a/4a-hal-cfg-reference/hal-4a-intel-qemu.json b/4a-hal-cfg-reference/hal-4a-intel-qemu.json index 3008a7a..eed75de 100644 --- a/4a-hal-cfg-reference/hal-4a-intel-qemu.json +++ b/4a-hal-cfg-reference/hal-4a-intel-qemu.json @@ -9,6 +9,17 @@ "author": "Jonathan Aillet", "date": "2018-07-10" }, + "resources": [ + { + "uid": "hal-bt", + "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration", + "params": { + "channels": 2, + "zone": "front-seats" + }, + "libs": ["hal-bt.ctlso"] + } + ], "controls": [ { "uid": "ping", diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3-bt.json b/4a-hal-cfg-reference/hal-4a-rcar-m3-bt.json deleted file mode 100644 index ebf7138..0000000 --- a/4a-hal-cfg-reference/hal-4a-rcar-m3-bt.json +++ /dev/null @@ -1,228 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/platform-sound", - "version": "0.9", - "api": "4a-hal-rcar-m3-bt", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Rcar M3 device", - "author": "Jonathan Aillet", - "date": "2018-06-13" - }, - "resources": [ - { - "uid": "hal-bt", - "info": "Bluetooth hal plugin to get selected bluetooth device as an input by tweaking softmixer configuration", - "libs": ["hal-bt.ctlso"] - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-master-playback-volume", - "alsa": { - "name": "DVC Out Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-volume", - "alsa": { - "name": "DVC Out Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-switch", - "alsa": { - "name": "SRC Out Rate Switch", - "value": 1 - } - }, - { - "uid": "agl-capture-volume", - "alsa": { - "name": "DVC In Capture Volume" - } - } - ], - "halmixer": { - "uid": "rcar-m3", - "mixerapi": "smixer", - "prefix": "m3", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 10 - }, - { - "uid": "ramp-normal", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-slow", - "delay": 50, - "up": 2, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : { - "uid": "RCAR-M3", - "path": "/dev/snd/by-path/platform-sound", - "params": { - "rate": 48000, - "format": "S24_LE" - }, - "sink": { - "controls": { - "volume": { - "name": "DVC Out Playback Volume", - "value": 80 - }, - "mute": { - "name": "SRC Out Rate Switch" - } - }, - "channels": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - } - }, - "captures": [ - { - "uid": "bluetooth", - "pcmplug_params": "bluealsa_proxy", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "bluetooth-right", - "port": 0 - }, - { - "uid": "bluetooth-left", - "port": 1 - } - ] - } - } - ], - "zones": [ - { - "uid": "full-stereo", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - }, - { - "uid": "front-seats", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "verb": "multimedia", - "zone": "full-stereo", - "volume": 60, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "navigation", - "verb": "navigation", - "zone": "front-seats", - "volume": 70, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "emergency", - "verb": "emergency", - "zone": "front-seats", - "volume": 60, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "bluetooth_stream", - "verb": "bluetooth_stream", - "zone": "front-seats", - "source" : "bluetooth", - "volume": 85, - "mute": false, - "params": { - "rate" : 48000, - "format": "S16_LE", - "channels": 2 - } - }, - { - "uid": "radio_stream", - "verb": "radio_stream", - "zone": "full-stereo", - "volume": 70, - "mute": true, - "params": { - "rate" : 48000 - } - } - ] - } -}
\ No newline at end of file diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3.json b/4a-hal-cfg-reference/hal-4a-rcar-m3.json index d961111..5644262 100644 --- a/4a-hal-cfg-reference/hal-4a-rcar-m3.json +++ b/4a-hal-cfg-reference/hal-4a-rcar-m3.json @@ -9,6 +9,17 @@ "author": "Jonathan Aillet", "date": "2018-06-13" }, + "resources": [ + { + "uid": "hal-bt", + "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration", + "params": { + "channels": 2, + "zone": "front-seats" + }, + "libs": ["hal-bt.ctlso"] + } + ], "controls": [ { "uid": "ping", diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3kf-bt.json b/4a-hal-cfg-reference/hal-4a-rcar-m3kf-bt.json deleted file mode 100644 index 8336158..0000000 --- a/4a-hal-cfg-reference/hal-4a-rcar-m3kf-bt.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/platform-sound@1", - "version": "0.9", - "api": "4a-hal-rcar-m3kf-bt", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Rcar M3 device when plugged on Kingfisher board", - "author": "Jonathan Aillet, Stephane Desneux", - "date": "2018-06-15" - }, - "resources": [ - { - "uid": "hal-bt", - "info": "Bluetooth hal plugin to get selected bluetooth device as an input by tweaking softmixer configuration", - "libs": ["hal-bt.ctlso"] - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-master-playback-volume", - "alsa": { - "name": "DVC Out Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-volume", - "alsa": { - "name": "DVC Out Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-switch", - "alsa": { - "name": "SRC Out Rate Switch", - "value": 1 - } - }, - { - "uid": "agl-capture-volume", - "alsa": { - "name": "DVC In Capture Volume" - } - } - ], - "halmixer": { - "uid": "rcar-m3", - "mixerapi": "smixer", - "prefix": "m3kf", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 10 - }, - { - "uid": "ramp-normal", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-slow", - "delay": 50, - "up": 2, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : { - "uid": "RCAR-M3", - "path": "/dev/snd/by-path/platform-sound@1", - "params": { - "rate": 48000, - "format": "S24_LE" - }, - "sink": { - "controls": { - "volume": { - "name": "DVC Out Playback Volume", - "value": 80 - }, - "mute": { - "name": "SRC Out Rate Switch" - } - }, - "channels": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - } - }, - "captures": [ - { - "uid": "bluetooth", - "pcmplug_params": "bluealsa_proxy", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "bluetooth-right", - "port": 0 - }, - { - "uid": "bluetooth-left", - "port": 1 - } - ] - } - }, - { - "uid": "radio", - "path": "/dev/snd/by-path/platform-sound@2", - "params": { - "channels": 2 - }, - "source": { - "channels": [ - { - "uid": "radio-right", - "port": 0 - }, - { - "uid": "radio-left", - "port": 1 - } - ] - } - } - ], - "zones": [ - { - "uid": "full-stereo", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - }, - { - "uid": "front-seats", - "sink": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "verb": "multimedia", - "zone": "full-stereo", - "volume": 60, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "navigation", - "verb": "navigation", - "zone": "front-seats", - "volume": 70, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "emergency", - "verb": "emergency", - "zone": "front-seats", - "volume": 60, - "mute": false, - "params": { - "rate": 48000, - "format": "S16_LE" - } - }, - { - "uid": "bluetooth_stream", - "verb": "bluetooth_stream", - "zone": "front-seats", - "source" : "bluetooth", - "volume": 85, - "mute": false, - "params": { - "rate" : 48000, - "format": "S16_LE", - "channels": 2 - } - }, - { - "uid": "radio_stream", - "verb": "radio_stream", - "zone": "full-stereo", - "source" : "radio", - "volume": 70, - "mute": true, - "params": { - "rate" : 48000 - } - } - ] - } -} diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json index e8200ce..d374fcf 100644 --- a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json +++ b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json @@ -9,6 +9,17 @@ "author": "Jonathan Aillet, Stephane Desneux", "date": "2018-06-15" }, + "resources": [ + { + "uid": "hal-bt", + "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration", + "params": { + "channels": 2, + "zone": "front-seats" + }, + "libs": ["hal-bt.ctlso"] + } + ], "controls": [ { "uid": "ping", |