From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80B83C433E0 for ; Wed, 5 Aug 2020 00:31:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56D022086A for ; Wed, 5 Aug 2020 00:31:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ljLtgwBJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725981AbgHEAbE (ORCPT ); Tue, 4 Aug 2020 20:31:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbgHEAbE (ORCPT ); Tue, 4 Aug 2020 20:31:04 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3552FC06174A for ; Tue, 4 Aug 2020 17:31:03 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id l2so28462085wrc.7 for ; Tue, 04 Aug 2020 17:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/Dpvs//O9nnxahENNC/AELRXWkyrOzB1Fassg4ndGXQ=; b=ljLtgwBJa8aW2ZqI9l/xkF56ViMQ4ahF9wmOInOb2gpFPavWNLg7cpnYXAS6a3y4/G KvcORqDwgAKbgIcVES8GLEAFYqHH7QGuXvZ0UzDAEZ7viYvIveUvLgtSyEptxcpPu6dM xA/+w+ZxHq7t9jhza9CYk1iTaauQB+WWBi0ZfP1r25tHZBjXantpDrC4W0ZmUPHxJZfH kZY9bR1zudPhHAGaS3ZlVx4wDqaVuE1fgq/pgeNba5PTXuK5DGjSr4W3TRh9nzTjCf19 SDVWbUVKHX/nlk9BO78Ysg/ayIDVzLaFdEp+FdKIGJnt3w0/FEfKHVkxD/ZqmTjoY0EM OW3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/Dpvs//O9nnxahENNC/AELRXWkyrOzB1Fassg4ndGXQ=; b=fBXNvJljDE2tjDpX7fR2Vfm/7sljE4dHAiPlEJJrXUh3j/TNXT2S7fX8i1mVKgsWQ3 27SKKsIaTUVOcMJNXG2eZ13TgYQV/ZqEuirQ2jSvy9UvPwBg26kt14rX1D6p0F2HX4KV ZcBJNSx98oVsl4hKZIfANa6mLBZipZDqtFjKfWafPS6gONWBeg0KpzJTaNFlDiYziN+3 HvM0Mdte1s1osVOV5gxu7qnb8ImW6jNPNAXXhx2vyaO2MmVkNHdwZThoYCDb+O+IK8Ew gNUtzOVr9dslfdrdb4r9ZpoMUiqbxiMGkRlykAnkrtUsbXTD73iUmynQKBGU4goYzd0K UM9Q== X-Gm-Message-State: AOAM531QG7XkfApMUufQp2cXX7FvHBLS1nklGm8l7VMdW5drNXQW8HxT 6n48OlT0v6w/Kmwlue6z+Qgt31CJIpiRMRPDN/mG+Q== X-Google-Smtp-Source: ABdhPJzlcdmJWe1kw5mUBGCmhFJBaou3JrOfQeQ2mprYBZXBvr+gWNIIMXG8HKlNllVzsp7NS67WN6fI8XJlLCRXoN8= X-Received: by 2002:a5d:6aca:: with SMTP id u10mr349255wrw.365.1596587462366; Tue, 04 Aug 2020 17:31:02 -0700 (PDT) MIME-Version: 1.0 References: <20200708121928.bluez.v2.1.I6076fdf5621a5ce59b7307967a8c997638c1d1c8@changeid> In-Reply-To: From: Archie Pusaka Date: Wed, 5 Aug 2020 08:30:50 +0800 Message-ID: Subject: Re: [bluez PATCH v2] avrcp: include all player settings in notif event To: Luiz Augusto von Dentz Cc: Howard Chung , BlueZ , Archie Pusaka Content-Type: text/plain; charset="UTF-8" Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Got it, we will rebase to master and resubmit. Regards, Archie On Wed, 5 Aug 2020 at 08:28, Luiz Augusto von Dentz wrote: > > Hi Archie, > > On Tue, Aug 4, 2020 at 10:30 AM Archie Pusaka wrote: > > > > Hi Luiz, > > > > Is this the problem? > > https://lore.kernel.org/linux-bluetooth/5f05427c.1c69fb81.f61e.0992@mx.google.com/ > > > > If so, that has been resolved in v2. > > Found it, but it doesn't seem to apply on top of master: > > Applying: avrcp: include all player settings in notif event > error: patch failed: profiles/audio/avrcp.c:1595 > error: profiles/audio/avrcp.c: patch does not apply > Patch failed at 0001 avrcp: include all player settings in notif event > > > Regards, > > Archie > > > > On Wed, 5 Aug 2020 at 01:07, Luiz Augusto von Dentz > > wrote: > > > > > > Hi Archie, > > > > > > On Tue, Aug 4, 2020 at 1:26 AM Archie Pusaka wrote: > > > > > > > > Hi Bluez maintainers, > > > > > > > > Could you take a look at this fix? > > > > Thank you! > > > > > > Has there been any new version? It looks like CI has caught some > > > problems with it or that has been resolved by V2? > > > > > > > Regards, > > > > Archie > > > > > > > > > > > > On Wed, 8 Jul 2020 at 12:19, Howard Chung wrote: > > > > > > > > > > According to AVRCP 1.6.2 spec section 6.7.2 table 6.39, all player > > > > > application settings should be returned to the CT and let CT to > > > > > determine which settings have changed. Currently bluez only returns > > > > > the changed attribute instead. This patch also addresses a potential > > > > > issue on which the number of application settings mismatches with > > > > > the actual number returned. > > > > > > > > > > Reviewed-by: Archie Pusaka > > > > > --- > > > > > > > > > > Changes in v2: > > > > > - Fixed unused variables > > > > > > > > > > profiles/audio/avrcp.c | 71 +++++++++++++++++++----------------------- > > > > > 1 file changed, 32 insertions(+), 39 deletions(-) > > > > > > > > > > diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c > > > > > index e2428250e..a4de7530e 100644 > > > > > --- a/profiles/audio/avrcp.c > > > > > +++ b/profiles/audio/avrcp.c > > > > > @@ -369,6 +369,7 @@ static uint32_t company_ids[] = { > > > > > }; > > > > > > > > > > static void avrcp_register_notification(struct avrcp *session, uint8_t event); > > > > > +static GList *player_list_settings(struct avrcp_player *player); > > > > > > > > > > static sdp_record_t *avrcp_ct_record(void) > > > > > { > > > > > @@ -743,6 +744,35 @@ static int play_status_to_val(const char *status) > > > > > return -EINVAL; > > > > > } > > > > > > > > > > +static uint16_t player_settings_changed(struct avrcp_player *player, > > > > > + struct avrcp_header *pdu) > > > > > +{ > > > > > + GList *settings = player_list_settings(player); > > > > > + int size = 2; > > > > > + > > > > > + for (; settings; settings = settings->next) { > > > > > + const char *key = settings->data; > > > > > + int attr; > > > > > + int val; > > > > > + > > > > > + attr = attr_to_val(key); > > > > > + if (attr < 0) > > > > > + continue; > > > > > + > > > > > + val = player_get_setting(player, attr); > > > > > + if (val < 0) > > > > > + continue; > > > > > + > > > > > + pdu->params[size++] = attr; > > > > > + pdu->params[size++] = val; > > > > > + } > > > > > + > > > > > + g_list_free(settings); > > > > > + > > > > > + pdu->params[1] = (size - 2) >> 1; > > > > > + return size; > > > > > +} > > > > > + > > > > > void avrcp_player_event(struct avrcp_player *player, uint8_t id, > > > > > const void *data) > > > > > { > > > > > @@ -751,8 +781,6 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, > > > > > uint8_t code; > > > > > uint16_t size; > > > > > GSList *l; > > > > > - int attr; > > > > > - int val; > > > > > > > > > > if (player->sessions == NULL) > > > > > return; > > > > > @@ -791,19 +819,7 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, > > > > > size = 1; > > > > > break; > > > > > case AVRCP_EVENT_SETTINGS_CHANGED: > > > > > - size = 2; > > > > > - pdu->params[1] = 1; > > > > > - > > > > > - attr = attr_to_val(data); > > > > > - if (attr < 0) > > > > > - return; > > > > > - > > > > > - val = player_get_setting(player, attr); > > > > > - if (val < 0) > > > > > - return; > > > > > - > > > > > - pdu->params[size++] = attr; > > > > > - pdu->params[size++] = val; > > > > > + size = player_settings_changed(player, pdu); > > > > > break; > > > > > case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED: > > > > > size = 5; > > > > > @@ -1595,7 +1611,6 @@ static uint8_t avrcp_handle_register_notification(struct avrcp *session, > > > > > struct btd_device *dev = session->dev; > > > > > uint16_t len = ntohs(pdu->params_len); > > > > > uint64_t uid; > > > > > - GList *settings; > > > > > > > > > > /* > > > > > * 1 byte for EventID, 4 bytes for Playback interval but the latest > > > > > @@ -1626,29 +1641,7 @@ static uint8_t avrcp_handle_register_notification(struct avrcp *session, > > > > > len = 1; > > > > > break; > > > > > case AVRCP_EVENT_SETTINGS_CHANGED: > > > > > - len = 1; > > > > > - settings = player_list_settings(player); > > > > > - > > > > > - pdu->params[len++] = g_list_length(settings); > > > > > - for (; settings; settings = settings->next) { > > > > > - const char *key = settings->data; > > > > > - int attr; > > > > > - int val; > > > > > - > > > > > - attr = attr_to_val(key); > > > > > - if (attr < 0) > > > > > - continue; > > > > > - > > > > > - val = player_get_setting(player, attr); > > > > > - if (val < 0) > > > > > - continue; > > > > > - > > > > > - pdu->params[len++] = attr; > > > > > - pdu->params[len++] = val; > > > > > - } > > > > > - > > > > > - g_list_free(settings); > > > > > - > > > > > + len = player_settings_changed(player, pdu); > > > > > break; > > > > > case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED: > > > > > len = 5; > > > > > -- > > > > > 2.27.0.383.g050319c2ae-goog > > > > > > > > > > > > > > > > > -- > > > Luiz Augusto von Dentz > > > > -- > Luiz Augusto von Dentz