From patchwork Wed May 8 15:46:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Raghavan X-Patchwork-Id: 13658883 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7E74128368 for ; Wed, 8 May 2024 15:46:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183178; cv=none; b=dkx0cBxL0xwRjAYwftjFDrKEoa8gpBoAtzuwaNuY6DvgQDbT5AuadxN3fuH96X9oNTKMn91hLYvxu4nZJbTCqzXF2RFR/EtN7ZQEYu8f7sO/8baqlJqdCOCxiT/+BqB44q7SE3t6r+nlsyVdFPrO3J7ObLXRx2uxrmdNGvQIyrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183178; c=relaxed/simple; bh=vZGqWPTrjGImtBqcsypX9SSyB3Qh7ywww2os9na4m5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X46LXsEp6PT2xlK9WfqPkmGGg85NzgpWulOrLhvecIVJCVqL+t7lZ+XB/ebltTrUonWS30S1yWTPxzKyTOs3DUMUbBeg6+E0SXK9TFOfvzp6WD2xMu/6t2TNj1hukR400rBJN5+Oh4JAwsy57ctzZjPX1GqXVdiD5+ncB1Eu63s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io; spf=pass smtp.mailfrom=asymptotic.io; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b=UPYOHOmV; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b="UPYOHOmV" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-43de92e236fso1092201cf.1 for ; Wed, 08 May 2024 08:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asymptotic.io; s=google; t=1715183173; x=1715787973; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eow+Falyw07AuU03HGJ5LMLcWpIx2x/eZ240HBblk+Y=; b=UPYOHOmVVUP+1NthJ6/YHWmcaX9h6eIqzNhrC2ta5SR2/G4B9XpRqz3GfHKusVF8RZ VWwxG6iWMm8Dm25H3y38fOZjSPZRIkYO4JDYNAwq/TGkqJfcAZVD2dy7o6D+toL3StdW VvtCxNyYPdjSrJHlb5ni1eRxcpUGtHp8VaMilXbaq2VMx87X+ldtlVyHJEkY6mcR65T4 oFsU69+CoQpNtWCIZHfq+6ra+6Vv+mlmtESrv+33BPsiECt9Ff3lxML9gZ1pb6yVeVEj 2071U5Z2SJveXzMXdyGLPQ0ml5x7M6ykHCeDpO64qlHXyxemrtsSFdFL4eKpoBL1XDlC FTFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715183173; x=1715787973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eow+Falyw07AuU03HGJ5LMLcWpIx2x/eZ240HBblk+Y=; b=A9/YvgfdtNLprXj9dzZ+HE2v4+v3iN9c+r+WnR5f+Q5t6p6McZGLo9NiZW1W8Sa9Fs zhwDmX55kx7eim6flYySCs7wlGAsbFArzqF7cVRMmd/ddYnaiWJO+fAr1mF2z4m7ek7V yJyIhcjA2pyFtDk+vt0NtX5j8VNS1e4crF12ErmHtjhN0V8zabRkRoPgPY+50jYCwmzr wpLLVxwU0848lQaVSatkznC1jr/osuZM5k8qGHQ36ArSZnrIx8QzcPHCwhOrVVMS0T1K gK8O9yja6TdtYKPgeLfjZJ1L/oZ0kmspsUjAkKAgWfJdf4oc8xdEYz6PtbU8+FADNSuS hnPQ== X-Gm-Message-State: AOJu0YyfNvLIvENOPZDnONbniBB/y+uRWWVMp9JUi92DNWwJ5RIbp7gd mwHAV99x+pqdHItSqeRbU7+9HV9RGNadzhEorVmIkYRM5AGMVcR3f0dfCw0y/Df6t1ReH87GGeG F X-Google-Smtp-Source: AGHT+IFhzgrwzSyVtDIeYWKj0LZYlUip38fCP343oJsDVCc4TYWE9RnLyuVwCAYCCLannJDXHFRz3g== X-Received: by 2002:a05:622a:c5:b0:43a:bcd7:9898 with SMTP id d75a77b69052e-43dbec04512mr31718061cf.5.1715183173100; Wed, 08 May 2024 08:46:13 -0700 (PDT) Received: from andromeda.lan (bras-base-toroon0359w-grc-19-74-15-47-99.dsl.bell.ca. [74.15.47.99]) by smtp.gmail.com with ESMTPSA id cd14-20020a05622a418e00b0043791f7d831sm7756513qtb.63.2024.05.08.08.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 08:46:12 -0700 (PDT) From: Arun Raghavan To: linux-bluetooth@vger.kernel.org Cc: Arun Raghavan Subject: [PATCH BlueZ 1/5] profiles: Add initial code for an ASHA plugin Date: Wed, 8 May 2024 11:46:00 -0400 Message-ID: <20240508154604.276763-2-arun@asymptotic.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240508154604.276763-1-arun@asymptotic.io> References: <20240508154604.276763-1-arun@asymptotic.io> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This implements the server role for the Audio Streaming for Hearing Aid specification[1]. 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. [1] https://source.android.com/docs/core/connect/bluetooth/asha --- Makefile.plugins | 5 + configure.ac | 4 + lib/uuid.h | 3 + profiles/audio/asha.c | 761 +++++++++++++++++++++++++++++++++++++ profiles/audio/asha.h | 34 ++ profiles/audio/media.c | 28 ++ profiles/audio/media.h | 2 + profiles/audio/transport.c | 147 ++++++- 8 files changed, 982 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..e196e1d2e 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.c +endif diff --git a/configure.ac b/configure.ac index 9dea70ddc..826b34518 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/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/profiles/audio/asha.c b/profiles/audio/asha.c new file mode 100644 index 000000000..c6769038f --- /dev/null +++ b/profiles/audio/asha.c @@ -0,0 +1,761 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2024 Asymptotic Inc. + * + * Author: Arun Raghavan + * + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include + +#include +#include + +#include "gdbus/gdbus.h" +#include "lib/bluetooth.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/att.h" +#include "src/shared/gatt-client.h" +#include "src/shared/gatt-db.h" +#include "src/shared/util.h" + +#include "profiles/audio/media.h" +#include "profiles/audio/transport.h" + +#include "asha.h" +#include "l2cap.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" + +#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1" + +// 1 sequence number, 4 for L2CAP header, 2 for SDU, and then 20ms of G.722 +#define ASHA_MTU 167 + +struct asha_device { + struct btd_device *device; + struct bt_gatt_client *client; + struct gatt_db *db; + struct gatt_db_attribute *attr; + uint16_t acp_handle; + unsigned int 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; + + struct media_transport *transport; + int fd; + asha_state_t state; + asha_cb_t cb; + void *cb_user_data; + int resume_id; +}; + +static struct asha_device *asha_device_new(void) +{ + struct asha_device *asha; + + asha = new0(struct asha_device, 1); + + return asha; +} + +static void asha_device_reset(struct asha_device *asha) +{ + if (asha->notify_id) + bt_gatt_client_unregister_notify(asha->client, + asha->notify_id); + + gatt_db_unref(asha->db); + asha->db = NULL; + + bt_gatt_client_unref(asha->client); + asha->client = NULL; + + asha->psm = 0; +} + +static void asha_state_reset(struct asha_device *asha) +{ + close(asha->fd); + asha->fd = -1; + + asha->state = ASHA_STOPPED; + asha->resume_id = 0; + + asha->cb = NULL; + asha->cb_user_data = NULL; +} + +static void asha_device_free(struct asha_device *asha) +{ + gatt_db_unref(asha->db); + bt_gatt_client_unref(asha->client); + free(asha); +} + +uint16_t asha_device_get_render_delay(struct asha_device *asha) +{ + return asha->render_delay; +} + +asha_state_t asha_device_get_state(struct asha_device *asha) +{ + return asha->state; +} + +int asha_device_get_fd(struct asha_device *asha) +{ + return asha->fd; +} + +uint16_t asha_device_get_mtu(struct asha_device *asha) +{ + return ASHA_MTU; +} + +static int asha_connect_socket(struct asha_device *asha) +{ + int fd = 0, err, ret = 0; + struct sockaddr_l2 addr = { 0, }; + struct l2cap_options opts; + + fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP); + if (fd < 0) { + error("Could not open L2CAP CoC socket: %s", strerror(errno)); + goto error; + } + + addr.l2_family = AF_BLUETOOTH; + addr.l2_bdaddr_type = BDADDR_LE_PUBLIC; + + // We need to bind before connect to work around getting the wrong addr + // type on older(?) kernels + err = bind(fd, (struct sockaddr *) &addr, sizeof(addr)); + if (err < 0) { + error("Could not bind L2CAP CoC socket: %s", strerror(errno)); + goto error; + } + + addr.l2_psm = asha->psm; + bacpy(&addr.l2_bdaddr, device_get_address(asha->device)); + + opts.mode = BT_MODE_LE_FLOWCTL; + opts.omtu = opts.imtu = ASHA_MTU; + + err = setsockopt(fd, SOL_BLUETOOTH, BT_MODE, &opts.mode, + sizeof(opts.mode)); + if (err < 0) { + error("Could not set L2CAP CoC socket flow control mode: %s", + strerror(errno)); + // Let this be non-fatal? + } + + err = setsockopt(fd, SOL_BLUETOOTH, BT_RCVMTU, &opts.imtu, sizeof(opts.imtu)); + if (err < 0) { + error("Could not set L2CAP CoC socket receive MTU: %s", + strerror(errno)); + // Let this be non-fatal? + } + + err = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); + if (err < 0) { + error("Could not connect L2CAP CoC socket: %s", strerror(errno)); + goto error; + } + + DBG("L2CAP CoC socket is open"); + return fd; + +error: + if (fd) + close(fd); + return -1; +} + +static void asha_acp_sent(bool success, uint8_t err, void *user_data) +{ + struct asha_device *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); + + asha_state_reset(asha); + } +} + +static int asha_send_acp(struct asha_device *asha, uint8_t *cmd, + unsigned int len, 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 start"); + return -1; + } + + asha->cb = cb; + asha->cb_user_data = user_data; + + return 0; +} + +unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb, + void *user_data) +{ + uint8_t acp_start_cmd[] = { + 0x01, // START + 0x01, // G.722, 16 kHz + 0, // Unknown media type + 0, // Other disconnected + }; + int ret; + + if (asha->state != ASHA_STOPPED) { + error("ASHA device start failed. Bad state %d", asha->state); + return 0; + } + + ret = asha_connect_socket(asha); + if (ret < 0) + return 0; + + asha->fd = ret; + + ret = asha_send_acp(asha, acp_start_cmd, sizeof(acp_start_cmd), cb, + user_data); + if (ret < 0) + return 0; + + asha->state = ASHA_STARTING; + + return (++asha->resume_id); +} + +unsigned int asha_device_stop(struct asha_device *asha, 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; + + ret = asha_send_acp(asha, acp_stop_cmd, sizeof(acp_stop_cmd), cb, + user_data); + if (ret < 0) + return 0; + + return asha->resume_id; +} + +static char *make_endpoint_path(struct asha_device *asha) +{ + char *path; + int err; + + err = asprintf(&path, "%s/asha", device_get_path(asha->device)); + if (err < 0) { + error("Could not allocate path for remote %s", + device_get_path(asha->device)); + return NULL; + } + + return path; + +} + +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 asha_device *asha = user_data; + + if (!success) { + DBG("Reading PSM failed with ATT errror: %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 asha_device *asha = user_data; + + if (!success) { + DBG("Reading ROPs failed with ATT errror: %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); +} + +void audio_status_notify(uint16_t value_handle, const uint8_t *value, + uint16_t length, void *user_data) +{ + struct asha_device *asha = user_data; + uint8_t status = *value; + // Back these up to survive the reset paths + asha_cb_t cb = asha->cb; + 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 { + asha_state_reset(asha); + DBG("ASHA start failed"); + } + } else if (asha->state == ASHA_STOPPING) { + // We reset our state, regardless + 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 asha_device *asha = user_data; + uint16_t value_handle; + bt_uuid_t uuid; + + if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle, NULL, + NULL, &uuid)) { + error("Failed to obtain characteristic data"); + return; + } + + if (uuid_cmp(ASHA_CHRC_LE_PSM_OUT_UUID, &uuid)) { + if (!bt_gatt_client_read_value(asha->client, value_handle, + read_psm, asha, NULL)) + DBG("Failed to send request to read battery level"); + } if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) { + if (!bt_gatt_client_read_value(asha->client, value_handle, + read_rops, asha, NULL)) + DBG("Failed to send request to read battery level"); + } if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) { + // Store this for later writes + asha->acp_handle = value_handle; + } if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) { + asha->notify_id = bt_gatt_client_register_notify(asha->client, + value_handle, NULL, audio_status_notify, asha, + NULL); + if (!asha->notify_id) + DBG("Failed to send request to read battery level"); + } else { + char uuid_str[MAX_LEN_UUID_STR]; + + bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str)); + DBG("Unsupported characteristic: %s", uuid_str); + } +} + +static void foreach_asha_service(struct gatt_db_attribute *attr, void *user_data) +{ + struct asha_device *asha = user_data; + + DBG("Found ASHA GATT service"); + + asha->attr = attr; + gatt_db_service_foreach_char(asha->attr, handle_characteristic, asha); +} + +static DBusMessage *asha_set_configuration(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + return NULL; +} + +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 asha_device *asha = data; + const char *side = asha->right_side ? "right" : "left"; + + // Use a string in case we want to support anything else 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 asha_device *asha = data; + dbus_bool_t binaural = asha->binaural; + + // Use a string in case we want to support anything else in the future + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &binaural); + + return TRUE; +} + +static gboolean get_hisyncid(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct asha_device *asha = data; + DBusMessageIter array; + uint8_t *hisyncid = 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->hisyncid)); + + dbus_message_iter_close_container(iter, &array); + + return TRUE; +} + +static gboolean get_codecs(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct asha_device *asha = data; + dbus_uint16_t codecs = asha->codec_ids; + + // Use a string in case we want to support anything else in the future + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &codecs); + + return TRUE; +} + +static gboolean get_device(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct asha_device *asha = data; + const char *path; + + path = device_get_path(asha->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 asha_device *asha = data; + const char *path; + + path = media_transport_get_path(asha->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 asha_device *asha; + 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 = asha_device_new(); + asha->device = device; + + btd_service_set_user_data(service, asha); + + return 0; +} + +static void asha_source_device_remove(struct btd_service *service) +{ + struct asha_device *asha; + 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 = btd_service_get_user_data(service); + if (!asha) { + // Can this actually happen? + DBG("Not handlihng ASHA profile"); + return; + } + + asha_device_free(asha); +} + +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 asha_device *asha) +{ + char *path; + const struct media_endpoint *asha_ep; + + path = make_endpoint_path(asha); + 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, NULL) == FALSE) { + error("Could not register remote ep %s", path); + goto error; + } + + asha_ep = media_endpoint_get_asha(); + asha->transport = media_transport_create(asha->device, path, NULL, 0, + (void *) asha_ep, asha); + +error: + if (path) + free(path); + return; +} + +static void asha_source_endpoint_unregister(struct 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 asha_device *asha = btd_service_get_user_data(service); + bt_uuid_t asha_uuid; + char addr[18]; + + ba2str(device_get_address(device), addr); + DBG("Accepting ASHA connection on %s", addr); + + if (!asha) { + // Can this actually happen? + DBG("Not handling ASHA profile"); + return -1; + } + + 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"); + asha_device_reset(asha); + return -1; + } + + asha_source_endpoint_register(asha); + + 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 gatt_db *db = btd_device_get_gatt_db(device); + struct bt_gatt_client *client = btd_device_get_gatt_client(device); + struct asha_device *asha = btd_service_get_user_data(service); + bt_uuid_t asha_uuid; + char addr[18]; + + ba2str(device_get_address(device), addr); + DBG("Disconnecting ASHA on %s", addr); + + if (!asha) { + // Can this actually happen? + DBG("Not handlihng ASHA profile"); + return -1; + } + + asha_source_endpoint_unregister(asha); + asha_device_reset(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..0fc28e8a3 --- /dev/null +++ b/profiles/audio/asha.h @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2024 Asymptotic Inc. + * + * Author: Arun Raghavan + * + * + */ + +#include + +struct asha_device; + +typedef enum { + ASHA_STOPPED = 0, + ASHA_STARTING, + ASHA_STARTED, + ASHA_STOPPING, +} asha_state_t; + +typedef void (*asha_cb_t)(int status, void *data); + +uint16_t asha_device_get_render_delay(struct asha_device *asha); +asha_state_t asha_device_get_state(struct asha_device *asha); +int asha_device_get_fd(struct asha_device *asha); +uint16_t asha_device_get_mtu(struct asha_device *asha); + +unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb, + void *user_data); +unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb, + void *user_data); diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 07147a25d..68ce2f17c 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -44,6 +44,7 @@ #include "src/shared/bap.h" #include "src/shared/bap-debug.h" +#include "asha.h" #include "avdtp.h" #include "media.h" #include "transport.h" @@ -88,6 +89,7 @@ struct endpoint_request { struct media_endpoint { struct a2dp_sep *sep; struct bt_bap_pac *pac; + struct asha_device *asha; char *sender; /* Endpoint DBus bus id */ char *path; /* Endpoint object path */ char *uuid; /* Endpoint property UUID */ @@ -1329,6 +1331,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) @@ -1453,6 +1461,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); @@ -1470,6 +1483,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 * @@ -3392,3 +3407,16 @@ bool media_endpoint_is_broadcast(struct media_endpoint *endpoint) return false; } + +const struct media_endpoint *media_endpoint_get_asha() +{ + // 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..68c57cfc3 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(); diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 159fbd575..a104d27c0 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" @@ -90,6 +91,10 @@ struct bap_transport { guint resume_id; }; +struct asha_transport { + uint16_t delay; +}; + struct media_transport_ops { const char *uuid; const GDBusPropertyTable *properties; @@ -115,7 +120,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 +224,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 +1207,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 asha_device *asha = transport->data; + uint16_t delay; + + // Delay property is in 1/10ths of ms, while ASHA RenderDelay is in ms + delay = asha_device_get_render_delay(asha) * 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; @@ -1713,6 +1747,106 @@ static void *transport_bap_init(struct media_transport *transport, void *stream) return bap; } +static void asha_transport_sync_state(struct media_transport *transport, + struct asha_device *asha) +{ + switch (asha_device_get_state(asha)) { + 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 asha_device *asha = transport->data; + asha_state_t state; + + state = asha_device_get_state(asha); + + if (state == ASHA_STARTED) { + int fd; + uint16_t imtu, omtu; + gboolean ret; + + fd = asha_device_get_fd(asha); + imtu = omtu = asha_device_get_mtu(asha); + + 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); +} + +static guint transport_asha_resume(struct media_transport *transport, + struct media_owner *owner) +{ + struct asha_device *asha = transport->data; + guint ret; + + ret = asha_device_start(asha, asha_transport_state_cb, owner); + asha_transport_sync_state(transport, asha); + + return ret; +} + +static guint transport_asha_suspend(struct media_transport *transport, + struct media_owner *owner) +{ + struct asha_device *asha = transport->data; + guint ret = 0; + + if (owner) { + ret = asha_device_stop(asha, asha_transport_state_cb, owner); + asha_transport_sync_state(transport, asha); + } else { + ret = asha_device_stop(asha, 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_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) \ @@ -1754,6 +1888,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, \ + NULL, NULL, NULL, \ + NULL, NULL, \ + NULL) + static const struct media_transport_ops transport_ops[] = { A2DP_OPS(A2DP_SOURCE_UUID, transport_a2dp_src_init, transport_a2dp_src_set_volume, @@ -1765,6 +1907,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 * @@ -1802,7 +1945,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", From patchwork Wed May 8 15:46:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Raghavan X-Patchwork-Id: 13658879 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A31812836A for ; Wed, 8 May 2024 15:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183177; cv=none; b=MSWyhYZDp4PflIxIefun5anzr/e01filhwvaNf1hUPFC+8jqvI+FMUmymQsb0uNrlUi6jVtA63K6fl09bNVVYFH5Q/dzlaVW73ns7BqvV8pAoihyathyFg7BYuwba3sQqbulv9HgVCirRd9R4lbWNJ7rlEoRNVrzOCZBaZY8ojA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183177; c=relaxed/simple; bh=qjoqmkW5BwDTnAc03MbNt7KdI8uD+mLMJxTKw9oHdLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yj9G0O1sR1pSHqPyCrmj6sPVKKmWUUkoZ0dMhk0H/NpJ274nnvzRxY/70kO0Q5usHZifa3OOIPf9pIDxtZ//sBHAgM3HdZY1GEHrXR2aNNUgKygSaZ8xt7bdgZOegeLzBEcosxU0yXMriZRWB2ytYCS5DdXlrvtIw10tCCRkh4s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io; spf=pass smtp.mailfrom=asymptotic.io; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b=eIYTYaiH; arc=none smtp.client-ip=209.85.160.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b="eIYTYaiH" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-43ae9962c17so13285591cf.3 for ; Wed, 08 May 2024 08:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asymptotic.io; s=google; t=1715183174; x=1715787974; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aipf2HOsl81RhQIqSKDgR4j/JsalsFZkCBYK1tn5rFo=; b=eIYTYaiHW8QmGyCi/A0GUsfontJd0UqbBETmghHDPed+JQzH6MEt4c2zyTbxA6sHOp P4NHM//+VPQKd/sEFaXUSwRmG+O9IxMm10Y8f7N6t8v8NXHlow7H0tUuDlWXKzUaDoNl sjs9dRdxh+7iTWt2d7lSXe0t55mQbMIRVsLKExCdw0o7YjtT3sMzoyLxvYKYaBN/dUQN +WzvxJWBVJEyTPFoFnRe9AHoD9Qv56+t73wzUcVqK2NeSgCXQ6vQfEO7RH0x8Q62Eyll lc3RgaYSWXVekRYXruEeSN7xbwO6nsrcXE5Hc/sOd4Xofybi6uysrVFf1aT5JaBdHyf5 i1Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715183174; x=1715787974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aipf2HOsl81RhQIqSKDgR4j/JsalsFZkCBYK1tn5rFo=; b=oSQM1FdGWms2po8VCL9M8YeCgLIgLDQMIuLQ2SqZdHYLrYmERE0iED1HoWNoON/ug9 YgDICpGBCPgj0vw7+RoYyo25gjFsO9UWaL026U40yytthwe86Am2OZZvs+Lup5Ge5m+8 nrrMTVUqXtIt2CISkvC1uhkABrIzvgGRQnblOrQwX78GiumWbdd1/1FNvHinZxrSmk5e vEUQtgvOqpfdj4nShcnm55aS/1SHomGMYy/8kv0doBpF6ZXJK/ctq9QX9Q9iUDUbspPK pQYSDi9WwXJTI0KMnwS8j2Tl3XM1M5WLHnesCQeYGNLiamGagQMwqQzXkU1+JPSZhFmt e+VA== X-Gm-Message-State: AOJu0YwpQYShuSpn8MZy2WWl9cowUxuJgLa4AieV1QPhXqrPHsqq2NNK d1Odgvmmy5TcUhwOUDvDqAHsFM/yKyvuP1HHBmvksvbjG3BcQ5V+k6kGymBwRzylre2wbnpVTh+ v X-Google-Smtp-Source: AGHT+IFotrZyIAUqayZc9/YrXIBsuzz3yy0gdM/mQaw9HlldKXnM4gEzGEgGqTuJK/3P781oRRNVgQ== X-Received: by 2002:a05:622a:d3:b0:43a:ed55:f3a9 with SMTP id d75a77b69052e-43dbed3b59bmr33956271cf.30.1715183173855; Wed, 08 May 2024 08:46:13 -0700 (PDT) Received: from andromeda.lan (bras-base-toroon0359w-grc-19-74-15-47-99.dsl.bell.ca. [74.15.47.99]) by smtp.gmail.com with ESMTPSA id cd14-20020a05622a418e00b0043791f7d831sm7756513qtb.63.2024.05.08.08.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 08:46:13 -0700 (PDT) From: Arun Raghavan To: linux-bluetooth@vger.kernel.org Cc: Arun Raghavan Subject: [PATCH BlueZ 2/5] asha: Implement volume on transport Date: Wed, 8 May 2024 11:46:01 -0400 Message-ID: <20240508154604.276763-3-arun@asymptotic.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240508154604.276763-1-arun@asymptotic.io> References: <20240508154604.276763-1-arun@asymptotic.io> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We convert from the spec definition of the range to the DBus API range to make it easier for clients to not have to worry about that detail, and share an implementation with other uses of MediaTransport1. --- profiles/audio/asha.c | 88 +++++++++++++++++++++++++++++++++++--- profiles/audio/asha.h | 4 ++ profiles/audio/transport.c | 28 +++++++++++- 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/profiles/audio/asha.c b/profiles/audio/asha.c index c6769038f..a372e0db3 100644 --- a/profiles/audio/asha.c +++ b/profiles/audio/asha.c @@ -65,7 +65,9 @@ struct asha_device { struct gatt_db *db; struct gatt_db_attribute *attr; uint16_t acp_handle; - unsigned int notify_id; + uint16_t volume_handle; + unsigned int status_notify_id; + unsigned int volume_notify_id; uint16_t psm; bool right_side; @@ -75,6 +77,7 @@ struct asha_device { uint8_t hisyncid[8]; uint16_t render_delay; uint16_t codec_ids; + int8_t volume; struct media_transport *transport; int fd; @@ -95,9 +98,15 @@ static struct asha_device *asha_device_new(void) static void asha_device_reset(struct asha_device *asha) { - if (asha->notify_id) + if (asha->status_notify_id) { bt_gatt_client_unregister_notify(asha->client, - asha->notify_id); + asha->status_notify_id); + } + + if (asha->volume_notify_id) { + bt_gatt_client_unregister_notify(asha->client, + asha->volume_notify_id); + } gatt_db_unref(asha->db); asha->db = NULL; @@ -244,6 +253,7 @@ unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb, 0x01, // START 0x01, // G.722, 16 kHz 0, // Unknown media type + asha->volume, // Volume 0, // Other disconnected }; int ret; @@ -290,6 +300,24 @@ unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb, return asha->resume_id; } +int8_t asha_device_get_volume(struct asha_device *asha) +{ + return asha->volume; +} + +bool asha_device_set_volume(struct asha_device *asha, int8_t volume) +{ + if (!bt_gatt_client_write_value(asha->client, asha->volume_handle, + (const uint8_t *)&volume, 1, NULL, NULL, + NULL)) { + error("Error writing ACP start"); + return false; + } + + asha->volume = volume; + return true; +} + static char *make_endpoint_path(struct asha_device *asha) { char *path; @@ -410,6 +438,39 @@ void audio_status_notify(uint16_t value_handle, const uint8_t *value, } } +static void read_volume(bool success, + uint8_t att_ecode, + const uint8_t *value, + uint16_t length, + void *user_data) +{ + struct asha_device *asha = user_data; + + if (!success) { + DBG("Reading volume failed with ATT errror: %u", att_ecode); + return; + } + + if (length != 2) { + DBG("Reading volume failed: unexpected length %u", length); + return; + } + + asha->volume = get_s8(value); + + DBG("Got volume: %d", asha->volume); +} + +void volume_notify(uint16_t value_handle, const uint8_t *value, + uint16_t length, void *user_data) +{ + struct asha_device *asha = user_data; + + asha->volume = get_s8(value); + + DBG("Volume changed: %d", asha->volume); +} + static void handle_characteristic(struct gatt_db_attribute *attr, void *user_data) { @@ -430,16 +491,29 @@ static void handle_characteristic(struct gatt_db_attribute *attr, } if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) { if (!bt_gatt_client_read_value(asha->client, value_handle, read_rops, asha, NULL)) - DBG("Failed to send request to read battery level"); + DBG("Failed to send request for readonly properties"); } if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) { // Store this for later writes asha->acp_handle = value_handle; + } if (uuid_cmp(ASHA_CHRC_VOLUME_UUID, &uuid)) { + // Store this for later reads and writes + asha->volume_handle = value_handle; + asha->volume_notify_id = + bt_gatt_client_register_notify(asha->client, + value_handle, NULL, volume_notify, asha, + NULL); + if (!asha->status_notify_id) + DBG("Failed to send request to notify volume"); + if (!bt_gatt_client_read_value(asha->client, value_handle, + read_volume, asha, NULL)) + DBG("Failed to send request to volume"); } if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) { - asha->notify_id = bt_gatt_client_register_notify(asha->client, + asha->status_notify_id = + bt_gatt_client_register_notify(asha->client, value_handle, NULL, audio_status_notify, asha, NULL); - if (!asha->notify_id) - DBG("Failed to send request to read battery level"); + if (!asha->status_notify_id) + DBG("Failed to send request to notify AudioStatus"); } else { char uuid_str[MAX_LEN_UUID_STR]; diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h index 0fc28e8a3..20bcaa65b 100644 --- a/profiles/audio/asha.h +++ b/profiles/audio/asha.h @@ -10,6 +10,7 @@ * */ +#include #include struct asha_device; @@ -32,3 +33,6 @@ unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb, void *user_data); unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb, void *user_data); + +int8_t asha_device_get_volume(struct asha_device *asha); +bool asha_device_set_volume(struct asha_device *asha, int8_t volume); diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index a104d27c0..b85d96914 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -1841,6 +1841,32 @@ static guint transport_asha_suspend(struct media_transport *transport, return ret; } +static int8_t transport_asha_get_volume(struct media_transport *transport) +{ + struct asha_device *asha = transport->data; + int8_t volume; + int scaled_volume; + + volume = asha_device_get_volume(asha); + + // 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 asha_device *asha = transport->data; + int scaled_volume; + + // Convert 0-127 to -128-0 + scaled_volume = ((((int) volume) * 128) / 127) - 128; + + return asha_device_set_volume(asha, 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 */ @@ -1893,7 +1919,7 @@ static void *transport_asha_init(struct media_transport *transport, void *data) transport_asha_init, \ transport_asha_resume, transport_asha_suspend, \ NULL, NULL, NULL, \ - NULL, NULL, \ + transport_asha_get_volume, transport_asha_set_volume, \ NULL) static const struct media_transport_ops transport_ops[] = { From patchwork Wed May 8 15:46:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Raghavan X-Patchwork-Id: 13658880 Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F31B2126F39 for ; Wed, 8 May 2024 15:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183178; cv=none; b=tTyoAHgZH+yJa8ZJInITrCn3bb1NmftXAyqWi9ctcbAyjR+6/JGlgKOUZENXMCwzVpCGqzsMndAZsJnlv3WvqDcRYAosgJBflqag4Ks4gsqBq22ApfOcza1OhMSI9ObUD4Q40uPYbx+1c2cwoVxHDW51FsFizNSyWFgdHq+EjXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715183178; c=relaxed/simple; bh=nNx6T8y+I4K4Gymzxivq/NvnOwRTIMdW0vn2FHy8dZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g1qnNS2zzgxYo1DcB9YvivuUQEU5BTHqlJ/A7nlIxDhv0LIxYS1hKI69Ak3gmVMonLUdFRt696EfB/u3vs9mgjnF+JpCPK/y5yo4Pp1R6c0Xm1CSEPoVUZ/milrxZk5l533fZIhSgI75GFOf3KT/cENwDbWa2A39f/T/Vu9hvIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io; spf=pass smtp.mailfrom=asymptotic.io; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b=bKl43xuS; arc=none smtp.client-ip=209.85.160.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=asymptotic.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=asymptotic.io header.i=@asymptotic.io header.b="bKl43xuS" Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-23f2996b634so2507402fac.0 for ; Wed, 08 May 2024 08:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asymptotic.io; s=google; t=1715183175; x=1715787975; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FMHpIX9Yw1rlh52aQZ0bbkD2dzqr65a9Vkm4Deux0RI=; b=bKl43xuS0HBFiOKIan0tPIM87f8G74ufGwWTk4D8pmzh3/dV/8tJEH8bzUUL6PQtDn dHhALvD0P3M5NEHyWsMUT3oVm0ocAxB+D6NNR47hsv8ecbNTtNR8kH9a10tuGUp2/jsW p95F3keRo+uNPxbuRqdI1icGInJfE8pZoQNnSiYyOntZcffy5ua2mwuyyDWUFXsJcy9A Xwm5PbhlGWPXzS4UnxVE91EVxoupa/KekTTr/nfMfB8C7kHADu55tGLKNEb/FqQCtyMt zS/ejLph6i9KfDPGKNitxgTjAO+P4NdcF4hd5wZJQQlIo/u7PDJxcgXgZ+IsDso204xA GwFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715183175; x=1715787975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FMHpIX9Yw1rlh52aQZ0bbkD2dzqr65a9Vkm4Deux0RI=; b=Q81JvJJh50c4JXLGygMu7nXWKo5OJ9yVRgmi6vWBTmjVYGpRtb2WVFyrNB/QtfmLaC /O1xd+SJprem8ZcXV/sWbp8Eyw4jRyWJffNO+YpZDH7nnJpVeDBQKhGcMKUhz30JTFy3 n6Kl7XIqJYlZWKky50Ov/UEWjIFWZ9lSLVcPBELorcYk3/Vc/XG0oroXYVeAwevUcDRa QyWRe8cUh+Gsc471hHHqGmZVYwjv71s5h0Y6Y7Jxxvl1EdtBBp1ieSxDwzxjFy4UoSDX HHjRsk/b3e6TZKayAEZQYtGtb3SntysRbqUBWccIKyCgI4PrCzeXYfRU9/ux4yEHyTPN do+A== X-Gm-Message-State: AOJu0Yx1YjkmBAXefUtHJ3ApVNmalwUM4HTcE4c1FPdaKRMzgZvGqHCP yN7reao4MSiT8BAahtuZErnMqNblf7LvtHbhVj+e7qIUjG43amO5V7LV7HXyyw6PheHVYFlRo6d X X-Google-Smtp-Source: AGHT+IFpzkcEdf4Sh3ouP0EYhwDO22ZTYLp4F6dLYGYP2CcsPlXyczEkGxcG6Kp/HLo9oX1eJLeDKw== X-Received: by 2002:a05:6870:524a:b0:22e:8ed:9f7a with SMTP id 586e51a60fabf-240979c065fmr2995280fac.4.1715183174752; Wed, 08 May 2024 08:46:14 -0700 (PDT) Received: from andromeda.lan (bras-base-toroon0359w-grc-19-74-15-47-99.dsl.bell.ca. [74.15.47.99]) by smtp.gmail.com with ESMTPSA id cd14-20020a05622a418e00b0043791f7d831sm7756513qtb.63.2024.05.08.08.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 08:46:14 -0700 (PDT) From: Arun Raghavan To: linux-bluetooth@vger.kernel.org Cc: Arun Raghavan Subject: [PATCH BlueZ 3/5] test: Add a script to test ASHA Date: Wed, 8 May 2024 11:46:02 -0400 Message-ID: <20240508154604.276763-4-arun@asymptotic.io> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240508154604.276763-1-arun@asymptotic.io> References: <20240508154604.276763-1-arun@asymptotic.io> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 | 158 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100755 test/simple-asha diff --git a/test/simple-asha b/test/simple-asha new file mode 100755 index 000000000..feff9d29c --- /dev/null +++ b/test/simple-asha @@ -0,0 +1,158 @@ +#!/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