From patchwork Sat Oct 29 17:04:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 13024726 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 B6010C38A02 for ; Sat, 29 Oct 2022 16:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229587AbiJ2Qpu (ORCPT ); Sat, 29 Oct 2022 12:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbiJ2Qpr (ORCPT ); Sat, 29 Oct 2022 12:45:47 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF1005A2C2 for ; Sat, 29 Oct 2022 09:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667061946; x=1698597946; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zWQLAf+e+U4adhoGXmTv5r9mQJyc3gg/FNsqP8tZL5Y=; b=Ccmo04d8dSFy2fLF7NwvzH89YpmQWQ18VTVKvEma5Z5hfxFEkgkuvByW e12yTfDNqaySbdXXM9P6ln6YO3dzCbPJDYeE5S95M7QjwMKpDL5pRsbaN cakgkfcTj3MiZdZNGpw3yFcjdVNsZ9uQWfG+MNAar/YkuJi7Xh9qrSYIN idOOE+neoLUgqhJR1y1VbdAZLJ2mSOb1z/9G47K8zD19mLk8Ecg+O72YE 8/JcawuFw1MEg0BI4Ca4PGJguye6gbWyoPp5OjNHYhbauNsGAWjq21lnB w8p7wbUq2zz7pLXHijEQ1t3hAHCrZ8/EIO1Mk5LluyizIkI5AhG5LIwFJ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="289074309" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="289074309" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2022 09:45:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="666399476" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="666399476" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.120]) by orsmga001.jf.intel.com with ESMTP; 29 Oct 2022 09:45:45 -0700 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: Abhay Maheta Subject: [PATCH BlueZ 1/5] shared/bap: Fix handling for Company ID and Vendor Codec ID Date: Sat, 29 Oct 2022 22:34:04 +0530 Message-Id: <20221029170408.175533-2-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> References: <20221029170408.175533-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 c3c0d596f..0ae0eba33 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -416,6 +416,8 @@ static void pac_foreach(void *data, void *user_data) p = iov_add(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; @@ -2415,6 +2417,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 7b9f88c83..923669f32 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 Sat Oct 29 17:04:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 13024727 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 91672C433FE for ; Sat, 29 Oct 2022 16:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbiJ2Qpy (ORCPT ); Sat, 29 Oct 2022 12:45:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbiJ2Qpx (ORCPT ); Sat, 29 Oct 2022 12:45:53 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62B305A2C1 for ; Sat, 29 Oct 2022 09:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667061948; x=1698597948; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PDUiQKWLMuJ8wiXnQ5eHYa42vErpnH09Jr6v/qUFvbw=; b=RyjWUHSFZMHhbF4YOrpwKCwQc3TUhHC6L5GHatZxjj5oQx5cab3mdtlt x1oQNbFk5O8evNzLbi29AYOCK6G/zBGYkDFi1oja9HJgE4jdp05qgM5xQ 7hHPWXgF21nfid0f8bGqq9WYOHrffOvuzNapxGwsrxS4C+uXFaEHUHnp1 /uVJ+2yoSTvDhaIbRINxG3EI+zi1mz7i9aN34mq+U1hZ8B4n07ailSnPB rwZEcXPzM6ZG5t4RCLam4oAYnMDmh2l+8TRCUOqV33bpMtpXocQjrR3h9 6oglpwWFUoKopBcMLVOW9P7146DKJvEeANEFGBLm+4RfHf6sgRlHjRtqp Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="289074310" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="289074310" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2022 09:45:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="666399480" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="666399480" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.120]) by orsmga001.jf.intel.com with ESMTP; 29 Oct 2022 09:45:46 -0700 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: "Maheta, Abhay" Subject: [PATCH BlueZ 2/5] shared/bap: Add support to set stream metadata Date: Sat, 29 Oct 2022 22:34:05 +0530 Message-Id: <20221029170408.175533-3-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> References: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: "Maheta, Abhay" This adds new API to set stream metadata. --- src/shared/bap.c | 20 ++++++++++++++++---- src/shared/bap.h | 2 ++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 0ae0eba33..cc89d65a3 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -2787,7 +2787,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 = iov_pull_mem(&iov, sizeof(*p)); if (!p) { @@ -2816,13 +2816,16 @@ 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; + } iov_pull_mem(&iov, meta->len); pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data, - &metadata); + metadata); if (!pac) continue; @@ -4567,6 +4570,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->meta = meta; +} + 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 923669f32..0c83726da 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -249,6 +249,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 Sat Oct 29 17:04:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 13024728 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 81DCDC38A02 for ; Sat, 29 Oct 2022 16:45:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbiJ2Qpz (ORCPT ); Sat, 29 Oct 2022 12:45:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbiJ2Qpy (ORCPT ); Sat, 29 Oct 2022 12:45:54 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8410B5A3FB for ; Sat, 29 Oct 2022 09:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667061951; x=1698597951; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U6U1cWRYeO4HUFuilDoiasEkbCoO9PtzsolOS5T1Djo=; b=jc//UHwsOcnKcCx1FVtB4u7k/HDFPFvBbLVO8R5krrOaQGEuH3D7oIO0 3n6H8AkyIyi1IzL2Pu9btpAUrAVK1S+njDW8tEsi+aM8/ZzY3x/JKf8Ov L4tHvczCp6wmsAbSKJC/lpDYug0zwcT2x/p34o7CSQkQcq4Z+/PFJb1Ic rQ+hHMeMGklvKQi4qJwwwJMr848YPJw5bdBM6H/nTnxDUl4OxvtdFsMZr 7rdhokdpekEWEhssppZ3ZiiEn0eJorYv3c9AiYRVohyEn6g2Ma14TSEUO sZuFm8RUysen2ZSA4xxmSQ0Ur8dmuHogZ13BtKliaSROfM8Y5B0SyxAoc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="289074311" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="289074311" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2022 09:45:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="666399487" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="666399487" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.120]) by orsmga001.jf.intel.com with ESMTP; 29 Oct 2022 09:45:48 -0700 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: "Maheta, Abhay" Subject: [PATCH BlueZ 3/5] profiles: Add Support for Metadata, CID and VID Date: Sat, 29 Oct 2022 22:34:06 +0530 Message-Id: <20221029170408.175533-4-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> References: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: "Maheta, Abhay" This adds support for Metadata, Company ID and Vendor Codec ID --- profiles/audio/bap.c | 20 ++++++++ profiles/audio/media.c | 100 +++++++++++++++++++++++++++++++++---- profiles/audio/transport.c | 4 +- 3 files changed, 114 insertions(+), 10 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 67aba3bd7..401af796c 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -481,6 +481,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; } @@ -597,6 +607,16 @@ static void select_cb(struct bt_bap_pac *pac, int err, struct iovec *caps, } bt_bap_stream_set_user_data(ep->stream, ep->path); + + if (metadata && metadata->iov_len) { + struct iovec *meta; + + meta = new0(struct iovec, 1); + meta->iov_base = new0(uint8_t, metadata->iov_len); + meta->iov_len = metadata->iov_len; + memcpy(meta->iov_base, metadata->iov_base, meta->iov_len); + bt_bap_stream_set_metadata(ep->stream, meta); + } } static bool pac_found(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, diff --git a/profiles/audio/media.c b/profiles/audio/media.c index c9328ab9b..62f91bea3 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; @@ -1113,6 +1117,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)) { @@ -1133,12 +1138,22 @@ 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", @@ -1146,8 +1161,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; @@ -1287,9 +1303,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; @@ -1302,6 +1322,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) @@ -1313,6 +1335,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++) { @@ -1354,8 +1382,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; @@ -1382,6 +1412,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; @@ -1395,6 +1433,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; @@ -1439,9 +1486,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); @@ -1458,12 +1509,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); @@ -2490,9 +2543,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; @@ -2519,6 +2576,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) @@ -2535,6 +2606,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)) { @@ -2587,8 +2667,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 Sat Oct 29 17:04:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 13024729 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 C78DBC433FE for ; Sat, 29 Oct 2022 16:45:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbiJ2Qp4 (ORCPT ); Sat, 29 Oct 2022 12:45:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229647AbiJ2Qpy (ORCPT ); Sat, 29 Oct 2022 12:45:54 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92BD25A3FD for ; Sat, 29 Oct 2022 09:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667061951; x=1698597951; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6W9gi56VXuiTb15do5GFmvkHf+XTDSXokzqw3YtTp20=; b=RSLlGEJzFU3uDniuy0vaoP9sGevjpI9djWm006qw8C6uJgQhsSdbWgM2 ySEOn+vEF5zig9zHbMXl5ViUviLJM2fy+pd52Yd5YQG+XBGqmle7Xzb9N NJAKIO5WRRLtWRsBlkOYYmdluhklsvc+zWxa+e4gSsmE5JqtcwBo60A+p si/toRMVp2AoMmn2JZBqNTqgiwnjQIFs53yKY3HF2BxrcxpTlHPz1XjPT 9Szr6KVXxgn+CyTeh1Sqn7aGMxFvLa7eg6E1mOGAEdxtwnkNFwFFQT1ll URAkTqXxLw3DqfrToGDfiM97qZmeAGb+CvVSV7+ffUk5NU1xTLJpI1Yv9 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="289074313" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="289074313" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2022 09:45:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="666399491" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="666399491" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.120]) by orsmga001.jf.intel.com with ESMTP; 29 Oct 2022 09:45:49 -0700 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: "Maheta, Abhay" Subject: [PATCH BlueZ 4/5] media-api: Add CompanyID, VendorCodecID, Metadata Date: Sat, 29 Oct 2022 22:34:07 +0530 Message-Id: <20221029170408.175533-5-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> References: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: "Maheta, Abhay" 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..ce2b74e53 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: + + 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: + + 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: + + 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 Sat Oct 29 17:04:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhay Maheta X-Patchwork-Id: 13024730 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 0ADF0FA3740 for ; Sat, 29 Oct 2022 16:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229766AbiJ2Qp5 (ORCPT ); Sat, 29 Oct 2022 12:45:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbiJ2Qpz (ORCPT ); Sat, 29 Oct 2022 12:45:55 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 760EC5A80D for ; Sat, 29 Oct 2022 09:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667061953; x=1698597953; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yNcyrOKx/NMurMj12nSKjrI+DwFcSuLotCeqyWNjdWA=; b=m/oztQ5m58H/OPLIHNHcNE37O+Nw8LSI8uegRK8m2ze+hZx+zFTLXB8u oMwtAcpAf+UDaJz8UHz8rQT4a7eW6t4B92AyZPJJtHRsok/dNKg3xuQky ZQ6V1I6inyP37YKMfxmKmzE3jpcj13XtXRwke1vN8h4ADgzD4KUPmpnW3 dJZdIS3YPCDO+cUrbigNz3Wdedm2kwl9JFNH3t7NtC6j/JwYhMahZ8kwH FnmdRDGXRA0g6Nh5xyLga1rB2SN/XkxD6+dBtGr8VusbAYtZ4zO6NxzpX HymcU88L/PlOZ2w2wnhoQ8Hv5tYWMYfHwsMqLPI7suCDXXCIZ0jkl3/PJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="289074315" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="289074315" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2022 09:45:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10515"; a="666399495" X-IronPort-AV: E=Sophos;i="5.95,224,1661842800"; d="scan'208";a="666399495" Received: from tester-latitude-7480.iind.intel.com ([10.224.186.120]) by orsmga001.jf.intel.com with ESMTP; 29 Oct 2022 09:45:51 -0700 From: Abhay Maheta To: linux-bluetooth@vger.kernel.org Cc: "Maheta, Abhay" Subject: [PATCH BlueZ 5/5] client/player: Add support for Metadata, CID, VID Date: Sat, 29 Oct 2022 22:34:08 +0530 Message-Id: <20221029170408.175533-6-abhay.maheshbhai.maheta@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> References: <20221029170408.175533-1-abhay.maheshbhai.maheta@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: "Maheta, Abhay" This adds support for Metadata, Company ID and Vendor Codec ID. This also adds handling of Vendor Specific Coding format. Now it allows to enter zero codec capabilities. It allows to enter zero metadata as well. In order to register zero codec capabilities and metadata 0 shall be entered when prompted. --- client/player.c | 185 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 10 deletions(-) diff --git a/client/player.c b/client/player.c index 432408934..f4338416b 100644 --- a/client/player.c +++ b/client/player.c @@ -63,7 +63,10 @@ struct endpoint { char *path; char *uuid; uint8_t codec; + uint16_t cid; + uint16_t vid; struct iovec *caps; + struct iovec *meta; bool auto_accept; bool acquiring; uint8_t cig; @@ -1643,6 +1646,7 @@ struct endpoint_config { GDBusProxy *proxy; struct endpoint *ep; struct iovec *caps; + struct iovec *meta; uint8_t target_latency; const struct codec_qos *qos; }; @@ -1653,6 +1657,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); @@ -1663,6 +1668,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; @@ -1756,6 +1770,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->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; @@ -1899,10 +1916,17 @@ 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); } + 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); @@ -1949,10 +1973,52 @@ 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) +{ + 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 }, + { "Metadata", "ay", endpoint_get_metadata, NULL, NULL }, + { "CompanyID", "q", endpoint_get_cid, NULL, NULL }, + { "VendorCodecID", "q", endpoint_get_vid, NULL, NULL }, { } }; @@ -1961,6 +2027,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); @@ -1970,12 +2037,29 @@ 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); + } + + 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); } @@ -2094,19 +2178,93 @@ 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_vid(const char *input, void *user_data) +{ + struct endpoint *ep = user_data; + char *endptr = NULL; + int value; + + value = strtol(input, &endptr, 0); + + if (!endptr || *endptr != '\0' || value > UINT16_MAX) { + bt_shell_printf("Invalid argument: %s\n", input); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + ep->vid = value; + + bt_shell_prompt_input(ep->path, "Enter Metadata:", + endpoint_set_metadata, ep); +} + +static void endpoint_set_cid(const char *input, void *user_data) +{ + struct endpoint *ep = user_data; + char *endptr = NULL; + int value; + + value = strtol(input, &endptr, 0); + + if (!endptr || *endptr != '\0' || value > UINT16_MAX) { + bt_shell_printf("Invalid argument: %s\n", input); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + ep->cid = value; + + bt_shell_prompt_input(ep->path, "Vendor Codec ID:", + endpoint_set_vid, 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->iov_base = NULL; + } 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; + } + + if (ep->codec == 0xff) { + bt_shell_prompt_input(ep->path, "Enter Company ID:", + endpoint_set_cid, ep); + } else { + bt_shell_prompt_input(ep->path, "Enter Metadata:", + endpoint_set_metadata, ep); + } } static char *uuid_generator(const char *text, int state) @@ -2175,8 +2333,15 @@ static void cmd_register_endpoint(int argc, char *argv[]) iov_append(&ep->caps, cap->data.iov_base, cap->data.iov_len); - bt_shell_prompt_input(ep->path, "Auto Accept (yes/no):", - endpoint_auto_accept, ep); + if (ep->codec == 0xff) { + bt_shell_prompt_input(ep->path, + "Enter Company ID:", + endpoint_set_cid, ep); + } else { + bt_shell_prompt_input(ep->path, + "Enter Metadata:", + endpoint_set_metadata, ep); + } } else bt_shell_prompt_input(ep->path, "Enter capabilities:", endpoint_set_capabilities, ep);