From patchwork Thu Dec 29 12:28:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15C43C4332F for ; Thu, 29 Dec 2022 12:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231182AbiL2MKE (ORCPT ); Thu, 29 Dec 2022 07:10:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233148AbiL2MKC (ORCPT ); Thu, 29 Dec 2022 07:10:02 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19DE712620 for ; Thu, 29 Dec 2022 04:10:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315801; x=1703851801; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=haZ63aeQDXjvGiKaqek1vC51gPQbXGUp5JwCERsunkY=; b=kdFGi9xwKhPlaZ+DKCk1h9IAunAZ51/0Mua2C+KUCyGEgQL9qar6jeby XOEAOJWoubeve6XAhmMoV/iBXnZT1IaluPwTpOTVIyUWId9ES3/cPMyM7 XGiHCJMvpX5m8ZyPHwvdsGGncaPC+LdE2GfXxQaBgyY6TGvA8qefncJb4 gj84r1DRSVSgu2+y74En++hfyANwsLfmo0F2YV8w9j3qeHDfJneU0CSrW h2idwYbPJa7qD3JVBrwIZRDV1nv60JyxKI1Mcg99VhMpChKEBzVIbsn8o WtSZlhX3aJGjg+UxXCOtac7iUbXZECMiMg+i2qpqrRXLm2jFuEfQF/Ghu A==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744714" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744714" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680079" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680079" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:09:59 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 1/6] shared/bap: Fix handling for Company ID and Vendor Codec ID Date: Thu, 29 Dec 2022 17:58:18 +0530 Message-Id: <20221229122821.340073-2-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds fixes for handing for Company ID and Vendor Codec ID while adding PAC record to database and responding to Attribute Read Request for Sink/Source PAC Characteristics. --- src/shared/bap.c | 5 +++++ src/shared/bap.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 2919f243f..0cafb75e6 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -344,6 +344,8 @@ static void pac_foreach(void *data, void *user_data) p = util_iov_push(iov, sizeof(*p)); p->codec.id = pac->codec.id; + p->codec.cid = pac->codec.cid; + p->codec.vid = pac->codec.vid; if (pac->data) { p->cc_len = pac->data->iov_len; @@ -2383,6 +2385,9 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, if (!bdb) return NULL; + if ((id != 0xff) && ((cid != 0U) || (vid != 0U))) + return NULL; + codec.id = id; codec.cid = cid; codec.vid = vid; diff --git a/src/shared/bap.h b/src/shared/bap.h index 3558d0445..47a15636c 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -39,8 +39,8 @@ struct bt_bap_stream; struct bt_bap_codec { uint8_t id; - uint16_t vid; uint16_t cid; + uint16_t vid; } __packed; struct bt_ltv { From patchwork Thu Dec 29 12:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D71AC4332F for ; Thu, 29 Dec 2022 12:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230369AbiL2MKI (ORCPT ); Thu, 29 Dec 2022 07:10:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233116AbiL2MKG (ORCPT ); Thu, 29 Dec 2022 07:10:06 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECBFDE0FA for ; Thu, 29 Dec 2022 04:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315805; x=1703851805; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=L4BwPiUV6sLj1GRzmplOf9fFjekMwUzdJJjfwiebKPQ=; b=E6CQFhm73ysPzCwDYTieZ+kn8z1/BizA0TxPKfwMtfyvcaMRnCKLDBAZ KJ3rqywlo1hctQoCBf5EzRsqCBHECAPJyNpeJu3Rf2UpRSzoralgf8XV2 fYoXxjek6pH648Yul2Eal7WVtPNzhkiadwTJeHjBJjs3ok+CpkJyMt4ey qtJAI9wcnvOr0Fy9Yr0k8b8rjcw7noRR6a2DRmWzodq2g90DKZgQjKor7 gncDpyHh3VTbdJStjplY+wqNIZdNXjtDaXzbvavrq0k+POxQ/fLqcgEh5 I4lu3kQ1CYsbhmP61OUpXrqZw6jilaLBNHXeAZrLfUjCQlS29+Frt9rRZ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744723" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744723" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680120" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680120" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:10:04 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 2/6] shared/bap: Add support to set stream metadata Date: Thu, 29 Dec 2022 17:58:19 +0530 Message-Id: <20221229122821.340073-3-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds new API to set stream metadata. --- src/shared/bap.c | 30 +++++++++++++++++++++++------- src/shared/bap.h | 2 ++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 0cafb75e6..b3c65283e 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -344,8 +344,10 @@ static void pac_foreach(void *data, void *user_data) p = util_iov_push(iov, sizeof(*p)); p->codec.id = pac->codec.id; - p->codec.cid = pac->codec.cid; - p->codec.vid = pac->codec.vid; + if (p->codec.id == 0xff) { + p->codec.cid = cpu_to_le16(pac->codec.cid); + p->codec.vid = cpu_to_le16(pac->codec.vid); + } if (pac->data) { p->cc_len = pac->data->iov_len; @@ -2773,7 +2775,7 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type, struct bt_pac *p; struct bt_ltv *cc; struct bt_pac_metadata *meta; - struct iovec data, metadata; + struct iovec data, *metadata = NULL; p = util_iov_pull_mem(&iov, sizeof(*p)); if (!p) { @@ -2802,8 +2804,11 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type, data.iov_len = p->cc_len; data.iov_base = cc; - metadata.iov_len = meta->len; - metadata.iov_base = meta->data; + if (meta->len) { + metadata = new0(struct iovec, 1); + metadata->iov_len = meta->len; + metadata->iov_base = meta->data; + } util_iov_pull_mem(&iov, meta->len); @@ -2813,12 +2818,14 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type, /* Check if there is already a PAC record for the codec */ pac = bap_pac_find(bap->rdb, type, &p->codec); if (pac) { - bap_pac_merge(pac, &data, &metadata); + bap_pac_merge(pac, &data, metadata); + free(metadata); continue; } pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data, - &metadata); + metadata); + free(metadata); if (!pac) continue; @@ -4591,6 +4598,15 @@ struct bt_bap_qos *bt_bap_stream_get_qos(struct bt_bap_stream *stream) return &stream->qos; } +void bt_bap_stream_set_metadata(struct bt_bap_stream *stream, + struct iovec *meta) +{ + if (!stream) + return; + + stream_metadata(stream, meta, NULL); +} + struct iovec *bt_bap_stream_get_metadata(struct bt_bap_stream *stream) { if (!stream) diff --git a/src/shared/bap.h b/src/shared/bap.h index 47a15636c..bcf830ceb 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -248,6 +248,8 @@ uint8_t bt_bap_stream_get_dir(struct bt_bap_stream *stream); uint32_t bt_bap_stream_get_location(struct bt_bap_stream *stream); struct iovec *bt_bap_stream_get_config(struct bt_bap_stream *stream); struct bt_bap_qos *bt_bap_stream_get_qos(struct bt_bap_stream *stream); +void bt_bap_stream_set_metadata(struct bt_bap_stream *stream, + struct iovec *meta); struct iovec *bt_bap_stream_get_metadata(struct bt_bap_stream *stream); struct io *bt_bap_stream_get_io(struct bt_bap_stream *stream); From patchwork Thu Dec 29 12:28:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD649C4332F for ; Thu, 29 Dec 2022 12:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233240AbiL2MKN (ORCPT ); Thu, 29 Dec 2022 07:10:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233116AbiL2MKL (ORCPT ); Thu, 29 Dec 2022 07:10:11 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C021E0FA for ; Thu, 29 Dec 2022 04:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315810; x=1703851810; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rVAiCuCu9Bf8IODTz3o2l9vYcW8GF6rwU77Tbj9U/ng=; b=EUPp9zpYKgOaiv9XLlIySZoduPs5Khbj8lIjYpBRyj8w08QT0DKxyncC X4YF5J7Nj981yihL2Pgr0OKsEP6V9Ir0d62g8fow9x24KNNt7h7EvMXXI EdN9/QERHqn2+bp8J4Y4jAyQQ5lIksibmgVu5ex0GIXZyxfLWEtg33VvP l/TeNJXQn/Hu2dIZ9R7llLJfyq+ybYjrTImAWueeu/ZmBYhMu9HSyyj7e 94g++zpWAo1bZAwswtm4UTqg4nZ4rpaIMfcptamooJ4FoU9V/gzpKQzSm 4jAQyZmYLWohuk7dWBrtXq0TdSN75pK25mvLXULxPPc6CbBU4EKAU64aj Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744728" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744728" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680137" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680137" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:10:07 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 3/6] profiles: Add Support for Metadata, CID and VID Date: Thu, 29 Dec 2022 17:58:20 +0530 Message-Id: <20221229122821.340073-4-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds support for Metadata, Company ID and Vendor Codec ID --- profiles/audio/bap.c | 14 +++++- profiles/audio/media.c | 99 +++++++++++++++++++++++++++++++++++--- profiles/audio/transport.c | 4 +- 3 files changed, 107 insertions(+), 10 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index ae944b617..2312eb8df 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -484,6 +484,16 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, bt_bap_stream_set_user_data(ep->stream, ep->path); ep->msg = dbus_message_ref(msg); + if (ep->metadata && ep->metadata->iov_len) { + struct iovec *meta; + + meta = new0(struct iovec, 1); + meta->iov_base = new0(uint8_t, ep->metadata->iov_len); + meta->iov_len = ep->metadata->iov_len; + memcpy(meta->iov_base, ep->metadata->iov_base, meta->iov_len); + bt_bap_stream_set_metadata(ep->stream, meta); + } + return NULL; } @@ -612,8 +622,10 @@ static void select_cb(struct bt_bap_pac *pac, int err, struct iovec *caps, ep->caps = util_iov_dup(caps, 1); - if (metadata && metadata->iov_base && metadata->iov_len) + if (metadata && metadata->iov_base && metadata->iov_len) { ep->metadata = util_iov_dup(metadata, 1); + bt_bap_stream_set_metadata(ep->stream, ep->metadata); + } ep->qos = *qos; diff --git a/profiles/audio/media.c b/profiles/audio/media.c index fbb350889..7f114e0db 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -91,10 +91,14 @@ struct media_endpoint { char *path; /* Endpoint object path */ char *uuid; /* Endpoint property UUID */ uint8_t codec; /* Endpoint codec */ + uint16_t cid; /* Endpoint company ID */ + uint16_t vid; /* Endpoint vendor codec ID */ bool delay_reporting;/* Endpoint delay_reporting */ struct bt_bap_pac_qos qos; /* Endpoint qos */ uint8_t *capabilities; /* Endpoint property capabilities */ size_t size; /* Endpoint capabilities size */ + uint8_t *metadata; /* Endpoint property metadata */ + size_t metadata_size; /* Endpoint metadata size */ guint hs_watch; guint ag_watch; guint watch; @@ -1108,6 +1112,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type, struct btd_gatt_database *database; struct gatt_db *db; struct iovec data; + struct iovec *metadata = NULL; char *name; if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) { @@ -1128,12 +1133,23 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type, return false; } + if (!bap_print_cc(endpoint->metadata, endpoint->metadata_size, + bap_debug, NULL)) { + error("Unable to parse endpoint metadata"); + return false; + } + db = btd_gatt_database_get_db(database); data.iov_base = endpoint->capabilities; data.iov_len = endpoint->size; /* TODO: Add support for metadata */ + if (endpoint->metadata_size) { + metadata = g_new0(struct iovec, 1); + metadata->iov_base = endpoint->metadata; + metadata->iov_len = endpoint->metadata_size; + } if (asprintf(&name, "%s:%s", endpoint->sender, endpoint->path) < 0) { error("Could not allocate name for pac %s:%s", @@ -1141,8 +1157,9 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type, return false; } - endpoint->pac = bt_bap_add_pac(db, name, type, endpoint->codec, - &endpoint->qos, &data, NULL); + endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec, + endpoint->cid, endpoint->vid, &endpoint->qos, + &data, metadata); if (!endpoint->pac) { error("Unable to create PAC"); return false; @@ -1282,9 +1299,13 @@ media_endpoint_create(struct media_adapter *adapter, const char *uuid, gboolean delay_reporting, uint8_t codec, + uint16_t cid, + uint16_t vid, struct bt_bap_pac_qos *qos, uint8_t *capabilities, int size, + uint8_t *metadata, + int metadata_size, int *err) { struct media_endpoint *endpoint; @@ -1297,6 +1318,8 @@ media_endpoint_create(struct media_adapter *adapter, endpoint->path = g_strdup(path); endpoint->uuid = g_strdup(uuid); endpoint->codec = codec; + endpoint->cid = cid; + endpoint->vid = vid; endpoint->delay_reporting = delay_reporting; if (qos) @@ -1308,6 +1331,12 @@ media_endpoint_create(struct media_adapter *adapter, endpoint->size = size; } + if (metadata_size > 0) { + endpoint->metadata = g_new(uint8_t, metadata_size); + memcpy(endpoint->metadata, metadata, metadata_size); + endpoint->metadata_size = metadata_size; + } + endpoint->adapter = adapter; for (i = 0; i < ARRAY_SIZE(init_table); i++) { @@ -1349,8 +1378,10 @@ media_endpoint_create(struct media_adapter *adapter, static int parse_properties(DBusMessageIter *props, const char **uuid, gboolean *delay_reporting, uint8_t *codec, + uint16_t *cid, uint16_t *vid, struct bt_bap_pac_qos *qos, - uint8_t **capabilities, int *size) + uint8_t **capabilities, int *size, + uint8_t **metadata, int *metadata_size) { gboolean has_uuid = FALSE; gboolean has_codec = FALSE; @@ -1377,6 +1408,14 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, return -EINVAL; dbus_message_iter_get_basic(&value, codec); has_codec = TRUE; + } else if (strcasecmp(key, "CompanyID") == 0) { + if (var != DBUS_TYPE_UINT16) + return -EINVAL; + dbus_message_iter_get_basic(&value, cid); + } else if (strcasecmp(key, "VendorCodecID") == 0) { + if (var != DBUS_TYPE_UINT16) + return -EINVAL; + dbus_message_iter_get_basic(&value, vid); } else if (strcasecmp(key, "DelayReporting") == 0) { if (var != DBUS_TYPE_BOOLEAN) return -EINVAL; @@ -1390,6 +1429,15 @@ static int parse_properties(DBusMessageIter *props, const char **uuid, dbus_message_iter_recurse(&value, &array); dbus_message_iter_get_fixed_array(&array, capabilities, size); + } else if (strcasecmp(key, "Metadata") == 0) { + DBusMessageIter array; + + if (var != DBUS_TYPE_ARRAY) + return -EINVAL; + + dbus_message_iter_recurse(&value, &array); + dbus_message_iter_get_fixed_array(&array, metadata, + metadata_size); } else if (strcasecmp(key, "Framing") == 0) { if (var != DBUS_TYPE_BYTE) return -EINVAL; @@ -1434,9 +1482,13 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, const char *sender, *path, *uuid; gboolean delay_reporting = FALSE; uint8_t codec = 0; + uint16_t cid = 0; + uint16_t vid = 0; struct bt_bap_pac_qos qos = {}; uint8_t *capabilities = NULL; + uint8_t *metadata = NULL; int size = 0; + int metadata_size = 0; int err; sender = dbus_message_get_sender(msg); @@ -1453,12 +1505,14 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, if (dbus_message_iter_get_arg_type(&props) != DBUS_TYPE_DICT_ENTRY) return btd_error_invalid_args(msg); - if (parse_properties(&props, &uuid, &delay_reporting, &codec, &qos, - &capabilities, &size) < 0) + if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid, + &vid, &qos, &capabilities, &size, &metadata, + &metadata_size) < 0) return btd_error_invalid_args(msg); if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting, - codec, &qos, capabilities, size, + codec, cid, vid, &qos, capabilities, + size, metadata, metadata_size, &err) == NULL) { if (err == -EPROTONOSUPPORT) return btd_error_not_supported(msg); @@ -2485,9 +2539,13 @@ static void app_register_endpoint(void *data, void *user_data) const char *uuid; gboolean delay_reporting = FALSE; uint8_t codec; + uint16_t cid = 0; + uint16_t vid = 0; struct bt_bap_pac_qos qos; uint8_t *capabilities = NULL; int size = 0; + uint8_t *metadata = NULL; + int metadata_size = 0; DBusMessageIter iter, array; struct media_endpoint *endpoint; @@ -2514,6 +2572,20 @@ static void app_register_endpoint(void *data, void *user_data) dbus_message_iter_get_basic(&iter, &codec); + if (g_dbus_proxy_get_property(proxy, "CompanyID", &iter)) { + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&iter, &cid); + } + + if (g_dbus_proxy_get_property(proxy, "VendorCodecID", &iter)) { + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT16) + goto fail; + + dbus_message_iter_get_basic(&iter, &vid); + } + /* DelayReporting and Capabilities are considered optional */ if (g_dbus_proxy_get_property(proxy, "DelayReporting", &iter)) { if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) @@ -2530,6 +2602,15 @@ static void app_register_endpoint(void *data, void *user_data) dbus_message_iter_get_fixed_array(&array, &capabilities, &size); } + if (g_dbus_proxy_get_property(proxy, "Metadata", &iter)) { + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) + goto fail; + + dbus_message_iter_recurse(&iter, &array); + dbus_message_iter_get_fixed_array(&array, &metadata, + &metadata_size); + } + /* Parse QoS preferences */ memset(&qos, 0, sizeof(qos)); if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) { @@ -2582,8 +2663,10 @@ static void app_register_endpoint(void *data, void *user_data) } endpoint = media_endpoint_create(app->adapter, app->sender, path, uuid, - delay_reporting, codec, &qos, - capabilities, size, &app->err); + delay_reporting, codec, cid, + vid, &qos, capabilities, + size, metadata, metadata_size, + &app->err); if (!endpoint) { error("Unable to register endpoint %s:%s: %s", app->sender, path, strerror(-app->err)); diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 41339da51..5e057e2a5 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -1185,6 +1185,7 @@ static guint resume_bap(struct media_transport *transport, struct media_owner *owner) { struct bap_transport *bap = transport->data; + struct iovec *meta; guint id; if (!bap->stream) @@ -1202,7 +1203,8 @@ static guint resume_bap(struct media_transport *transport, return g_idle_add(resume_complete, transport); } - id = bt_bap_stream_enable(bap->stream, bap->linked, NULL, + meta = bt_bap_stream_get_metadata(bap->stream); + id = bt_bap_stream_enable(bap->stream, bap->linked, meta, bap_enable_complete, owner); if (!id) return 0; From patchwork Thu Dec 29 12:28:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08937C3DA7D for ; Thu, 29 Dec 2022 12:10:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233116AbiL2MKQ (ORCPT ); Thu, 29 Dec 2022 07:10:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233237AbiL2MKN (ORCPT ); Thu, 29 Dec 2022 07:10:13 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17080E0FA for ; Thu, 29 Dec 2022 04:10:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315812; x=1703851812; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AjNhLk0KwQL7XbqrPwxNQiHvdWZal/clrXuYISFHnf4=; b=I7IlLpKrSSTZRZxrm9aX/EuxrKXhANDfOy5jR9bPr1467SkEp7k1gbwv q8r0f9RfzXVj6nK4kaybC6nq60qA3U2mG0NGGEUC01NZ5LzlA7WVC5g4J 7vC0epmVv4WJgGGvejf6+yR6zZq/IHf747vEiWShKuGl9ECFEXf1umSih UY3K8SIm+2c+I40qeXpl3EAYeMVgj1xWYD5PZwVm0blr3nnO0Z1XLcQgR OR8mZPzfHrEGHqfqxzgumNsseO/iGUgV31GMWXg8u+UOadFSvn6EptxH2 AesZGEStmPeCQdMHN5IDwnP+0FWC4BCAB0jDwzZ/QhgtDoTCl3ujjw+gX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744734" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744734" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680154" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680154" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:10:10 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 4/6] media-api: Add CompanyID, VendorCodecID, Metadata Date: Thu, 29 Dec 2022 17:58:21 +0530 Message-Id: <20221229122821.340073-5-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds CompanyID, VendorCodecID, Metadata for RegisterEndpoint method --- doc/media-api.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/media-api.txt b/doc/media-api.txt index 847f8bee7..7bfa8a52b 100644 --- a/doc/media-api.txt +++ b/doc/media-api.txt @@ -34,11 +34,29 @@ Methods void RegisterEndpoint(object endpoint, dict properties) match the profile specification which is indicated by the UUID. + uint16_t CompanyID [BAP only]: + + Assigned number of Company ID that the + endpoint implements. It should be set to + appropriate value when Vendor Specific + Codec is used. + + uint16_t VendorCodecID [BAP only]: + + Vendor-specific codec ID that the endpoint + implements. It should be set to appropriate + value when Vendor Specific Codec is used. + array{byte} Capabilities: Capabilities blob, it is used as it is so the size and byte order must match. + array{byte} Metadata [BAP only]: + + Metadata blob, it is used as it is + so the size and byte order must match. + Possible Errors: org.bluez.Error.InvalidArguments org.bluez.Error.NotSupported - emitted when interface for the end-point is From patchwork Thu Dec 29 12:28:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D18E2C4332F for ; Thu, 29 Dec 2022 12:10:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233237AbiL2MKS (ORCPT ); Thu, 29 Dec 2022 07:10:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233158AbiL2MKQ (ORCPT ); Thu, 29 Dec 2022 07:10:16 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDE021275F for ; Thu, 29 Dec 2022 04:10:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315815; x=1703851815; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7+xnrGGRez2Bev/DDbODGIaUbbK425PBBXeEUroLNCM=; b=RxCAuAK4vGnA296hZpZ2s+0GFtbkx6/5y2Qz/qp+27oC8oF6wvTw55JU EQrizdLgJeifs+oxa3CdK+Uonk6udXyDlM0qOvNh5zTMtkQpBOs6xTzV6 pdYEuiC1zB0EgagaqzNMhbsc7BSGpxpE+5ET8s9qz706RM3lxB61AX/KS 5tOqTPEsFDBS6i6nEiLWTJI+Pm/qeuG62ssvixgWoEdaksgpEc5bDDgwP 5bHzXBoIbIyoYlSJGMZHkNCK07UbZk+b5nKN+S/6lneZN+fHNJI4f57BX cThh4S3BrxCaKNZryvVTHbC0WUjugjAjx/pWhfkp2EF/vstJ6V4Oz8zMh w==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744742" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744742" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680182" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680182" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:10:14 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 5/6] client/player: Add support for Company ID, Vendor ID in BAP Profile Date: Thu, 29 Dec 2022 17:58:22 +0530 Message-Id: <20221229122821.340073-6-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds support for Company ID and Vendor Codec ID in BAP profile. This also adds handling of Vendor Specific Coding format for BAP Profile. Now it allows to enter zero codec capabilities. In order to register zero codec capabilities, 0 shall be entered when prompted. [bluetooth]# endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0xff [/local/endpoint/ep2] Enter Capabilities: 0 [/local/endpoint/ep2] Enter Company ID & Vendor ID: 0xaabbccdd [/local/endpoint/ep2] Auto Accept (yes/no): y [/local/endpoint/ep2] CIG (auto/value): a [/local/endpoint/ep2] CIS (auto/value): a Endpoint /local/endpoint/ep2 registered --- client/player.c | 131 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 114 insertions(+), 17 deletions(-) diff --git a/client/player.c b/client/player.c index eba233329..0f3b7dbe8 100644 --- a/client/player.c +++ b/client/player.c @@ -66,6 +66,8 @@ struct endpoint { char *path; char *uuid; uint8_t codec; + uint16_t cid; + uint16_t vid; struct iovec *caps; bool auto_accept; bool acquiring; @@ -85,6 +87,7 @@ static GList *endpoints = NULL; static GList *local_endpoints = NULL; static GList *transports = NULL; static struct queue *ios = NULL; +static bool is_cid_available = FALSE; struct transport { GDBusProxy *proxy; @@ -1815,7 +1818,8 @@ static void endpoint_free(void *data) struct endpoint *ep = data; if (ep->caps) { - g_free(ep->caps->iov_base); + if (ep->caps->iov_base) + g_free(ep->caps->iov_base); g_free(ep->caps); } @@ -1865,10 +1869,32 @@ static gboolean endpoint_get_capabilities(const GDBusPropertyTable *property, return TRUE; } +static gboolean endpoint_get_cid(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct endpoint *ep = data; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &ep->cid); + + return TRUE; +} + +static gboolean endpoint_get_vid(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct endpoint *ep = data; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &ep->vid); + + return TRUE; +} + static const GDBusPropertyTable endpoint_properties[] = { { "UUID", "s", endpoint_get_uuid, NULL, NULL }, { "Codec", "y", endpoint_get_codec, NULL, NULL }, { "Capabilities", "ay", endpoint_get_capabilities, NULL, NULL }, + { "CompanyID", "q", endpoint_get_cid, NULL, NULL }, + { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL }, { } }; @@ -1886,12 +1912,20 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data) g_dbus_dict_append_entry(&dict, "Codec", DBUS_TYPE_BYTE, &ep->codec); - g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key, + g_dbus_dict_append_entry(&dict, "CompanyID", DBUS_TYPE_UINT16, + &ep->cid); + + g_dbus_dict_append_entry(&dict, "VendorCodecID", DBUS_TYPE_UINT16, + &ep->vid); + + if (ep->caps->iov_len) { + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key, DBUS_TYPE_BYTE, &ep->caps->iov_base, ep->caps->iov_len); - bt_shell_printf("Capabilities:\n"); - bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len); + bt_shell_printf("Capabilities:\n"); + bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len); + } dbus_message_iter_close_container(iter, &dict); } @@ -1950,6 +1984,21 @@ fail: } +static void get_cid_vid(const char *input, uint32_t *id) +{ + char *endptr = NULL; + int value; + + value = strtol(input, &endptr, 0); + + if (!endptr || *endptr != '\0' || value > UINT32_MAX) { + bt_shell_printf("Invalid argument: %s\n", input); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + *id = (uint32_t)value; +} + static void endpoint_cis(const char *input, void *user_data) { struct endpoint *ep = user_data; @@ -2010,19 +2059,55 @@ static void endpoint_auto_accept(const char *input, void *user_data) bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_cig, ep); } +static void endpoint_set_id(const char *input, void *user_data) +{ + struct endpoint *ep = user_data; + uint32_t val; + + get_cid_vid(input, &val); + ep->cid = (uint16_t)(val & 0x0000ffff); + ep->vid = (uint16_t)((val & 0xffff0000) >> 16); + + bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", + endpoint_auto_accept, ep); +} + +void endpoint_set_parameters(struct endpoint *ep) +{ + if (!(strcasecmp(ep->uuid, PAC_SINK_UUID)) || + !(strcasecmp(ep->uuid, PAC_SOURCE_UUID))) { + if ((ep->codec == 0xff) && (is_cid_available == FALSE)) + bt_shell_prompt_input(ep->path, + "Enter Company ID & Vendor ID:", + endpoint_set_id, ep); + else + bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", + endpoint_auto_accept, ep); + } else + bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", + endpoint_auto_accept, ep); +} + static void endpoint_set_capabilities(const char *input, void *user_data) { struct endpoint *ep = user_data; - if (ep->caps) + if (ep->caps && ep->caps->iov_base) { g_free(ep->caps->iov_base); - else + ep->caps = g_new0(struct iovec, 1); + } else ep->caps = g_new0(struct iovec, 1); ep->caps->iov_base = str2bytearray((char *) input, &ep->caps->iov_len); - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", - endpoint_auto_accept, ep); + if (ep->caps->iov_len == 0x01 && + (*(uint8_t *)(ep->caps->iov_base)) == 0x00) { + g_free(ep->caps->iov_base); + ep->caps->iov_base = NULL; + ep->caps->iov_len = 0x00; + } + + endpoint_set_parameters(ep); } static char *uuid_generator(const char *text, int state) @@ -2073,13 +2158,13 @@ static void cmd_register_endpoint(int argc, char *argv[]) ep = g_new0(struct endpoint, 1); ep->uuid = g_strdup(argv[1]); ep->codec = strtol(argv[2], &endptr, 0); + ep->cid = 0x0000; + ep->vid = 0x0000; ep->path = g_strdup_printf("%s/ep%u", BLUEZ_MEDIA_ENDPOINT_PATH, g_list_length(local_endpoints)); local_endpoints = g_list_append(local_endpoints, ep); - if (argc > 3) - endpoint_set_capabilities(argv[3], ep); - else { + if (argc == 3) { const struct capabilities *cap; cap = find_capabilities(ep->uuid, ep->codec); @@ -2089,13 +2174,25 @@ static void cmd_register_endpoint(int argc, char *argv[]) /* Copy capabilities */ iov_append(&ep->caps, cap->data.iov_base, - cap->data.iov_len); + cap->data.iov_len); - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", - endpoint_auto_accept, ep); + endpoint_set_parameters(ep); } else - bt_shell_prompt_input(ep->path, "Enter capabilities:", - endpoint_set_capabilities, ep); + bt_shell_prompt_input(ep->path, "Enter Capabilities:", + endpoint_set_capabilities, ep); + } else if (argc == 4) { + endpoint_set_capabilities(argv[3], ep); + } else if (argc == 5) { + uint32_t val = 0; + + get_cid_vid(argv[4], &val); + ep->cid = (uint16_t)(val & 0x0000ffff); + ep->vid = (uint16_t)((val & 0xffff0000) >> 16); + is_cid_available = TRUE; + + endpoint_set_capabilities(argv[3], ep); + + is_cid_available = FALSE; } } @@ -2638,7 +2735,7 @@ static const struct bt_shell_menu endpoint_menu = { { "show", "", cmd_show_endpoint, "Endpoint information", endpoint_generator }, - { "register", " [capabilities...]", + { "register", " [capabilities...] [Company ID]", cmd_register_endpoint, "Register Endpoint", uuid_generator }, From patchwork Thu Dec 29 12:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 637628 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83F73C4332F for ; Thu, 29 Dec 2022 12:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233243AbiL2MKU (ORCPT ); Thu, 29 Dec 2022 07:10:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233252AbiL2MKT (ORCPT ); Thu, 29 Dec 2022 07:10:19 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43F6812AA2 for ; Thu, 29 Dec 2022 04:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672315818; x=1703851818; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6H/f4geEDpDUU/tCA3RxOHudmVvQQmtkVh2+lS0whoc=; b=G++hkpmhQmz+KwIwz0+Wmadq5NTbPHHbycKiRIlUfvXtXxFpqV8qyQ90 OZIAFsxuLtnXXFTWjZNaKQdCG6Eo/SRhp9fmsA0XXUEj0TBQ4Jbh6iRlE ktkEp8AY/rTGd7AkIeyKz6mdsiAGfJa419NyfNa4S/meAShhUQh5jmCFq GsBEkjUzx2w2yTQKlfi9y+1BWr7f2qXOeLBdavD6aRgbKwoBHBWVCi2Qs m2DFKOV6B0vugEU0p8Q7DxRC2DE/YH++RDw7Xpz8USqcXb45itVDY1S+a 9Cx6mnerDsdgNzqUeSMyFYJ8817dFLBvg9SxoLsbsDWJE3QkhqGgPwJtm g==; X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="319744746" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="319744746" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2022 04:10:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10574"; a="777680191" X-IronPort-AV: E=Sophos;i="5.96,284,1665471600"; d="scan'208";a="777680191" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.122]) by orsmga004.jf.intel.com with ESMTP; 29 Dec 2022 04:10:16 -0800 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ v2 6/6] client/player: Add support for Metadata in BAP Profile Date: Thu, 29 Dec 2022 17:58:23 +0530 Message-Id: <20221229122821.340073-7-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> References: <20221229122821.340073-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds support for Metadata in BAP profile. In order to register zero Metadata, 0 shall be entered when prompted. [bluetooth]# endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0x06 [/local/endpoint/ep0] Enter Metadata: 0 [/local/endpoint/ep0] Auto Accept (yes/no): y [/local/endpoint/ep0] CIG (auto/value): a [/local/endpoint/ep0] CIS (auto/value): a Capabilities: 03 01 ff 00 02 02 03 02 03 03 05 04 1e 00 f0 00 ................ Endpoint /local/endpoint/ep0 registered --- client/player.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/client/player.c b/client/player.c index 0f3b7dbe8..2d036a3f0 100644 --- a/client/player.c +++ b/client/player.c @@ -69,6 +69,7 @@ struct endpoint { uint16_t cid; uint16_t vid; struct iovec *caps; + struct iovec *meta; bool auto_accept; bool acquiring; uint8_t cig; @@ -1558,6 +1559,7 @@ struct endpoint_config { GDBusProxy *proxy; struct endpoint *ep; struct iovec *caps; + struct iovec *meta; uint8_t target_latency; const struct codec_qos *qos; }; @@ -1568,6 +1570,7 @@ static void append_properties(DBusMessageIter *iter, DBusMessageIter dict; struct codec_qos *qos = (void *)cfg->qos; const char *key = "Capabilities"; + const char *meta = "Metadata"; dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{sv}", &dict); @@ -1578,6 +1581,15 @@ static void append_properties(DBusMessageIter *iter, DBUS_TYPE_BYTE, &cfg->caps->iov_base, cfg->caps->iov_len); + if (cfg->meta->iov_len) { + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta, + DBUS_TYPE_BYTE, &cfg->meta->iov_base, + cfg->meta->iov_len); + + bt_shell_printf("Metadata:\n"); + bt_shell_hexdump(cfg->meta->iov_base, cfg->meta->iov_len); + } + if (!qos) goto done; @@ -1675,6 +1687,9 @@ static DBusMessage *endpoint_select_properties_reply(struct endpoint *ep, iov_append(&cfg->caps, preset->data.iov_base, preset->data.iov_len); cfg->target_latency = preset->target_latency; + /* Copy metadata */ + iov_append(&cfg->meta, cfg->ep->meta->iov_base, cfg->ep->meta->iov_len); + if (preset->qos.phy) /* Set QoS parameters */ cfg->qos = &preset->qos; @@ -1823,6 +1838,12 @@ static void endpoint_free(void *data) g_free(ep->caps); } + if (ep->meta) { + if (ep->meta->iov_base) + g_free(ep->meta->iov_base); + g_free(ep->meta); + } + if (ep->msg) dbus_message_unref(ep->msg); @@ -1869,6 +1890,24 @@ static gboolean endpoint_get_capabilities(const GDBusPropertyTable *property, return TRUE; } +static gboolean endpoint_get_metadata(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct endpoint *ep = data; + DBusMessageIter array; + + 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, + &ep->meta->iov_base, + ep->meta->iov_len); + + dbus_message_iter_close_container(iter, &array); + + return TRUE; +} + static gboolean endpoint_get_cid(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1893,6 +1932,7 @@ static const GDBusPropertyTable endpoint_properties[] = { { "UUID", "s", endpoint_get_uuid, NULL, NULL }, { "Codec", "y", endpoint_get_codec, NULL, NULL }, { "Capabilities", "ay", endpoint_get_capabilities, NULL, NULL }, + { "Metadata", "ay", endpoint_get_metadata, NULL, NULL }, { "CompanyID", "q", endpoint_get_cid, NULL, NULL }, { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL }, { } @@ -1903,6 +1943,7 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data) struct endpoint *ep = user_data; DBusMessageIter dict; const char *key = "Capabilities"; + const char *meta = "Metadata"; dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &ep->path); @@ -1927,6 +1968,15 @@ static void register_endpoint_setup(DBusMessageIter *iter, void *user_data) bt_shell_hexdump(ep->caps->iov_base, ep->caps->iov_len); } + if (ep->meta->iov_len) { + bt_shell_printf("Metadata:\n"); + bt_shell_hexdump(ep->meta->iov_base, ep->meta->iov_len); + + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &meta, + DBUS_TYPE_BYTE, &ep->meta->iov_base, + ep->meta->iov_len); + } + dbus_message_iter_close_container(iter, &dict); } @@ -2059,6 +2109,30 @@ static void endpoint_auto_accept(const char *input, void *user_data) bt_shell_prompt_input(ep->path, "CIG (auto/value):", endpoint_cig, ep); } +static void endpoint_set_metadata(const char *input, void *user_data) +{ + struct endpoint *ep = user_data; + + if (ep->meta && ep->meta->iov_base) { + g_free(ep->meta->iov_base); + ep->meta->iov_base = NULL; + } else + ep->meta = g_new0(struct iovec, 1); + + ep->meta->iov_base = str2bytearray((char *) input, &ep->meta->iov_len); + + if (ep->meta->iov_len == 0x01 && (*(uint8_t *)(ep->meta->iov_base)) == + 0x00) { + g_free(ep->meta->iov_base); + ep->meta->iov_base = NULL; + ep->meta->iov_len = 0x00; + } + + bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", + endpoint_auto_accept, ep); +} + + static void endpoint_set_id(const char *input, void *user_data) { struct endpoint *ep = user_data; @@ -2068,8 +2142,8 @@ static void endpoint_set_id(const char *input, void *user_data) ep->cid = (uint16_t)(val & 0x0000ffff); ep->vid = (uint16_t)((val & 0xffff0000) >> 16); - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", - endpoint_auto_accept, ep); + bt_shell_prompt_input(ep->path, "Enter Metadata:", + endpoint_set_metadata, ep); } void endpoint_set_parameters(struct endpoint *ep) @@ -2081,8 +2155,8 @@ void endpoint_set_parameters(struct endpoint *ep) "Enter Company ID & Vendor ID:", endpoint_set_id, ep); else - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", - endpoint_auto_accept, ep); + bt_shell_prompt_input(ep->path, "Enter Metadata:", + endpoint_set_metadata, ep); } else bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", endpoint_auto_accept, ep);