Hello again,
Here's v9 of the ASHA plugin patchset. Changes include:
* Switch to btio API to connect socket -- this makes the connection
async, so we don't tie up the mainloop for longer/erroneous
connections
* Minor fixups based on CI/lint
* Trivial gitignore changes are already merged
Cheers,
Arun
Arun Raghavan (3):
src/shared: Add initial implementation for an ASHA profile
profiles/audio: Add an ASHA plugin
test: Add a script to test ASHA
Makefile.am | 3 +-
Makefile.plugins | 5 +
configure.ac | 4 +
lib/uuid.h | 3 +
profiles/audio/asha.c | 524 +++++++++++++++++++++++++++++++++++++
profiles/audio/asha.h | 38 +++
profiles/audio/media.c | 30 +++
profiles/audio/media.h | 2 +
profiles/audio/transport.c | 201 +++++++++++++-
src/shared/asha.c | 360 +++++++++++++++++++++++++
src/shared/asha.h | 63 +++++
test/simple-asha | 166 ++++++++++++
12 files changed, 1396 insertions(+), 3 deletions(-)
create mode 100644 profiles/audio/asha.c
create mode 100644 profiles/audio/asha.h
create mode 100644 src/shared/asha.c
create mode 100644 src/shared/asha.h
create mode 100755 test/simple-asha
--
2.45.2
This implements the server role for the Audio Streaming for Hearing Aid
specification[1]. Includes basic ability to probe the ASHA GATT service,
as well as starting/stopping streaming.
[1] https://source.android.com/docs/core/connect/bluetooth/asha
---
Makefile.am | 3 +-
lib/uuid.h | 3 +
src/shared/asha.c | 360 ++++++++++++++++++++++++++++++++++++++++++++++
src/shared/asha.h | 63 ++++++++
4 files changed, 428 insertions(+), 1 deletion(-)
create mode 100644 src/shared/asha.c
create mode 100644 src/shared/asha.h
diff --git a/Makefile.am b/Makefile.am
index 8f5d2fb55..0ae721111 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -238,7 +238,8 @@ shared_sources = src/shared/io.h src/shared/timeout.h \
src/shared/bass.h src/shared/bass.c \
src/shared/ccp.h src/shared/ccp.c \
src/shared/lc3.h src/shared/tty.h \
- src/shared/bap-defs.h
+ src/shared/bap-defs.h \
+ src/shared/asha.h src/shared/asha.c
if READLINE
shared_sources += src/shared/shell.c src/shared/shell.h
diff --git a/lib/uuid.h b/lib/uuid.h
index 8404b287e..479986f06 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -163,6 +163,9 @@ extern "C" {
#define BAA_SERVICE 0x1851
#define BAA_SERVICE_UUID "00001851-0000-1000-8000-00805f9b34fb"
+#define ASHA_SERVICE 0xFDF0
+#define ASHA_PROFILE_UUID "0000FDF0-0000-1000-8000-00805f9b34fb"
+
#define PAC_CONTEXT 0x2bcd
#define PAC_SUPPORTED_CONTEXT 0x2bce
diff --git a/src/shared/asha.c b/src/shared/asha.c
new file mode 100644
index 000000000..a5ac8cc3d
--- /dev/null
+++ b/src/shared/asha.c
@@ -0,0 +1,360 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
+
+#include "src/shared/util.h"
+#include "src/shared/att.h"
+#include "src/log.h"
+
+#include "src/shared/queue.h"
+#include "src/shared/gatt-db.h"
+#include "src/shared/gatt-client.h"
+
+#include "asha.h"
+
+/* We use strings instead of uint128_t to maintain readability */
+#define ASHA_CHRC_READ_ONLY_PROPERTIES_UUID "6333651e-c481-4a3e-9169-7c902aad37bb"
+#define ASHA_CHRC_AUDIO_CONTROL_POINT_UUID "f0d4de7e-4a88-476c-9d9f-1937b0996cc0"
+#define ASHA_CHRC_AUDIO_STATUS_UUID "38663f1a-e711-4cac-b641-326b56404837"
+#define ASHA_CHRC_VOLUME_UUID "00e4ca9e-ab14-41e4-8823-f9e70c7e91df"
+#define ASHA_CHRC_LE_PSM_OUT_UUID "2d410339-82b6-42aa-b34e-e2e01df8cc1a"
+
+struct bt_asha *bt_asha_new(void)
+{
+ struct bt_asha *asha;
+
+ asha = new0(struct bt_asha, 1);
+
+ return asha;
+}
+
+void bt_asha_reset(struct bt_asha *asha)
+{
+ if (asha->status_notify_id) {
+ bt_gatt_client_unregister_notify(asha->client,
+ asha->status_notify_id);
+ }
+
+ gatt_db_unref(asha->db);
+ asha->db = NULL;
+
+ bt_gatt_client_unref(asha->client);
+ asha->client = NULL;
+
+ asha->psm = 0;
+}
+
+void bt_asha_state_reset(struct bt_asha *asha)
+{
+ asha->state = ASHA_STOPPED;
+
+ asha->cb = NULL;
+ asha->cb_user_data = NULL;
+}
+
+void bt_asha_free(struct bt_asha *asha)
+{
+ gatt_db_unref(asha->db);
+ bt_gatt_client_unref(asha->client);
+ free(asha);
+}
+
+static void asha_acp_sent(bool success, uint8_t err, void *user_data)
+{
+ struct bt_asha *asha = user_data;
+
+ if (success) {
+ DBG("AudioControlPoint command successfully sent");
+ } else {
+ error("Failed to send AudioControlPoint command: %d", err);
+
+ if (asha->cb)
+ asha->cb(-1, asha->cb_user_data);
+
+ bt_asha_state_reset(asha);
+ }
+}
+
+static int asha_send_acp(struct bt_asha *asha, uint8_t *cmd,
+ unsigned int len, bt_asha_cb_t cb, void *user_data)
+{
+ if (!bt_gatt_client_write_value(asha->client, asha->acp_handle, cmd,
+ len, asha_acp_sent, asha, NULL)) {
+ error("Error writing ACP command");
+ return -1;
+ }
+
+ asha->cb = cb;
+ asha->cb_user_data = user_data;
+
+ return 0;
+}
+
+unsigned int bt_asha_start(struct bt_asha *asha, bt_asha_cb_t cb,
+ void *user_data)
+{
+ uint8_t acp_start_cmd[] = {
+ 0x01, /* START */
+ 0x01, /* G.722, 16 kHz */
+ 0, /* Unknown media type */
+ asha->volume, /* Volume */
+ 0, /* Other disconnected */
+ };
+ int ret;
+
+ if (asha->state != ASHA_STOPPED) {
+ error("ASHA device start failed. Bad state %d", asha->state);
+ return 0;
+ }
+
+ ret = asha_send_acp(asha, acp_start_cmd, sizeof(acp_start_cmd), cb,
+ user_data);
+ if (ret < 0)
+ return ret;
+
+ asha->state = ASHA_STARTING;
+
+ return 0;
+}
+
+unsigned int bt_asha_stop(struct bt_asha *asha, bt_asha_cb_t cb,
+ void *user_data)
+{
+ uint8_t acp_stop_cmd[] = {
+ 0x02, /* STOP */
+ };
+ int ret;
+
+ if (asha->state != ASHA_STARTED)
+ return 0;
+
+ asha->state = ASHA_STOPPING;
+
+ return asha_send_acp(asha, acp_stop_cmd, sizeof(acp_stop_cmd),
+ cb, user_data);
+}
+
+bool bt_asha_set_volume(struct bt_asha *asha, int8_t volume)
+{
+ if (!bt_gatt_client_write_without_response(asha->client,
+ asha->volume_handle, false,
+ (const uint8_t *)&volume, 1)) {
+ error("Error writing volume");
+ return false;
+ }
+
+ asha->volume = volume;
+ return true;
+}
+
+static bool uuid_cmp(const char *uuid1, const bt_uuid_t *uuid2)
+{
+ bt_uuid_t lhs;
+
+ bt_string_to_uuid(&lhs, uuid1);
+
+ return bt_uuid_cmp(&lhs, uuid2) == 0;
+}
+
+static void read_psm(bool success,
+ uint8_t att_ecode,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ struct bt_asha *asha = user_data;
+
+ if (!success) {
+ DBG("Reading PSM failed with ATT error: %u", att_ecode);
+ return;
+ }
+
+ if (length != 2) {
+ DBG("Reading PSM failed: unexpected length %u", length);
+ return;
+ }
+
+ asha->psm = get_le16(value);
+
+ DBG("Got PSM: %u", asha->psm);
+}
+
+static void read_rops(bool success,
+ uint8_t att_ecode,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ struct bt_asha *asha = user_data;
+
+ if (!success) {
+ DBG("Reading ROPs failed with ATT error: %u", att_ecode);
+ return;
+ }
+
+ if (length != 17) {
+ DBG("Reading ROPs failed: unexpected length %u", length);
+ return;
+ }
+
+ if (value[0] != 0x01) {
+ DBG("Unexpected ASHA version: %u", value[0]);
+ return;
+ }
+
+ /* Device Capabilities */
+ asha->right_side = (value[1] & 0x1) != 0;
+ asha->binaural = (value[1] & 0x2) != 0;
+ asha->csis_supported = (value[1] & 0x4) != 0;
+ /* HiSyncId: 2 byte company id, 6 byte ID shared by left and right */
+ memcpy(asha->hisyncid, &value[2], 8);
+ /* FeatureMap */
+ asha->coc_streaming_supported = (value[10] & 0x1) != 0;
+ /* RenderDelay */
+ asha->render_delay = get_le16(&value[11]);
+ /* byte 13 & 14 are reserved */
+ /* Codec IDs */
+ asha->codec_ids = get_le16(&value[15]);
+
+ DBG("Got ROPS: side %u, binaural %u, csis: %u, delay %u, codecs: %u",
+ asha->right_side, asha->binaural, asha->csis_supported,
+ asha->render_delay, asha->codec_ids);
+}
+
+static void audio_status_register(uint16_t att_ecode, void *user_data)
+{
+ if (att_ecode)
+ DBG("AudioStatusPoint register failed 0x%04x", att_ecode);
+ else
+ DBG("AudioStatusPoint register succeeded");
+}
+
+static void audio_status_notify(uint16_t value_handle, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct bt_asha *asha = user_data;
+ uint8_t status = *value;
+ /* Back these up to survive the reset paths */
+ bt_asha_cb_t cb = asha->cb;
+ bt_asha_cb_t cb_user_data = asha->cb_user_data;
+
+ if (asha->state == ASHA_STARTING) {
+ if (status == 0) {
+ asha->state = ASHA_STARTED;
+ DBG("ASHA start complete");
+ } else {
+ bt_asha_state_reset(asha);
+ DBG("ASHA start failed");
+ }
+ } else if (asha->state == ASHA_STOPPING) {
+ /* We reset our state, regardless */
+ bt_asha_state_reset(asha);
+ DBG("ASHA stop %s", status == 0 ? "complete" : "failed");
+ }
+
+ if (cb) {
+ cb(status, cb_user_data);
+ asha->cb = NULL;
+ asha->cb_user_data = NULL;
+ }
+}
+
+static void handle_characteristic(struct gatt_db_attribute *attr,
+ void *user_data)
+{
+ struct bt_asha *asha = user_data;
+ uint16_t value_handle;
+ bt_uuid_t uuid;
+ char uuid_str[MAX_LEN_UUID_STR];
+
+ if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle, NULL,
+ NULL, &uuid)) {
+ error("Failed to obtain characteristic data");
+ return;
+ }
+
+ bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str));
+ if (uuid_cmp(ASHA_CHRC_LE_PSM_OUT_UUID, &uuid)) {
+ DBG("Got chrc %s/0x%x: LE_PSM_ID", uuid_str, value_handle);
+ if (!bt_gatt_client_read_value(asha->client, value_handle,
+ read_psm, asha, NULL))
+ DBG("Failed to send request to read battery level");
+ } else if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) {
+ DBG("Got chrc %s/0x%x: READ_ONLY_PROPERTIES", uuid_str,
+ value_handle);
+ if (!bt_gatt_client_read_value(asha->client, value_handle,
+ read_rops, asha, NULL))
+ DBG("Failed to send request for readonly properties");
+ } else if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) {
+ DBG("Got chrc %s/0x%x: AUDIO_CONTROL_POINT", uuid_str,
+ value_handle);
+ /* Store this for later writes */
+ asha->acp_handle = value_handle;
+ } else if (uuid_cmp(ASHA_CHRC_VOLUME_UUID, &uuid)) {
+ DBG("Got chrc %s/0x%x: VOLUME", uuid_str, value_handle);
+ /* Store this for later writes */
+ asha->volume_handle = value_handle;
+ } else if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) {
+ DBG("Got chrc %s/0x%x: AUDIO_STATUS", uuid_str, value_handle);
+ asha->status_notify_id =
+ bt_gatt_client_register_notify(asha->client,
+ value_handle, audio_status_register,
+ audio_status_notify, asha, NULL);
+ if (!asha->status_notify_id)
+ DBG("Failed to send request to notify AudioStatus");
+ } else {
+ DBG("Unsupported characteristic: %s", uuid_str);
+ }
+}
+
+static void foreach_asha_service(struct gatt_db_attribute *attr,
+ void *user_data)
+{
+ struct bt_asha *asha = user_data;
+
+ DBG("Found ASHA GATT service");
+
+ asha->attr = attr;
+ gatt_db_service_set_claimed(attr, true);
+ gatt_db_service_foreach_char(asha->attr, handle_characteristic, asha);
+}
+
+bool bt_asha_probe(struct bt_asha *asha, struct gatt_db *db,
+ struct bt_gatt_client *client)
+{
+ bt_uuid_t asha_uuid;
+
+ asha->db = gatt_db_ref(db);
+ asha->client = bt_gatt_client_clone(client);
+
+ bt_uuid16_create(&asha_uuid, ASHA_SERVICE);
+ gatt_db_foreach_service(db, &asha_uuid, foreach_asha_service, asha);
+
+ if (!asha->attr) {
+ error("ASHA attribute not found");
+ bt_asha_reset(asha);
+ return false;
+ }
+
+ return true;
+}
diff --git a/src/shared/asha.h b/src/shared/asha.h
new file mode 100644
index 000000000..c2c232fff
--- /dev/null
+++ b/src/shared/asha.h
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#
+
+#include <stdbool.h>
+#include <stdint.h>
+
+enum bt_asha_state_t {
+ ASHA_STOPPED = 0,
+ ASHA_STARTING,
+ ASHA_STARTED,
+ ASHA_STOPPING,
+};
+
+typedef void (*bt_asha_cb_t)(int status, void *data);
+
+struct bt_asha {
+ struct bt_gatt_client *client;
+ struct gatt_db *db;
+ struct gatt_db_attribute *attr;
+ uint16_t acp_handle;
+ uint16_t volume_handle;
+ unsigned int status_notify_id;
+
+ uint16_t psm;
+ bool right_side;
+ bool binaural;
+ bool csis_supported;
+ bool coc_streaming_supported;
+ uint8_t hisyncid[8];
+ uint16_t render_delay;
+ uint16_t codec_ids;
+ int8_t volume;
+
+ enum bt_asha_state_t state;
+ bt_asha_cb_t cb;
+ void *cb_user_data;
+};
+
+struct bt_asha *bt_asha_new(void);
+void bt_asha_reset(struct bt_asha *asha);
+void bt_asha_state_reset(struct bt_asha *asha);
+void bt_asha_free(struct bt_asha *asha);
+
+unsigned int bt_asha_start(struct bt_asha *asha, bt_asha_cb_t cb,
+ void *user_data);
+unsigned int bt_asha_stop(struct bt_asha *asha, bt_asha_cb_t cb,
+ void *user_data);
+
+bool bt_asha_set_volume(struct bt_asha *asha, int8_t volume);
+
+bool bt_asha_probe(struct bt_asha *asha, struct gatt_db *db,
+ struct bt_gatt_client *client);
--
2.45.2
Plays out an audio file to the device. Depends on GStreamer for media
file reading and decoding (specifically, gstreamer core,
gst-plugins-base, gst-ffmpeg, and gst-python, or equivalent packages).
---
test/simple-asha | 166 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
create mode 100755 test/simple-asha
diff --git a/test/simple-asha b/test/simple-asha
new file mode 100755
index 000000000..c90f8a12b
--- /dev/null
+++ b/test/simple-asha
@@ -0,0 +1,166 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+import os
+import signal
+import sys
+
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+import gi
+
+gi.require_version("Gst", "1.0")
+gi.require_version("GLib", "2.0")
+from gi.repository import GLib, Gst
+
+import bluezutils
+
+mainloop = None
+pipeline = None
+seqnum: int = 0
+
+
+def signal_handler(_sig, _frame):
+ print("Got interrupt")
+ mainloop.quit()
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
+def usage():
+ print(f"Usage: simple-asha <remote addr> <audio file name> (optional volume 0-127)")
+
+
+def start_playback(fd: int, omtu: int):
+ global mainloop, pipeline
+ pktsize = 161
+
+ if omtu < pktsize:
+ print("Weird mtu", omtu)
+
+ outdata = bytearray(pktsize)
+
+ Gst.init(None)
+
+ pipeline = Gst.parse_launch(
+ f"""
+ filesrc location="{sys.argv[2]}" ! decodebin !
+ audioconvert ! audioresample !
+ audiobuffersplit output-buffer-duration="20/1000" ! avenc_g722 !
+ appsink name=sink emit-signals=true
+ """
+ )
+
+ def on_new_sample(sink):
+ global seqnum
+
+ sample = sink.emit("pull-sample")
+ buf = sample.get_buffer()
+
+ with buf.map(Gst.MapFlags.READ) as info:
+ pos = 0
+
+ if info.size != pktsize - 1:
+ print("Unexpected buffer size: ", info.size)
+
+ outdata[pos] = seqnum % 256
+ pos += 1
+
+ for byte in info.data:
+ outdata[pos] = byte
+ pos += 1
+
+ try:
+ n = os.write(fd, outdata)
+ if n != pktsize:
+ print("Wrote less than expected: ", n)
+ except:
+ return Gst.FlowReturn.ERROR
+
+ seqnum += 1
+
+ return Gst.FlowReturn.OK
+
+ sink = pipeline.get_by_name("sink")
+ sink.connect("new-sample", on_new_sample)
+
+ def bus_message(_bus, message, _data) -> bool:
+ typ = message.type
+
+ if typ == Gst.MessageType.EOS:
+ print("End of stream")
+ mainloop.quit()
+ elif typ == Gst.MessageType.ERROR:
+ err, debug = message.parse_error()
+ print(f"Pipeline error: {err} ({debug})")
+ mainloop.quit()
+
+ return True
+
+ bus = pipeline.get_bus()
+ bus.add_watch(GLib.PRIORITY_DEFAULT, bus_message, None)
+
+ pipeline.set_state(Gst.State.PLAYING)
+
+
+if __name__ == "__main__":
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+ mainloop = GLib.MainLoop()
+ bus = dbus.SystemBus()
+
+ if (len(sys.argv) == 3) or (len(sys.argv) == 4):
+ device = bluezutils.find_device(sys.argv[1])
+ if device is None:
+ print("Could not find device: ", sys.argv[1])
+ exit(255)
+ else:
+ usage()
+ sys.exit(255)
+
+ asha_object_path = device.object_path + "/asha"
+
+ print("Looking up ASHA object", asha_object_path)
+ asha = bus.get_object("org.bluez", asha_object_path)
+
+ print("Looking up endpoint properties for", asha.object_path)
+ props = asha.GetAll(
+ "org.bluez.MediaEndpoint1",
+ dbus_interface="org.freedesktop.DBus.Properties",
+ )
+ path = props["Transport"]
+
+ print("Trying to acquire", path)
+ transport = dbus.Interface(
+ bus.get_object("org.bluez", path),
+ "org.bluez.MediaTransport1",
+ )
+
+ # Keep default volume at 25%
+ volume = 32
+ if len(sys.argv) == 4:
+ volume = int(sys.argv[3])
+ if volume < 0 or volume > 127:
+ print("Volume must be between 0 (mute) and 127 (max)")
+
+ print("Setting initial volume to", volume)
+ transport.Set(
+ "org.bluez.MediaTransport1",
+ "Volume",
+ dbus.UInt16(volume, variant_level=1),
+ dbus_interface="org.freedesktop.DBus.Properties",
+ )
+
+ print("Acquiring transport")
+ (fd, imtu, omtu) = transport.Acquire()
+
+ print("Starting playback, hit Ctrl-C to stop")
+ start_playback(fd.take(), omtu)
+
+ mainloop.run()
+
+ pipeline.set_state(Gst.State.NULL)
+ transport.Release()
--
2.45.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=860549
---Test result---
Test Summary:
CheckPatch FAIL 2.43 seconds
GitLint PASS 0.86 seconds
BuildEll PASS 24.71 seconds
BluezMake FAIL 19.15 seconds
MakeCheck FAIL 36.96 seconds
MakeDistcheck PASS 178.52 seconds
CheckValgrind FAIL 16.28 seconds
CheckSmatch FAIL 23.38 seconds
bluezmakeextell FAIL 14.70 seconds
IncrementalBuild FAIL 20.17 seconds
ScanBuild FAIL 543.02 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v9,2/3] profiles/audio: Add an ASHA plugin
ERROR:SPACING: space prohibited before that close parenthesis ')'
#243: FILE: profiles/audio/asha.c:95:
+ BT_IO_OPT_INVALID )) {
WARNING:LONG_LINE: line length of 92 exceeds 80 columns
#284: FILE: profiles/audio/asha.c:136:
+ BT_IO_OPT_DEST_BDADDR, device_get_address(asha_dev->device),
/github/workspace/src/src/13692489.patch total: 1 errors, 1 warnings, 897 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13692489.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[BlueZ,v9,3/3] test: Add a script to test ASHA
ERROR:EXECUTE_PERMISSIONS: do not set execute permissions for source files
#104: FILE: test/simple-asha
/github/workspace/src/src/13692488.patch total: 1 errors, 0 warnings, 166 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13692488.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: BluezMake - FAIL
Desc: Build BlueZ
Output:
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8673: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4666: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8428: src/shared/libshared_glib_la-asha.lo] Error 1
make: *** [Makefile:12292: check] Error 2
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8673: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12292: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:621:25: warning: Variable length array is used.
src/shared/gatt-server.c:720:25: warning: Variable length array is used.
src/shared/bap.c:286:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8673: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4666: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8673: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4666: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[BlueZ,v9,1/3] src/shared: Add initial implementation for an ASHA profile
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8663: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4660: all] Error 2
##############################
Test: ScanBuild - FAIL
Desc: Run Scan Build
Output:
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1294:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1359:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1634:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1639:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2143:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2151:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3240:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3262:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/asha.c: In function ‘bt_asha_stop’:
src/shared/asha.c:146:6: error: unused variable ‘ret’ [-Werror=unused-variable]
146 | int ret;
| ^~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:8663: src/shared/libshared_mainloop_la-asha.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4660: all] Error 2
---
Regards,
Linux Bluetooth
Dear Arun,
Thank you very much for working on this.
Am 11.06.24 um 00:35 schrieb Arun Raghavan:
> Hello again,
> Here's v9 of the ASHA plugin patchset. Changes include:
>
> * Switch to btio API to connect socket -- this makes the connection
> async, so we don't tie up the mainloop for longer/erroneous
> connections
> * Minor fixups based on CI/lint
> * Trivial gitignore changes are already merged
Could you add a tag
Resolves: https://github.com/bluez/bluez/issues/481
and maybe elaborate, where the spec can be found, how this can be
tested, and with what devices you tested this?
Thank you again and kind regards,
Paul
This exposes the ASHA profile implementation in the previous commit as
an audio profile.
The implementation registers a remote endpoint using a subset of the
MediaEndpoint1 interface, without any mechanism for setting/selecting a
configuration, as this is all static in the spec for now. Also exposed
on connection is a MediaTransport1 object, which can be used to obtain
an fd to stream to the device.
---
Makefile.plugins | 5 +
configure.ac | 4 +
profiles/audio/asha.c | 524 +++++++++++++++++++++++++++++++++++++
profiles/audio/asha.h | 38 +++
profiles/audio/media.c | 30 +++
profiles/audio/media.h | 2 +
profiles/audio/transport.c | 201 +++++++++++++-
7 files changed, 802 insertions(+), 2 deletions(-)
create mode 100644 profiles/audio/asha.c
create mode 100644 profiles/audio/asha.h
diff --git a/Makefile.plugins b/Makefile.plugins
index 4aa2c9c92..44fda4536 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -147,3 +147,8 @@ if CSIP
builtin_modules += csip
builtin_sources += profiles/audio/csip.c
endif
+
+if ASHA
+builtin_modules += asha
+builtin_sources += profiles/audio/asha.h profiles/audio/asha.c
+endif
diff --git a/configure.ac b/configure.ac
index ac9de6ec4..1d88daa0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,10 @@ AC_ARG_ENABLE(csip, AS_HELP_STRING([--disable-csip],
[disable CSIP profile]), [enable_csip=${enableval}])
AM_CONDITIONAL(CSIP, test "${enable_csip}" != "no")
+AC_ARG_ENABLE(asha, AS_HELP_STRING([--disable-asha],
+ [disable ASHA support]), [enable_asha=${enableval}])
+AM_CONDITIONAL(ASHA, test "${enable_asha}" != "no")
+
AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
[disable Bluetooth tools]), [enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
diff --git a/profiles/audio/asha.c b/profiles/audio/asha.c
new file mode 100644
index 000000000..1c4f751d1
--- /dev/null
+++ b/profiles/audio/asha.c
@@ -0,0 +1,524 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include <dbus/dbus.h>
+#include <glib.h>
+
+#include "btio/btio.h"
+#include "gdbus/gdbus.h"
+#include "lib/bluetooth.h"
+#include "lib/l2cap.h"
+#include "lib/uuid.h"
+
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/log.h"
+#include "src/plugin.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/shared/util.h"
+
+#include "profiles/audio/asha.h"
+#include "profiles/audio/media.h"
+#include "profiles/audio/transport.h"
+
+#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1"
+
+/* 2 byte SDU length, 1 byte sequence number, and then 20ms of G.722 */
+#define ASHA_MIN_MTU 163
+/* The default of 672 does not work */
+#define ASHA_CONNECTION_MTU 512
+
+struct bt_asha_device {
+ struct bt_asha *asha;
+ struct btd_device *device;
+ struct media_transport *transport;
+
+ GIOChannel *io;
+ uint16_t imtu, omtu;
+
+ unsigned int resume_id;
+};
+
+static char *make_endpoint_path(struct bt_asha_device *asha_dev)
+{
+ char *path;
+ int err;
+
+ err = asprintf(&path, "%s/asha", device_get_path(asha_dev->device));
+ if (err < 0) {
+ error("Could not allocate path for remote %s",
+ device_get_path(asha_dev->device));
+ return NULL;
+ }
+
+ return path;
+}
+
+struct connect_data {
+ struct bt_asha_device *asha_dev;
+ bt_asha_cb_t cb;
+ void *cb_user_data;
+};
+
+static void connect_cb(GIOChannel *io, GError *err, gpointer user_data)
+{
+ struct connect_data *conn_data = user_data;
+ struct bt_asha_device *asha_dev = conn_data->asha_dev;
+ GError *gerr = NULL;
+
+ if (!bt_io_get(io, &gerr,
+ BT_IO_OPT_IMTU, &asha_dev->imtu,
+ BT_IO_OPT_OMTU, &asha_dev->omtu,
+ BT_IO_OPT_INVALID )) {
+ /* Let this be non-fatal? */
+ asha_dev->omtu = ASHA_MIN_MTU;
+ asha_dev->imtu = ASHA_CONNECTION_MTU;
+ error("Could not get L2CAP CoC socket MTU: %s", err->message);
+ g_error_free(gerr);
+ }
+
+ asha_dev->io = io;
+
+ bt_asha_start(asha_dev->asha, conn_data->cb,
+ conn_data->cb_user_data);
+}
+
+static int asha_connect_socket(struct bt_asha_device *asha_dev,
+ bt_asha_cb_t cb, void *user_data)
+{
+ GError *gerr = NULL;
+ const bdaddr_t *src_addr;
+ struct connect_data *conn_data;
+
+ if (asha_dev->asha->state != ASHA_STOPPED) {
+ error("ASHA device connect failed. Bad state %d",
+ asha_dev->asha->state);
+ return 0;
+ }
+
+ conn_data = g_new0(struct connect_data, 1);
+ conn_data->asha_dev = asha_dev;
+ conn_data->cb = cb;
+ conn_data->cb_user_data = user_data;
+
+ src_addr = btd_adapter_get_address(
+ device_get_adapter(asha_dev->device));
+
+ if (!bt_io_connect(connect_cb, conn_data,
+ g_free, &gerr,
+ BT_IO_OPT_MODE, BT_IO_MODE_LE_FLOWCTL,
+ BT_IO_OPT_SOURCE_TYPE, BDADDR_LE_PUBLIC,
+ BT_IO_OPT_SOURCE_BDADDR, src_addr,
+ BT_IO_OPT_DEST_TYPE, BDADDR_LE_PUBLIC,
+ BT_IO_OPT_DEST_BDADDR, device_get_address(asha_dev->device),
+ BT_IO_OPT_PSM, asha_dev->asha->psm,
+ BT_IO_OPT_OMTU, ASHA_MIN_MTU,
+ BT_IO_OPT_IMTU, ASHA_CONNECTION_MTU,
+ BT_IO_OPT_INVALID)) {
+ error("Could not open L2CAP CoC socket: %s", gerr->message);
+ g_error_free(gerr);
+ goto error;
+ }
+
+ DBG("L2CAP CoC socket is open");
+ return 0;
+
+error:
+ return -1;
+}
+
+unsigned int bt_asha_device_start(struct bt_asha_device *asha_dev,
+ bt_asha_cb_t cb, void *user_data)
+{
+ int ret;
+
+ btd_device_set_conn_param(asha_dev->device,
+ 0x0010 /* min interval = 1.25ms intervals => 20ms */,
+ 0x0010 /* max interval = 1.25ms intervals => 20ms */,
+ 0x000A /* 10 events' latency */,
+ 0x0064 /* 1s timeout */);
+
+ ret = asha_connect_socket(asha_dev, cb, user_data);
+
+ if (ret < 0)
+ return 0;
+ else
+ return (++asha_dev->resume_id);
+}
+
+unsigned int bt_asha_device_stop(struct bt_asha_device *asha_dev,
+ bt_asha_cb_t cb, void *user_data)
+{
+ bt_asha_stop(asha_dev->asha, cb, user_data);
+
+ if (asha_dev->io) {
+ g_io_channel_shutdown(asha_dev->io, TRUE, NULL);
+ g_io_channel_unref(asha_dev->io);
+ asha_dev->io = NULL;
+ };
+
+ return asha_dev->resume_id;
+}
+
+void bt_asha_device_state_reset(struct bt_asha_device *asha_dev)
+{
+ if (asha_dev->io) {
+ g_io_channel_shutdown(asha_dev->io, TRUE, NULL);
+ g_io_channel_unref(asha_dev->io);
+ asha_dev->io = NULL;
+ };
+
+ bt_asha_state_reset(asha_dev->asha);
+
+ asha_dev->resume_id = 0;
+}
+
+unsigned int bt_asha_device_device_get_resume_id(
+ struct bt_asha_device *asha_dev)
+{
+ return asha_dev->resume_id;
+}
+
+enum bt_asha_state_t bt_asha_device_get_state(
+ struct bt_asha_device *asha_dev)
+{
+ return asha_dev->asha->state;
+}
+
+uint16_t bt_asha_device_get_render_delay(struct bt_asha_device *asha_dev)
+{
+ return asha_dev->asha->render_delay;
+}
+
+int8_t bt_asha_device_get_volume(struct bt_asha_device *asha_dev)
+{
+ return asha_dev->asha->volume;
+}
+
+bool bt_asha_device_set_volume(struct bt_asha_device *asha_dev, int8_t volume)
+{
+ return bt_asha_set_volume(asha_dev->asha, volume);
+}
+
+int bt_asha_device_get_fd(struct bt_asha_device *asha_dev)
+{
+ return g_io_channel_unix_get_fd(asha_dev->io);
+}
+
+uint16_t bt_asha_device_get_imtu(struct bt_asha_device *asha_dev)
+{
+ return asha_dev->imtu;
+}
+
+uint16_t bt_asha_device_get_omtu(struct bt_asha_device *asha_dev)
+{
+ return asha_dev->omtu;
+}
+
+
+static gboolean get_uuid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ const char *uuid;
+
+ uuid = ASHA_PROFILE_UUID;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid);
+
+ return TRUE;
+}
+
+static gboolean get_side(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ const char *side = asha_dev->asha->right_side ? "right" : "left";
+
+ /* Use a string in case we want to support more types in the future */
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &side);
+
+ return TRUE;
+}
+
+
+static gboolean get_binaural(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ dbus_bool_t binaural = asha_dev->asha->binaural;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &binaural);
+
+ return TRUE;
+}
+
+static gboolean get_hisyncid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ DBusMessageIter array;
+ uint8_t *hisyncid = asha_dev->asha->hisyncid;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_BYTE_AS_STRING, &array);
+
+ dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
+ &hisyncid, sizeof(asha_dev->asha->hisyncid));
+
+ dbus_message_iter_close_container(iter, &array);
+
+ return TRUE;
+}
+
+static gboolean get_codecs(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ dbus_uint16_t codecs = asha_dev->asha->codec_ids;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &codecs);
+
+ return TRUE;
+}
+
+static gboolean get_device(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ const char *path;
+
+ path = device_get_path(asha_dev->device);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
+
+ return TRUE;
+}
+
+static gboolean get_transport(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct bt_asha_device *asha_dev = data;
+ const char *path;
+
+ path = media_transport_get_path(asha_dev->transport);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
+
+ return TRUE;
+}
+
+static int asha_source_device_probe(struct btd_service *service)
+{
+ struct bt_asha_device *asha_dev;
+ struct btd_device *device = btd_service_get_device(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Probing ASHA device %s", addr);
+
+ asha_dev = g_new0(struct bt_asha_device, 1);
+
+ asha_dev->device = device;
+ asha_dev->asha = bt_asha_new();
+ asha_dev->io = NULL;
+
+ btd_service_set_user_data(service, asha_dev);
+
+ return 0;
+}
+
+static void asha_source_device_remove(struct btd_service *service)
+{
+ struct bt_asha_device *asha_dev;
+ struct btd_device *device = btd_service_get_device(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Removing ASHA device %s", addr);
+
+ asha_dev = btd_service_get_user_data(service);
+ if (!asha_dev) {
+ /* Can this actually happen? */
+ DBG("Not handlihng ASHA profile");
+ return;
+ }
+
+ bt_asha_free(asha_dev->asha);
+ g_free(asha_dev);
+}
+
+static const GDBusMethodTable asha_ep_methods[] = {
+ { },
+};
+
+static const GDBusPropertyTable asha_ep_properties[] = {
+ { "UUID", "s", get_uuid, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Side", "s", get_side, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Binaural", "b", get_binaural, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "HiSyncId", "ay", get_hisyncid, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Codecs", "q", get_codecs, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Device", "o", get_device, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Transport", "o", get_transport, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { }
+};
+
+static void asha_source_endpoint_register(struct bt_asha_device *asha_dev)
+{
+ char *path;
+ const struct media_endpoint *asha_ep;
+
+ path = make_endpoint_path(asha_dev);
+ if (!path)
+ goto error;
+
+ if (g_dbus_register_interface(btd_get_dbus_connection(),
+ path, MEDIA_ENDPOINT_INTERFACE,
+ asha_ep_methods, NULL,
+ asha_ep_properties,
+ asha_dev, NULL) == FALSE) {
+ error("Could not register remote ep %s", path);
+ goto error;
+ }
+
+ asha_ep = media_endpoint_get_asha();
+ asha_dev->transport = media_transport_create(asha_dev->device, path,
+ NULL, 0, (void *) asha_ep, asha_dev);
+
+error:
+ if (path)
+ free(path);
+}
+
+static void asha_source_endpoint_unregister(struct bt_asha_device *asha)
+{
+ char *path;
+
+ path = make_endpoint_path(asha);
+ if (!path)
+ goto error;
+
+ g_dbus_unregister_interface(btd_get_dbus_connection(),
+ path, MEDIA_ENDPOINT_INTERFACE);
+
+ if (asha->transport) {
+ media_transport_destroy(asha->transport);
+ asha->transport = NULL;
+ }
+
+error:
+ if (path)
+ free(path);
+}
+
+static int asha_source_accept(struct btd_service *service)
+{
+ struct btd_device *device = btd_service_get_device(service);
+ struct gatt_db *db = btd_device_get_gatt_db(device);
+ struct bt_gatt_client *client = btd_device_get_gatt_client(device);
+ struct bt_asha_device *asha_dev = btd_service_get_user_data(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Accepting ASHA connection on %s", addr);
+
+ if (!asha_dev) {
+ /* Can this actually happen? */
+ DBG("Not handling ASHA profile");
+ return -1;
+ }
+
+ if (!bt_asha_probe(asha_dev->asha, db, client))
+ return -1;
+
+ asha_source_endpoint_register(asha_dev);
+
+ btd_service_connecting_complete(service, 0);
+
+ return 0;
+}
+
+static int asha_source_disconnect(struct btd_service *service)
+{
+ struct btd_device *device = btd_service_get_device(service);
+ struct bt_asha_device *asha_dev = btd_service_get_user_data(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Disconnecting ASHA on %s", addr);
+
+ if (!asha_dev) {
+ /* Can this actually happen? */
+ DBG("Not handlihng ASHA profile");
+ return -1;
+ }
+
+ asha_source_endpoint_unregister(asha_dev);
+ bt_asha_reset(asha_dev->asha);
+
+ btd_service_disconnecting_complete(service, 0);
+
+ return 0;
+}
+
+static struct btd_profile asha_source_profile = {
+ .name = "asha-source",
+ .priority = BTD_PROFILE_PRIORITY_MEDIUM,
+ .remote_uuid = ASHA_PROFILE_UUID,
+ .experimental = true,
+
+ .device_probe = asha_source_device_probe,
+ .device_remove = asha_source_device_remove,
+
+ .auto_connect = true,
+ .accept = asha_source_accept,
+ .disconnect = asha_source_disconnect,
+};
+
+static int asha_init(void)
+{
+ int err;
+
+ err = btd_profile_register(&asha_source_profile);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+static void asha_exit(void)
+{
+ btd_profile_unregister(&asha_source_profile);
+}
+
+BLUETOOTH_PLUGIN_DEFINE(asha, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
+ asha_init, asha_exit)
diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h
new file mode 100644
index 000000000..afd23e137
--- /dev/null
+++ b/profiles/audio/asha.h
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "src/shared/asha.h"
+
+struct bt_asha_device;
+
+unsigned int bt_asha_device_start(struct bt_asha_device *asha_dev,
+ bt_asha_cb_t cb, void *user_data);
+unsigned int bt_asha_device_stop(struct bt_asha_device *asha_dev,
+ bt_asha_cb_t cb, void *user_data);
+
+void bt_asha_device_state_reset(struct bt_asha_device *asha_dev);
+unsigned int bt_asha_device_device_get_resume_id(
+ struct bt_asha_device *asha_dev);
+
+uint16_t bt_asha_device_get_render_delay(struct bt_asha_device *asha_dev);
+enum bt_asha_state_t bt_asha_device_get_state(
+ struct bt_asha_device *asha_dev);
+
+int bt_asha_device_get_fd(struct bt_asha_device *asha_dev);
+uint16_t bt_asha_device_get_omtu(struct bt_asha_device *asha_dev);
+uint16_t bt_asha_device_get_imtu(struct bt_asha_device *asha_dev);
+
+int8_t bt_asha_device_get_volume(struct bt_asha_device *asha_dev);
+bool bt_asha_device_set_volume(struct bt_asha_device *asha_dev, int8_t volume);
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 4bbd584de..b5644736a 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -38,6 +38,7 @@
#include "src/log.h"
#include "src/error.h"
#include "src/gatt-database.h"
+#include "src/shared/asha.h"
#include "src/shared/util.h"
#include "src/shared/queue.h"
#include "src/shared/att.h"
@@ -88,6 +89,7 @@ struct endpoint_request {
struct media_endpoint {
struct a2dp_sep *sep;
struct bt_bap_pac *pac;
+ struct bt_asha_device *asha;
char *sender; /* Endpoint DBus bus id */
char *path; /* Endpoint object path */
char *uuid; /* Endpoint property UUID */
@@ -1330,6 +1332,12 @@ static bool endpoint_init_broadcast_sink(struct media_endpoint *endpoint,
return endpoint_init_pac(endpoint, BT_BAP_BCAST_SINK, err);
}
+static bool endpoint_init_asha(struct media_endpoint *endpoint,
+ int *err)
+{
+ return true;
+}
+
static bool endpoint_properties_exists(const char *uuid,
struct btd_device *dev,
void *user_data)
@@ -1454,6 +1462,11 @@ static bool experimental_bcast_sink_ep_supported(struct btd_adapter *adapter)
return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
}
+static bool experimental_asha_supported(struct btd_adapter *adapter)
+{
+ return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
+}
+
static const struct media_endpoint_init {
const char *uuid;
bool (*func)(struct media_endpoint *endpoint, int *err);
@@ -1471,6 +1484,8 @@ static const struct media_endpoint_init {
experimental_broadcaster_ep_supported },
{ BAA_SERVICE_UUID, endpoint_init_broadcast_sink,
experimental_bcast_sink_ep_supported },
+ { ASHA_PROFILE_UUID, endpoint_init_asha,
+ experimental_asha_supported },
};
static struct media_endpoint *
@@ -3393,3 +3408,18 @@ bool media_endpoint_is_broadcast(struct media_endpoint *endpoint)
return false;
}
+
+const struct media_endpoint *media_endpoint_get_asha(void)
+{
+ /*
+ * Because ASHA does not require the application to register an
+ * endpoint, we need a minimal media_endpoint for transport creation to
+ * work, so let's create one
+ */
+ static struct media_endpoint asha_endpoint = {
+ .uuid = ASHA_PROFILE_UUID,
+ .codec = 0x2, /* Currently on G.722 is defined by the spec */
+ };
+
+ return &asha_endpoint;
+}
diff --git a/profiles/audio/media.h b/profiles/audio/media.h
index 2b579877b..2b2e8e157 100644
--- a/profiles/audio/media.h
+++ b/profiles/audio/media.h
@@ -24,3 +24,5 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
struct media_endpoint *endpoint);
bool media_endpoint_is_broadcast(struct media_endpoint *endpoint);
int8_t media_player_get_device_volume(struct btd_device *device);
+
+const struct media_endpoint *media_endpoint_get_asha(void);
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 5b11bfeb6..0ce94bae3 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -37,6 +37,7 @@
#include "src/shared/bap.h"
#include "src/shared/io.h"
+#include "asha.h"
#include "avdtp.h"
#include "media.h"
#include "transport.h"
@@ -115,7 +116,7 @@ struct media_transport {
char *path; /* Transport object path */
struct btd_device *device; /* Transport device */
struct btd_adapter *adapter; /* Transport adapter bcast*/
- const char *remote_endpoint; /* Transport remote SEP */
+ char *remote_endpoint; /* Transport remote SEP */
struct media_endpoint *endpoint; /* Transport endpoint */
struct media_owner *owner; /* Transport owner */
uint8_t *configuration; /* Transport configuration */
@@ -219,6 +220,9 @@ void media_transport_destroy(struct media_transport *transport)
g_dbus_unregister_interface(btd_get_dbus_connection(), path,
MEDIA_TRANSPORT_INTERFACE);
+ if (transport->remote_endpoint)
+ g_free(transport->remote_endpoint);
+
g_free(path);
}
@@ -1199,6 +1203,32 @@ static const GDBusPropertyTable transport_bap_bc_properties[] = {
{ }
};
+static gboolean get_asha_delay(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct media_transport *transport = data;
+ struct bt_asha_device *asha_dev = transport->data;
+ uint16_t delay;
+
+ // Delay property is in 1/10ths of ms, while ASHA RenderDelay is in ms
+ delay = bt_asha_device_get_render_delay(asha_dev) * 10;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &delay);
+
+ return TRUE;
+}
+
+static const GDBusPropertyTable transport_asha_properties[] = {
+ { "Device", "o", get_device },
+ { "Endpoint", "o", get_endpoint, NULL, endpoint_exists },
+ { "UUID", "s", get_uuid },
+ { "Codec", "y", get_codec },
+ { "State", "s", get_state },
+ { "Delay", "q", get_asha_delay },
+ { "Volume", "q", get_volume, set_volume, volume_exists },
+ { }
+};
+
static void transport_a2dp_destroy(void *data)
{
struct a2dp_transport *a2dp = data;
@@ -1716,6 +1746,164 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
return bap;
}
+static void asha_transport_sync_state(struct media_transport *transport,
+ struct bt_asha_device *asha_dev)
+{
+ switch (bt_asha_device_get_state(asha_dev)) {
+ case ASHA_STOPPED:
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ break;
+ case ASHA_STARTING:
+ transport_set_state(transport, TRANSPORT_STATE_REQUESTING);
+ break;
+ case ASHA_STARTED:
+ transport_set_state(transport, TRANSPORT_STATE_ACTIVE);
+ break;
+ case ASHA_STOPPING:
+ transport_set_state(transport, TRANSPORT_STATE_SUSPENDING);
+ break;
+ }
+}
+
+static void asha_transport_state_cb(int status, void *user_data)
+{
+ struct media_owner *owner = user_data;
+ struct media_transport *transport = owner->transport;
+ struct bt_asha_device *asha_dev;
+ enum bt_asha_state_t state;
+
+ if (!transport) {
+ DBG("Lost owner while connecting, bailing");
+ return;
+ }
+
+ asha_dev = transport->data;
+ state = bt_asha_device_get_state(asha_dev);
+
+ if (state == ASHA_STARTED) {
+ int fd;
+ uint16_t imtu, omtu;
+ gboolean ret;
+
+ fd = bt_asha_device_get_fd(asha_dev);
+ imtu = bt_asha_device_get_imtu(asha_dev);
+ omtu = bt_asha_device_get_omtu(asha_dev);
+
+ media_transport_set_fd(transport, fd, imtu, omtu);
+
+ owner->pending->id = 0;
+ ret = g_dbus_send_reply(btd_get_dbus_connection(),
+ owner->pending->msg,
+ DBUS_TYPE_UNIX_FD, &fd,
+ DBUS_TYPE_UINT16, &imtu,
+ DBUS_TYPE_UINT16, &omtu,
+ DBUS_TYPE_INVALID);
+ if (!ret) {
+ media_transport_remove_owner(transport);
+ return;
+ }
+
+ media_owner_remove(owner);
+ } else if (state == ASHA_STOPPED) {
+ if (owner->pending) {
+ owner->pending->id = 0;
+ media_request_reply(owner->pending, 0);
+ media_owner_remove(owner);
+ }
+
+ media_transport_remove_owner(transport);
+ }
+
+ asha_transport_sync_state(transport, asha_dev);
+}
+
+static guint transport_asha_resume(struct media_transport *transport,
+ struct media_owner *owner)
+{
+ struct bt_asha_device *asha_dev = transport->data;
+ guint ret;
+
+ ret = bt_asha_device_start(asha_dev, asha_transport_state_cb, owner);
+ asha_transport_sync_state(transport, asha_dev);
+
+ return ret > 0 ? ret : 0;
+}
+
+static guint transport_asha_suspend(struct media_transport *transport,
+ struct media_owner *owner)
+{
+ struct bt_asha_device *asha_dev = transport->data;
+ guint ret = 0;
+
+ if (owner) {
+ ret = bt_asha_device_stop(asha_dev, asha_transport_state_cb,
+ owner);
+ asha_transport_sync_state(transport, asha_dev);
+ } else {
+ ret = bt_asha_device_stop(asha_dev, NULL, NULL);
+ /* We won't have a callback to set the final state */
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ }
+
+ return ret;
+}
+
+static void transport_asha_cancel(struct media_transport *transport, guint id)
+{
+ struct bt_asha_device *asha_dev = transport->data;
+ enum bt_asha_state_t state = bt_asha_device_get_state(asha_dev);
+
+ if (id != bt_asha_device_device_get_resume_id(asha_dev)) {
+ /* Not current, ignore */
+ DBG("Ignoring cancel request for id %d", id);
+ return;
+ }
+
+ if (state == ASHA_STARTING || state == ASHA_STARTED) {
+ DBG("Cancel requested, stopping");
+ bt_asha_device_stop(asha_dev, NULL, NULL);
+ /* We won't have a callback to set the final state */
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ } else if (state == ASHA_STOPPING) {
+ DBG("Cancel requested, resetting transport state");
+ /* We already dispatched a stop, just reset our state */
+ bt_asha_device_state_reset(asha_dev);
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ }
+}
+
+static int8_t transport_asha_get_volume(struct media_transport *transport)
+{
+ struct bt_asha_device *asha_dev = transport->data;
+ int8_t volume;
+ int scaled_volume;
+
+ volume = bt_asha_device_get_volume(asha_dev);
+
+ /* Convert -128-0 to 0-127 */
+ scaled_volume = ((((int) volume) + 128) * 127) / 128;
+
+ return scaled_volume;
+}
+
+static int transport_asha_set_volume(struct media_transport *transport,
+ int8_t volume)
+{
+ struct bt_asha_device *asha_dev = transport->data;
+ int scaled_volume;
+
+ /* Convert 0-127 to -128-0 */
+ scaled_volume = ((((int) volume) * 128) / 127) - 128;
+
+ return bt_asha_device_set_volume(asha_dev, scaled_volume) ? 0 : -EIO;
+}
+
+static void *transport_asha_init(struct media_transport *transport, void *data)
+{
+ /* We just store the struct asha_device on the transport */
+ return data;
+}
+
#define TRANSPORT_OPS(_uuid, _props, _set_owner, _remove_owner, _init, \
_resume, _suspend, _cancel, _set_state, _get_stream, \
_get_volume, _set_volume, _destroy) \
@@ -1757,6 +1945,14 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
#define BAP_BC_OPS(_uuid) \
BAP_OPS(_uuid, transport_bap_bc_properties, NULL, NULL)
+#define ASHA_OPS(_uuid) \
+ TRANSPORT_OPS(_uuid, transport_asha_properties, NULL, NULL, \
+ transport_asha_init, \
+ transport_asha_resume, transport_asha_suspend, \
+ transport_asha_cancel, NULL, NULL, \
+ transport_asha_get_volume, transport_asha_set_volume, \
+ NULL)
+
static const struct media_transport_ops transport_ops[] = {
A2DP_OPS(A2DP_SOURCE_UUID, transport_a2dp_src_init,
transport_a2dp_src_set_volume,
@@ -1768,6 +1964,7 @@ static const struct media_transport_ops transport_ops[] = {
BAP_UC_OPS(PAC_SINK_UUID),
BAP_BC_OPS(BCAA_SERVICE_UUID),
BAP_BC_OPS(BAA_SERVICE_UUID),
+ ASHA_OPS(ASHA_PROFILE_UUID),
};
static const struct media_transport_ops *
@@ -1805,7 +2002,7 @@ struct media_transport *media_transport_create(struct btd_device *device,
transport->endpoint = endpoint;
transport->configuration = util_memdup(configuration, size);
transport->size = size;
- transport->remote_endpoint = remote_endpoint;
+ transport->remote_endpoint = g_strdup(remote_endpoint);
if (device)
transport->path = g_strdup_printf("%s/fd%d",
--
2.45.2
Hi Paul!
On Tue, 11 Jun 2024 at 01:45, Paul Menzel <[email protected]> wrote:
[...]
>
> Could you add a tag
>
> Resolves: https://github.com/bluez/bluez/issues/481
Done.
> and maybe elaborate, where the spec can be found, how this can be
> tested, and with what devices you tested this?
Also done, v10 is en route now with these details in the cover letter.
Thanks for the feedback!
Arun