aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bultel <thierry.bultel@iot.bzh>2018-12-19 23:25:30 +0100
committerThierry Bultel <thierry.bultel@iot.bzh>2018-12-20 15:03:40 +0100
commitd6d98220643113701857f03c8534c412c8eeac33 (patch)
treefe0b5dc202461318a12a4fa48a1da7caa2628ead
parent6fdd9c572f9dc9e1320351867a8e4c6ef9498370 (diff)
bluetooth audio: uses the new bluealsa pluginguppy_6.99.3guppy/6.99.36.99.3
Updated all the HALs to use the new bluealsa plugin, that dynamically creates and deletes audio streams upon bluetooth connections from mobile phones. The plugin parameters consists in 2 sections. The "sco" section is the place for voice calls. It is where to specify which microphone to use (this one must be declared in the captures devices), and to what zone to do the playback (that zone must be defined, too) The "a2dp" is for music playback. The only needed paramter is a playback zone. It can be different fromt the one used by SCO. Additionnally, both SCO and A2DP have a "delayms" parameter which is the size in milliseconds of the copy buffer for the audio stream. The values set in this commit are good enough for a demo, but can we optimized in the future. Change-Id: I1c5da69c0de01d5dfdf852fa58372410f22e2a56 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
-rw-r--r--community-boards/hal-4a-2ch-generic-usb.json17
-rw-r--r--community-boards/hal-4a-csl-cm106-8ch-usb.json17
-rw-r--r--community-boards/hal-4a-ensoniq.json19
-rw-r--r--community-boards/hal-4a-intel-upsquared-hdmi.json17
-rw-r--r--community-boards/hal-4a-intel.json19
-rw-r--r--community-boards/hal-4a-jabra.json17
-rw-r--r--community-boards/hal-4a-raspberry-pi-3.json18
-rw-r--r--devices/hal-4a-greenbox.json38
-rw-r--r--reference-boards/hal-4a-intel-minnow.json17
-rw-r--r--reference-boards/hal-4a-intel-qemu.json17
-rw-r--r--reference-boards/hal-4a-rcar-m3.json19
-rw-r--r--reference-boards/hal-4a-rcar-m3kf.json23
12 files changed, 157 insertions, 81 deletions
diff --git a/community-boards/hal-4a-2ch-generic-usb.json b/community-boards/hal-4a-2ch-generic-usb.json
index 311c5d7..b5cf1d9 100644
--- a/community-boards/hal-4a-2ch-generic-usb.json
+++ b/community-boards/hal-4a-2ch-generic-usb.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "CSL-CM106-8CH-USB",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-csl-cm106-8ch-usb.json b/community-boards/hal-4a-csl-cm106-8ch-usb.json
index 57cfc27..f249b5b 100644
--- a/community-boards/hal-4a-csl-cm106-8ch-usb.json
+++ b/community-boards/hal-4a-csl-cm106-8ch-usb.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "CSL-CM106-8CH-USB",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-ensoniq.json b/community-boards/hal-4a-ensoniq.json
index 01b27f5..09db8f8 100644
--- a/community-boards/hal-4a-ensoniq.json
+++ b/community-boards/hal-4a-ensoniq.json
@@ -10,14 +10,21 @@
"date": "2018-06-13"
},
"resources": [
- {
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ {
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "ENSONIQ",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-intel-upsquared-hdmi.json b/community-boards/hal-4a-intel-upsquared-hdmi.json
index 8597489..6cc1cf7 100644
--- a/community-boards/hal-4a-intel-upsquared-hdmi.json
+++ b/community-boards/hal-4a-intel-upsquared-hdmi.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "INTEL-UPSQUARED-HDMI",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-intel.json b/community-boards/hal-4a-intel.json
index 1e27896..0752915 100644
--- a/community-boards/hal-4a-intel.json
+++ b/community-boards/hal-4a-intel.json
@@ -10,14 +10,21 @@
"date": "2018-06-13"
},
"resources": [
- {
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ {
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "INTEL",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-jabra.json b/community-boards/hal-4a-jabra.json
index a07d61d..1c63be4 100644
--- a/community-boards/hal-4a-jabra.json
+++ b/community-boards/hal-4a-jabra.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "JABRA-SOLEMATE",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/community-boards/hal-4a-raspberry-pi-3.json b/community-boards/hal-4a-raspberry-pi-3.json
index 86be677..99eb2d0 100644
--- a/community-boards/hal-4a-raspberry-pi-3.json
+++ b/community-boards/hal-4a-raspberry-pi-3.json
@@ -11,14 +11,22 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "RASPBERRY-PI-3",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
+
],
"controls": [
{
diff --git a/devices/hal-4a-greenbox.json b/devices/hal-4a-greenbox.json
index c0a632f..3a84446 100644
--- a/devices/hal-4a-greenbox.json
+++ b/devices/hal-4a-greenbox.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "MOST_MIC_EP822CH",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
},
{
"uid": "hal-unicens",
@@ -123,22 +130,14 @@
]
}
},
- "captures": [
+ "captures": [
{
- "uid": "RCAR-M3",
- "path": "/dev/snd/by-path/platform-sound@1",
+ "uid": "MOST_MIC_EP822CH",
+ "cardid": "hw:ep822ch",
"params": {
"rate": 48000
},
"source": {
- "controls": {
- "volume": {
- "name": "DVC In Capture Volume"
- },
- "mute": {
- "name": "DVC In Mute Switch"
- }
- },
"channels": [
{
"uid": "mic-right",
@@ -153,9 +152,9 @@
} ,
{
"uid": "radio",
- "path": "/dev/snd/by-path/platform-sound@2",
+ "cardid": "hw:radio",
"params": {
- "channels": 2
+ "rate": 48000
},
"source": {
"channels": [
@@ -284,8 +283,7 @@
"mute": true,
"params": {
"rate" : 48000,
- "format": "S16_LE",
- "channels": 2
+ "format": "S16_LE"
}
}
]
diff --git a/reference-boards/hal-4a-intel-minnow.json b/reference-boards/hal-4a-intel-minnow.json
index 9a5effb..d96672b 100644
--- a/reference-boards/hal-4a-intel-minnow.json
+++ b/reference-boards/hal-4a-intel-minnow.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "INTEL-MINNOW",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/reference-boards/hal-4a-intel-qemu.json b/reference-boards/hal-4a-intel-qemu.json
index eed75de..8b34231 100644
--- a/reference-boards/hal-4a-intel-qemu.json
+++ b/reference-boards/hal-4a-intel-qemu.json
@@ -11,13 +11,20 @@
},
"resources": [
{
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "INTEL-QEMU",
+ "zone": "full-stereo",
+ "delayms": 800
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 500
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/reference-boards/hal-4a-rcar-m3.json b/reference-boards/hal-4a-rcar-m3.json
index 5644262..5df9bd6 100644
--- a/reference-boards/hal-4a-rcar-m3.json
+++ b/reference-boards/hal-4a-rcar-m3.json
@@ -10,14 +10,21 @@
"date": "2018-06-13"
},
"resources": [
- {
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ {
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "RCAR-M3",
+ "zone": "full-stereo",
+ "delayms": 200
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 1000
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
diff --git a/reference-boards/hal-4a-rcar-m3kf.json b/reference-boards/hal-4a-rcar-m3kf.json
index d374fcf..ca9ac77 100644
--- a/reference-boards/hal-4a-rcar-m3kf.json
+++ b/reference-boards/hal-4a-rcar-m3kf.json
@@ -10,14 +10,21 @@
"date": "2018-06-15"
},
"resources": [
- {
- "uid": "hal-bt",
- "info": "Bluetooth hal plugin to get A2DP bluetooth device as an input by tweaking softmixer configuration",
+ {
+ "uid": "hal-bluealsa",
+ "info": "Bluealsa hal plugin",
"params": {
- "channels": 2,
- "zone": "front-seats"
+ "sco": {
+ "mic": "RCAR-M3",
+ "zone": "full-stereo",
+ "delayms": 200
+ },
+ "a2dp": {
+ "zone": "full-stereo",
+ "delayms": 1000
+ }
},
- "libs": ["hal-bt.ctlso"]
+ "libs": ["hal-bluealsa.ctlso"]
}
],
"controls": [
@@ -153,7 +160,8 @@
"uid": "radio",
"path": "/dev/snd/by-path/platform-sound@2",
"params": {
- "channels": 2
+ "rate" : 48000,
+ "format": "S16_LE"
},
"source": {
"channels": [
@@ -241,7 +249,6 @@
"params": {
"rate" : 48000,
"format": "S16_LE",
- "channels": 2
}
}
]