From patchwork Wed Jul 22 03:09:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 11677165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CFC166C1 for ; Wed, 22 Jul 2020 03:09:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B1A0E20872 for ; Wed, 22 Jul 2020 03:09:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iqFrs89H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731908AbgGVDJb (ORCPT ); Tue, 21 Jul 2020 23:09:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731781AbgGVDJa (ORCPT ); Tue, 21 Jul 2020 23:09:30 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91C88C061794 for ; Tue, 21 Jul 2020 20:09:30 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id w15so466590qti.21 for ; Tue, 21 Jul 2020 20:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=oBnqQ7NXBBZjR/OqQ7gnqZvTGW0gC9+kuF9l/hYUZtU=; b=iqFrs89HtHvZSDj+iYmFCFyBhRd+lrWfnaoP8Zs+Pk3cFSzRetpFWbWn7H+bfZ4cr6 U8u5Fxi181Nxe3/d4MoLSF6Wp6vtnrHZFqkdmkmHpOl1vfXkM487/Lk9L4buK2MCCgtf kOpyLC6zyVSkRUJTUbyu9ozTh3IwfruVshoAoTHw8hCsF3eZ/rC4WwZCXKrqkREDJggv S2ftSf/JNmO/sv7U8/VQf2e1vEachZy06G8/I3zPv0ZGxsbACa430+yiKjS2q905duzn E/e2aTMMbFPFMKepPjaQaz3FCaiu00KPkwkseJEWoHvu85q1MiOWiqDVQXqfdl+QGisk m15g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=oBnqQ7NXBBZjR/OqQ7gnqZvTGW0gC9+kuF9l/hYUZtU=; b=D8i3wqTBDC4V0I3PY1nWiOXTW2Ud32073RTP4vj47nllojQTLF0urC6gzKBfZPprAr b6k4ax0FfZHFrZuFpC2jG5Mm6R/dLmmDFjLTbZkQGUeyDWhri5p761SNMXzjp6ORM3aY 0v1WVBpZgJX3xll4Ll+kayA0g3685IMMGMbJnrvzdqjqVihcplmTOZDK9w5WPOjVjHjN O0bNajCJNHhlIIX+LhIlt1ICvkDKOEhZ+0l1rXlzvwRD31hNgrM7K8/sfuHYGbsNCgdr CWSFhVXyP4ZFTy1S+a89VnKox9LQr6qu660vUufWyIq8rlXPurMaOssrPsuGG3TxnIgW tmGA== X-Gm-Message-State: AOAM530CnRPevoL1FA5jTTHmyt2wfq9GszrsW5V4VJb6Z2RLlpK7GocR JbX6gmsCL0EABDhZ5/djcXqdPvevRQMCpckYSZrkmAH0v3hx/8z+WQQ9MMxqd3Ir2U1nDJL2sit Fw364QURmSvI6E+P3dZeqI5fG7qWyxfP08xcHUBmi3AMtLdAxnUl1XKdoWLp3j4L35v4xKbQy0i T9 X-Google-Smtp-Source: ABdhPJzF4nfSbi8dK1n13yC8L2COQ2kOYZC8iiH9f8F/b7w+PjyqLgfSSV73HveXwpp1ruo7iOFs9if4dHbL X-Received: by 2002:a05:6214:1882:: with SMTP id cx2mr30068208qvb.240.1595387369624; Tue, 21 Jul 2020 20:09:29 -0700 (PDT) Date: Wed, 22 Jul 2020 11:09:02 +0800 In-Reply-To: <20200722110826.Bluez.v2.1.I667fa0ebcc3056a21c22fdaf476a56dd72aff38d@changeid> Message-Id: <20200722110826.Bluez.v2.2.Ic16589fde45fac0c496dfca2fa27672059114c3b@changeid> Mime-Version: 1.0 References: <20200722110826.Bluez.v2.1.I667fa0ebcc3056a21c22fdaf476a56dd72aff38d@changeid> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-goog Subject: [Bluez PATCH v2 2/2] audio/transport: supply volume on transport init From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: Archie Pusaka , Yu Liu Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Sometimes the response of RegisterNotification for volume change event came before we create the transport for the corresponding device. If that happens, the volume will be stuck to an uninitialized invalid value. The property Volume of MediaTransport1 will also be left unaccessible. This patch supplies the initial volume when creating a new transport. The value is obtained from the media_player object. However, since the avrcp session might not be created by the time the transport is created, we also try to initialize the volume when creating avrcp session. Reviewed-by: Yu Liu --- Changes in v2: -Get the volume from media_player instead of from separate list profiles/audio/avrcp.c | 26 ++++++++++++++++- profiles/audio/avrcp.h | 2 ++ profiles/audio/media.c | 60 +++++++++++++++++++++++++++++--------- profiles/audio/media.h | 2 ++ profiles/audio/transport.c | 4 +-- profiles/audio/transport.h | 2 ++ 6 files changed, 78 insertions(+), 18 deletions(-) diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c index b312b70b9..f53020bd7 100644 --- a/profiles/audio/avrcp.c +++ b/profiles/audio/avrcp.c @@ -1701,7 +1701,6 @@ static uint8_t avrcp_handle_request_continuing(struct avrcp *session, if (pending->pdu_id != pdu->params[0]) goto err; - len = 0; pending->attr_ids = player_fill_media_attribute(player, pending->attr_ids, @@ -4037,8 +4036,12 @@ static void target_init(struct avrcp *session) player = g_slist_nth_data(server->players, 0); if (player != NULL) { + uint8_t init_volume; target->player = player; player->sessions = g_slist_prepend(player->sessions, session); + + init_volume = media_player_get_device_volume(session->dev); + media_transport_update_device_volume(session->dev, init_volume); } session->supported_events |= (1 << AVRCP_EVENT_STATUS_CHANGED) | @@ -4473,6 +4476,27 @@ int avrcp_set_volume(struct btd_device *dev, uint8_t volume, bool notify) avrcp_handle_set_volume, session); } +struct avrcp_player *avrcp_get_target_player_by_device(struct btd_device *dev) +{ + struct avrcp_server *server; + struct avrcp *session; + struct avrcp_data *target; + + server = find_server(servers, device_get_adapter(dev)); + if (server == NULL) + return NULL; + + session = find_session(server->sessions, dev); + if (session == NULL) + return NULL; + + target = session->target; + if (target == NULL) + return NULL; + + return target->player; +} + static int avrcp_connect(struct btd_service *service) { struct btd_device *dev = btd_service_get_device(service); diff --git a/profiles/audio/avrcp.h b/profiles/audio/avrcp.h index 3fd74e18a..a9964f4fa 100644 --- a/profiles/audio/avrcp.h +++ b/profiles/audio/avrcp.h @@ -116,3 +116,5 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, size_t avrcp_handle_vendor_reject(uint8_t *code, uint8_t *operands); size_t avrcp_browsing_general_reject(uint8_t *operands); + +struct avrcp_player *avrcp_get_target_player_by_device(struct btd_device *dev); diff --git a/profiles/audio/media.c b/profiles/audio/media.c index a0173fdd4..4ae936556 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -239,6 +239,20 @@ static void media_endpoint_exit(DBusConnection *connection, void *user_data) media_endpoint_remove(endpoint); } +static struct media_adapter *find_adapter(struct btd_device *device) +{ + GSList *l; + + for (l = adapters; l; l = l->next) { + struct media_adapter *adapter = l->data; + + if (adapter->btd_adapter == device_get_adapter(device)) + return adapter; + } + + return NULL; +} + static void clear_configuration(struct media_endpoint *endpoint, struct media_transport *transport) { @@ -426,6 +440,33 @@ struct a2dp_config_data { a2dp_endpoint_config_t cb; }; +uint8_t media_player_get_device_volume(struct btd_device *device) +{ + struct avrcp_player *target_player; + struct media_adapter *adapter; + GSList *l; + + if (!device) + return UNINITIALIZED_VOLUME_VALUE; + + target_player = avrcp_get_target_player_by_device(device); + if (!target_player) + return UNINITIALIZED_VOLUME_VALUE; + + adapter = find_adapter(device); + if (!adapter) + return UNINITIALIZED_VOLUME_VALUE; + + for (l = adapter->players; l; l = l->next) { + struct media_player *mp = l->data; + + if (mp->player == target_player) + return mp->volume; + } + + return UNINITIALIZED_VOLUME_VALUE; +} + static gboolean set_configuration(struct media_endpoint *endpoint, uint8_t *configuration, size_t size, media_endpoint_cb_t cb, @@ -439,6 +480,7 @@ static gboolean set_configuration(struct media_endpoint *endpoint, const char *path; DBusMessageIter iter; struct media_transport *transport; + uint8_t init_volume; transport = find_device_transport(endpoint, device); @@ -451,6 +493,9 @@ static gboolean set_configuration(struct media_endpoint *endpoint, if (transport == NULL) return FALSE; + init_volume = media_player_get_device_volume(device); + media_transport_update_volume(transport, init_volume); + msg = dbus_message_new_method_call(endpoint->sender, endpoint->path, MEDIA_ENDPOINT_INTERFACE, "SetConfiguration"); @@ -646,20 +691,6 @@ static gboolean endpoint_init_a2dp_sink(struct media_endpoint *endpoint, return TRUE; } -static struct media_adapter *find_adapter(struct btd_device *device) -{ - GSList *l; - - for (l = adapters; l; l = l->next) { - struct media_adapter *adapter = l->data; - - if (adapter->btd_adapter == device_get_adapter(device)) - return adapter; - } - - return NULL; -} - static bool endpoint_properties_exists(const char *uuid, struct btd_device *dev, void *user_data) @@ -1779,6 +1810,7 @@ static struct media_player *media_player_create(struct media_adapter *adapter, mp->sender = g_strdup(sender); mp->path = g_strdup(path); mp->timer = g_timer_new(); + mp->volume = UNINITIALIZED_VOLUME_VALUE; mp->watch = g_dbus_add_disconnect_watch(conn, sender, media_player_exit, mp, diff --git a/profiles/audio/media.h b/profiles/audio/media.h index dd630d432..f84f36d61 100644 --- a/profiles/audio/media.h +++ b/profiles/audio/media.h @@ -33,3 +33,5 @@ void media_unregister(struct btd_adapter *btd_adapter); struct a2dp_sep *media_endpoint_get_sep(struct media_endpoint *endpoint); const char *media_endpoint_get_uuid(struct media_endpoint *endpoint); uint8_t media_endpoint_get_codec(struct media_endpoint *endpoint); + +uint8_t media_player_get_device_volume(struct btd_device *device); diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index a32073380..285bfb714 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -55,8 +55,6 @@ #define MEDIA_TRANSPORT_INTERFACE "org.bluez.MediaTransport1" -#define UNINITIALIZED_VOLUME_VALUE 128 - typedef enum { TRANSPORT_STATE_IDLE, /* Not acquired and suspended */ TRANSPORT_STATE_PENDING, /* Playing but not acquired */ @@ -981,7 +979,7 @@ void media_transport_update_device_volume(struct btd_device *dev, { GSList *l; - if (dev == NULL) + if (dev == NULL || !media_transport_volume_valid(volume)) return; for (l = transports; l; l = l->next) { diff --git a/profiles/audio/transport.h b/profiles/audio/transport.h index c430515f2..46a9c91bd 100644 --- a/profiles/audio/transport.h +++ b/profiles/audio/transport.h @@ -22,6 +22,8 @@ * */ +#define UNINITIALIZED_VOLUME_VALUE 128 + struct media_transport; struct media_transport *media_transport_create(struct btd_device *device,