From patchwork Fri Sep 30 18:49:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathish Narasimman X-Patchwork-Id: 611070 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 C49DDC433F5 for ; Fri, 30 Sep 2022 09:58:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231260AbiI3J6z (ORCPT ); Fri, 30 Sep 2022 05:58:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbiI3J6x (ORCPT ); Fri, 30 Sep 2022 05:58:53 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC7C317F57B for ; Fri, 30 Sep 2022 02:58: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=1664531932; x=1696067932; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wG77UBcsKMXbhl5s3rmxAWqlXVk8WnM6p4upH/aHEaM=; b=O1ygy3B0bo1JnN6ClXhjmrjClbFAfY46jJfeTbVuEeSnIft/PbVwEkeb xAoD6NjjlywYImHY0652IxjsoQuDOdBquabGNV/9OBjlv+GTsIVTCP6OB wGHdCweZ+Q8JriFHyjueWjDkA7c7F/3BWGwUQoqoSQx7akTT0oO5WxDzG 36o4Zth+Q6EMsxE0iumLd4tlJh0C9fxd4s1k+tgAEYe9cuexs8LC3gbr1 MHKMFGrxyblG4TpMW1cOxm4v0T1+jtdNTrb2xcbhs8LMvH+A9qBRYUfAz FekVdZfuP/aICIKzEOZCjU3DtKgq/ZoDnaukOk4zkf8wiJsLy+/io+zZM w==; X-IronPort-AV: E=McAfee;i="6500,9779,10485"; a="299756622" X-IronPort-AV: E=Sophos;i="5.93,358,1654585200"; d="scan'208";a="299756622" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2022 02:58:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10485"; a="711743753" X-IronPort-AV: E=Sophos;i="5.93,358,1654585200"; d="scan'208";a="711743753" Received: from intel-latitude-e5450.iind.intel.com ([10.224.186.32]) by FMSMGA003.fm.intel.com with ESMTP; 30 Sep 2022 02:58:50 -0700 From: Sathish Narasimman To: linux-bluetooth@vger.kernel.org Cc: Sathish Narasimman Subject: [PATCH 1/3] audio/transport: seprate a2dp and bap transport to update volume Date: Sat, 1 Oct 2022 00:19:52 +0530 Message-Id: <20220930184954.108937-1-sathish.narasimman@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Identify BAP and a2dp transport to update the transport volume. Also add properties volume for bap_transport. --- profiles/audio/media.c | 2 +- profiles/audio/transport.c | 120 ++++++++++++++++++++++++++++++++++--- profiles/audio/transport.h | 7 ++- 3 files changed, 117 insertions(+), 12 deletions(-) diff --git a/profiles/audio/media.c b/profiles/audio/media.c index c9328ab9bd6e..0e3c7cbbaf2c 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -523,7 +523,7 @@ static gboolean set_configuration(struct media_endpoint *endpoint, return FALSE; init_volume = media_player_get_device_volume(device); - media_transport_update_volume(transport, init_volume); + media_a2dp_transport_update_volume(transport, init_volume); msg = dbus_message_new_method_call(endpoint->sender, endpoint->path, MEDIA_ENDPOINT_INTERFACE, diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 41339da51e17..a606d45eb628 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -91,6 +91,7 @@ struct bap_transport { uint8_t rtn; uint16_t latency; uint32_t delay; + int8_t volume; }; struct media_transport { @@ -709,7 +710,8 @@ static gboolean get_delay_reporting(const GDBusPropertyTable *property, return TRUE; } -static gboolean volume_exists(const GDBusPropertyTable *property, void *data) +static gboolean volume_a2dp_exists(const GDBusPropertyTable *property, + void *data) { struct media_transport *transport = data; struct a2dp_transport *a2dp = transport->data; @@ -717,7 +719,8 @@ static gboolean volume_exists(const GDBusPropertyTable *property, void *data) return a2dp->volume >= 0; } -static gboolean get_volume(const GDBusPropertyTable *property, + +static gboolean get_a2dp_volume(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { struct media_transport *transport = data; @@ -729,7 +732,7 @@ static gboolean get_volume(const GDBusPropertyTable *property, return TRUE; } -static void set_volume(const GDBusPropertyTable *property, +static void set_a2dp_volume(const GDBusPropertyTable *property, DBusMessageIter *iter, GDBusPendingPropertySet id, void *data) { @@ -769,6 +772,58 @@ error: "Invalid arguments in method call"); } +static gboolean volume_bap_exists(const GDBusPropertyTable *property, + void *data) +{ + struct media_transport *transport = data; + struct bap_transport *bap = transport->data; + + return bap->volume >= 0; +} + +static gboolean get_bap_volume(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct media_transport *transport = data; + struct bap_transport *bap = transport->data; + uint16_t volume = (uint16_t)bap->volume; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &volume); + + return TRUE; +} + +static void set_bap_volume(const GDBusPropertyTable *property, + DBusMessageIter *iter, GDBusPendingPropertySet id, + void *data) +{ + struct media_transport *transport = data; + struct bap_transport *bap = transport->data; + uint16_t arg; + int8_t volume; + + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16) + goto error; + + dbus_message_iter_get_basic(iter, &arg); + if (arg > INT8_MAX) + goto error; + + g_dbus_pending_property_success(id); + + volume = (int8_t)arg; + if (bap->volume == volume) + return; + + /*TODO vcp_send_volume */ + return; + +error: + g_dbus_pending_property_error(id, ERROR_INTERFACE ".InvalidArguments", + "Invalid arguments in method call"); +} + + static gboolean endpoint_exists(const GDBusPropertyTable *property, void *data) { struct media_transport *transport = data; @@ -809,7 +864,8 @@ static const GDBusPropertyTable a2dp_properties[] = { { "Configuration", "ay", get_configuration }, { "State", "s", get_state }, { "Delay", "q", get_delay_reporting, NULL, delay_reporting_exists }, - { "Volume", "q", get_volume, set_volume, volume_exists }, + { "Volume", "q", get_a2dp_volume, set_a2dp_volume, + volume_a2dp_exists }, { "Endpoint", "o", get_endpoint, NULL, endpoint_exists, G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, { } @@ -970,6 +1026,7 @@ static const GDBusPropertyTable bap_properties[] = { { "Retransmissions", "y", get_retransmissions }, { "Latency", "q", get_latency }, { "Delay", "u", get_delay }, + { "Volume", "q", get_bap_volume, set_bap_volume, volume_bap_exists }, { "Endpoint", "o", get_endpoint, NULL, endpoint_exists }, { "Location", "u", get_location }, { "Metadata", "ay", get_metadata }, @@ -1403,6 +1460,7 @@ static int media_transport_init_bap(struct media_transport *transport, bap->rtn = qos->rtn; bap->latency = qos->latency; bap->delay = qos->delay; + bap->volume = 127; bap->state_id = bt_bap_state_register(bt_bap_stream_get_session(stream), bap_state_changed, bap_connecting, @@ -1502,14 +1560,22 @@ struct btd_device *media_transport_get_dev(struct media_transport *transport) return transport->device; } -int8_t media_transport_get_volume(struct media_transport *transport) +int8_t media_a2dp_transport_get_volume(struct media_transport *transport) { struct a2dp_transport *a2dp = transport->data; + return a2dp->volume; } -void media_transport_update_volume(struct media_transport *transport, - int8_t volume) +int8_t media_bap_transport_get_volume(struct media_transport *transport) +{ + struct bap_transport *bap = transport->data; + + return bap->volume; +} + +void media_a2dp_transport_update_volume(struct media_transport *transport, + int8_t volume) { struct a2dp_transport *a2dp = transport->data; @@ -1527,6 +1593,25 @@ void media_transport_update_volume(struct media_transport *transport, MEDIA_TRANSPORT_INTERFACE, "Volume"); } +void media_bap_transport_update_volume(struct media_transport *transport, + int8_t volume) +{ + struct bap_transport *bap = transport->data; + + if (volume < 0) + return; + + /* Check if volume really changed */ + if (bap->volume == volume) + return; + + bap->volume = volume; + + g_dbus_emit_property_changed(btd_get_dbus_connection(), + transport->path, + MEDIA_TRANSPORT_INTERFACE, "Volume"); +} + int8_t media_transport_get_device_volume(struct btd_device *dev) { GSList *l; @@ -1537,12 +1622,21 @@ int8_t media_transport_get_device_volume(struct btd_device *dev) /* Attempt to locate the transport to get its volume */ for (l = transports; l; l = l->next) { struct media_transport *transport = l->data; + const char *uuid = media_endpoint_get_uuid(transport->endpoint); + + /* Locate BAP Transport */ + if (!strcasecmp(uuid, PAC_SINK_UUID) && + !strcasecmp(uuid, PAC_SOURCE_UUID)) { + + return media_bap_transport_get_volume(transport); + } + if (transport->device != dev) continue; /* Volume is A2DP only */ if (media_endpoint_get_sep(transport->endpoint)) - return media_transport_get_volume(transport); + return media_a2dp_transport_get_volume(transport); } /* If transport volume doesn't exists use device_volume */ @@ -1560,12 +1654,20 @@ void media_transport_update_device_volume(struct btd_device *dev, /* Attempt to locate the transport to set its volume */ for (l = transports; l; l = l->next) { struct media_transport *transport = l->data; + const char *uuid = media_endpoint_get_uuid(transport->endpoint); + + /* Locate BAP Transport */ + if (!strcasecmp(uuid, PAC_SINK_UUID)) { + media_bap_transport_update_volume(transport, volume); + return; + } + if (transport->device != dev) continue; /* Volume is A2DP only */ if (media_endpoint_get_sep(transport->endpoint)) { - media_transport_update_volume(transport, volume); + media_a2dp_transport_update_volume(transport, volume); return; } } diff --git a/profiles/audio/transport.h b/profiles/audio/transport.h index 102fc3cf1153..3cbefa5d7bee 100644 --- a/profiles/audio/transport.h +++ b/profiles/audio/transport.h @@ -20,10 +20,13 @@ struct media_transport *media_transport_create(struct btd_device *device, void media_transport_destroy(struct media_transport *transport); const char *media_transport_get_path(struct media_transport *transport); struct btd_device *media_transport_get_dev(struct media_transport *transport); -int8_t media_transport_get_volume(struct media_transport *transport); +int8_t media_a2dp_transport_get_volume(struct media_transport *transport); +int8_t media_bap_transport_get_volume(struct media_transport *transport); void media_transport_update_delay(struct media_transport *transport, uint16_t delay); -void media_transport_update_volume(struct media_transport *transport, +void media_a2dp_transport_update_volume(struct media_transport *transport, + int8_t volume); +void media_bap_transport_update_volume(struct media_transport *transport, int8_t volume); void transport_get_properties(struct media_transport *transport, DBusMessageIter *iter);