Received: from mail-vs1-f41.google.com (mail-vs1-f41.google.com [209.85.217.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBC4C39DBCF for ; Tue, 2 Jun 2026 21:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780434035; cv=none; b=PZ0KqLNJJsHa7rcaG1ED7WukT+RxEtROYTssic7vxbL3KSOLYIiTTMxjijFH3V8vekVDJk7DnJf91/oEVGY2NcEl7hRVDVmvJuyxlrhaKDLHWtYYaiGA8xUa5TJpRN8SSja43SJ5ugXCj6qzI8OGHUVkVzLd0SqNmU4WOiRWRno= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780434035; c=relaxed/simple; bh=PqDIdaaZc8UafpHGMD+reh70UOQFUpKQ27LZohEWEqg=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=p+72vXrmY9rbf7fwv08KSXdIL86DLUbLpdbXP/3AW+9cWJEmLst9Tk2A3kGp2Yl3UGPopXS1gUnnDS0UXfcOsqj+uazB7h4vYyYRb7PttxrmWdtGzOqr/Yk25eSqUUoaGpG8pG78IQAZHysVKPsEnunvkyTAuC7M5b/EZ1TX8U8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=o84s7Fcd; arc=none smtp.client-ip=209.85.217.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o84s7Fcd" Received: by mail-vs1-f41.google.com with SMTP id ada2fe7eead31-6c5ac3fa819so1301766137.0 for ; Tue, 02 Jun 2026 14:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780434033; x=1781038833; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1dzSDoPVuAz9gPAU+yPJ2gHXE6Gv8zhX+IRndkTDJCk=; b=o84s7Fcdsymcu1s1DM88T/6u8vfWnQc2Hcwz99iD93Eu0uTgWsp2Lu6mnfHWmNQi5s j4a9ENvmhg28ed8UY1Un86Es/GRRgOxuItIasWYwGDdgREUwjUTACZsnO25dge3HWZrp 7hyxZ1D1Cr4HLAwlN37TPQt9ikeTg2cpMLDaR0d0job7E3dESUkBAeIs59Pe6/kYUklL so1q6+hWkqGtAm5zi1et9Dah2f+AjDjL+rSeTSUZsqqFtwHsub10Hw0OGBoH8WFUyrUP aSriG7zbqGoGY1g/I7pv86rM75w3vSq7WoHY9YQij/bbm1/rc/oYAG7b+8aNZWtOjZNx iSNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780434033; x=1781038833; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1dzSDoPVuAz9gPAU+yPJ2gHXE6Gv8zhX+IRndkTDJCk=; b=HUxqjEXT5qs+WhEeD6UlhkjUREPUoxOqj+AZ0ty906d009JRPKy1qCHbl8shZINkfD hm/zZXHYmBj9o6FjHsIC0xD4WxlvpTbMESpBgZZyP6DZ2jRxbkjHs5IxCOekx4fYvJna 0Z1WRjUip2JvMpRgu+BO8xbPgA7IRStfzC8J5U/VssiP3/DdIcDWIA1ScXwnnW85Nbkz Z/djccrvcLnyya5ydBTikpvsFdG88mEcsrScib3CqCnAZ2FyK3Zc0PgTY6pUnBfL9adg aM16hkLoRQizK/l7ES/P4yRmCH4ejkzXBOMzlD7is7u0wWg+MIySAQE7980obZ5/hZoY vYeg== X-Gm-Message-State: AOJu0Yzxujt8LQ41gZSm0Z5UllLdEogzjtEyd0RoM4rQeQbteHHefjgl n4YVrPfKV5UuGVECv1bVrQjUqbypS+auFxUrotpG/ImyGEW5pZHxQK4LivlrWKrVAHA= X-Gm-Gg: Acq92OHzGkxVEVXR+slSDSVY2lt5avLtTSBPlHbt92xqLlbFkx3fU0Mf+IJf4IRtUmi 8invCfhpu0lMmLoApetgNuETHVjWroHxpMkpXf/JtlVO9CZUdk79PzygFrlhJSGjrRkLggBbRJP KMvdHib/m777tBzWoncIasbRWA4xaWOW2Mzi9zho8kdi7rj3d+Fy36g3XBBFDedMBP/oF940Igs p1Zyzz8YjAPGuTzGpqmJ5hYcmnUincgZZfJh5kiVZNSEfq2jAyJbFNXStxd1PWhg+N1P8FBigN7 WKMDChCtFMpc39lV2h36ZQYySEecjhHVpiOl8kVOjG9CsJikcH88CugLrklAe3neCb2u8wlIRBU PLPReamfIkvG76WcCWnBnvxHVfC9uAnT1l76i5XaIXWPBTTrvasaeHwiRkAMSI9NInEQBb+UaFc 6YOfUOmnLPzO/MXf1EN+NawRdk/XzdJIj79msk95/xSZMawuLRI95CIEgZc2rpzgcX8jfZiwtS7 fj8EW4uyhEuBhrH/qkFQ9RKeKJs X-Received: by 2002:a05:6102:94f:b0:6a2:b441:e0e5 with SMTP id ada2fe7eead31-6ec2b17f366mr154762137.8.1780434032638; Tue, 02 Jun 2026 14:00:32 -0700 (PDT) Received: from lvondent-mobl5 ([72.188.211.115]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-6eb6668702fsm496943137.10.2026.06.02.14.00.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 14:00:32 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v1 1/4] profiles/audio/bass: Use BASS_Modify_Source when assistant is active Date: Tue, 2 Jun 2026 17:00:19 -0400 Message-ID: <20260602210022.213562-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Luiz Augusto von Dentz When a MediaAssistant is already active (streaming), a subsequent Push should send Modify Source with PA_SYNC_NO_SYNC and bis_sync=0 to remove the broadcast source, rather than adding a duplicate source. Split push() into push_add_src() and push_mod_src() helpers. The push dispatcher checks the assistant state: ACTIVE non-local assistants and LOCAL assistants with a tracked source entry both route to push_mod_src, while all others proceed with push_add_src. Add per-device source tracking for LOCAL assistants via a bass_src struct (keyed by bt_bass pointer) stored in a per-assistant srcs queue. This is needed because LOCAL assistants never change state, so we cannot rely on the state machine alone to detect active sources. Also fix the bass_src_changed BID filter: the previous check rejected non-local assistants when BID was zero, but this incorrectly excluded LOCAL assistants in REQUESTING state whose BID happens to be non-zero. Change to reject assistants whose own BID is non-zero when the notification BID is zero, which correctly matches local streams. --- profiles/audio/bass.c | 176 +++++++++++++++++++++++++++++++++++------- 1 file changed, 150 insertions(+), 26 deletions(-) diff --git a/profiles/audio/bass.c b/profiles/audio/bass.c index 1fd7704a77a2..f018f8b3ad7f 100644 --- a/profiles/audio/bass.c +++ b/profiles/audio/bass.c @@ -108,9 +108,16 @@ struct bass_assistant { struct iovec *meta; struct iovec *caps; enum assistant_state state; + uint8_t src_id; + struct queue *srcs; /* Per-device source tracking */ char *path; }; +struct bass_src { + struct bt_bass *bass; + uint8_t src_id; +}; + struct bass_delegator { struct btd_device *device; /* Broadcast source device */ struct btd_service *service; @@ -158,6 +165,17 @@ static void bass_data_remove(struct bass_data *data); static void bis_probe(uint8_t sid, uint8_t bis, uint8_t sgrp, struct iovec *caps, struct iovec *meta, struct bt_bap_qos *qos, void *user_data); + +static bool match_src_data(const void *data, const void *match_data) +{ + const struct bass_src *src = data; + const struct bt_bass *bass = match_data; + + return src->bass == bass; +} + +static struct bass_src *assistant_add_src(struct bass_assistant *assistant, + struct bt_bass *bass, uint8_t id); static void bis_remove(struct bt_bap *bap, void *user_data); @@ -1010,35 +1028,62 @@ static void assistant_past(struct bass_assistant *assistant) free(addr); } -static DBusMessage *push(DBusConnection *conn, DBusMessage *msg, - void *user_data) +static DBusMessage *push_mod_src(struct bass_assistant *assistant, + DBusMessage *msg) +{ + struct bt_bass_bcast_audio_scan_cp_hdr hdr; + struct bt_bass_mod_src_params params = {0}; + struct iovec iov = {0}; + uint32_t bis_sync = 0; + uint8_t meta_len = 0; + int err; + + hdr.op = BT_BASS_MOD_SRC; + + params.id = assistant->src_id; + params.pa_sync = PA_SYNC_NO_SYNC; + params.pa_interval = PA_INTERVAL_UNKNOWN; + params.num_subgroups = assistant->sgrp + 1; + + util_iov_append(&iov, ¶ms, sizeof(params)); + + for (uint8_t sgrp = 0; sgrp < params.num_subgroups; sgrp++) { + util_iov_append(&iov, &bis_sync, sizeof(bis_sync)); + util_iov_append(&iov, &meta_len, sizeof(meta_len)); + } + + err = bt_bass_send(assistant->data->bass, &hdr, &iov); + if (err) { + DBG("Unable to send BASS Write Command"); + return btd_error_failed(msg, strerror(-err)); + } + + free(iov.iov_base); + + if (assistant->device) { + assistant_set_state(assistant, ASSISTANT_STATE_IDLE); + } else { + struct bass_src *src; + + src = queue_remove_if(assistant->srcs, match_src_data, + assistant->data->bass); + free(src); + } + + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); +} + +static DBusMessage *push_add_src(struct bass_assistant *assistant, + DBusMessage *msg) { - struct bass_assistant *assistant = user_data; struct bt_bass_bcast_audio_scan_cp_hdr hdr; struct bt_bass_add_src_params params = {0}; struct iovec iov = {0}; uint32_t bis_sync = 0; uint8_t meta_len = 0; int err; - DBusMessageIter props, dict; struct io *io; - DBG(""); - - dbus_message_iter_init(msg, &props); - - if (dbus_message_iter_get_arg_type(&props) != DBUS_TYPE_ARRAY) { - DBG("Unable to parse properties"); - return btd_error_invalid_args(msg); - } - - dbus_message_iter_recurse(&props, &dict); - - if (assistant_parse_props(assistant, &dict)) { - DBG("Unable to parse properties"); - return btd_error_invalid_args(msg); - } - hdr.op = BT_BASS_ADD_SRC; if (assistant->device) { @@ -1130,11 +1175,52 @@ static DBusMessage *push(DBusConnection *conn, DBusMessage *msg, free(iov.iov_base); - assistant_set_state(assistant, ASSISTANT_STATE_PENDING); + if (assistant->state == ASSISTANT_STATE_LOCAL) + assistant_add_src(assistant, assistant->data->bass, 0); + else + assistant_set_state(assistant, ASSISTANT_STATE_PENDING); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } +static DBusMessage *push(DBusConnection *conn, DBusMessage *msg, + void *user_data) +{ + struct bass_assistant *assistant = user_data; + DBusMessageIter props, dict; + + DBG(""); + + dbus_message_iter_init(msg, &props); + + if (dbus_message_iter_get_arg_type(&props) != DBUS_TYPE_ARRAY) { + DBG("Unable to parse properties"); + return btd_error_invalid_args(msg); + } + + dbus_message_iter_recurse(&props, &dict); + + if (assistant_parse_props(assistant, &dict)) { + DBG("Unable to parse properties"); + return btd_error_invalid_args(msg); + } + + if (assistant->state == ASSISTANT_STATE_ACTIVE) { + return push_mod_src(assistant, msg); + } else if (assistant->state == ASSISTANT_STATE_LOCAL) { + struct bass_src *src; + + src = queue_find(assistant->srcs, match_src_data, + assistant->data->bass); + if (src) { + assistant->src_id = src->src_id; + return push_mod_src(assistant, msg); + } + } + + return push_add_src(assistant, msg); +} + static const GDBusMethodTable assistant_methods[] = { {GDBUS_EXPERIMENTAL_ASYNC_METHOD("Push", GDBUS_ARGS({ "Props", "a{sv}" }), @@ -1235,6 +1321,7 @@ static void assistant_free(void *data) g_free(assistant->path); util_iov_free(assistant->meta, 1); util_iov_free(assistant->caps, 1); + queue_destroy(assistant->srcs, free); free(assistant); } @@ -2015,9 +2102,33 @@ static void bass_handle_bcode_req(struct bass_assistant *assistant, int id) free(iov.iov_base); } +static struct bass_src *assistant_add_src(struct bass_assistant *assistant, + struct bt_bass *bass, uint8_t id) +{ + struct bass_src *src; + + if (!assistant->srcs) + assistant->srcs = queue_new(); + + src = queue_find(assistant->srcs, match_src_data, bass); + if (src) { + src->src_id = id; + return src; + } + + src = new0(struct bass_src, 1); + src->bass = bass; + src->src_id = id; + + queue_push_tail(assistant->srcs, src); + + return src; +} + static void bass_src_changed(uint8_t id, uint32_t bid, uint8_t state, uint8_t enc, uint32_t bis_sync, void *user_data) { + struct bass_data *data = user_data; const struct queue_entry *entry; for (entry = queue_get_entries(assistants); entry; @@ -2032,9 +2143,9 @@ static void bass_src_changed(uint8_t id, uint32_t bid, uint8_t state, continue; /* If BID is not set it may happen to be local stream so ignore - * non-local assistants. + * non-local assistants unless their BID is also not set. */ - if (!bid && assistant->state != ASSISTANT_STATE_LOCAL) + if (!bid && assistant->bid) continue; if (state == BT_BASS_SYNC_INFO_RE) { @@ -2066,21 +2177,34 @@ static void bass_src_changed(uint8_t id, uint32_t bid, uint8_t state, break; /* Match BIS index */ - if (bis & bis_sync) + if (bis & bis_sync) { + assistant->src_id = id; assistant_set_state(assistant, ASSISTANT_STATE_ACTIVE); + } break; case BT_BASS_BIG_ENC_STATE_DEC: /* Only handle assistant objects that * have requested a Broadcast Code */ - if (assistant->state != ASSISTANT_STATE_REQUESTING) + if (assistant->state != ASSISTANT_STATE_REQUESTING && + assistant->state != ASSISTANT_STATE_LOCAL) break; /* Match BIS index */ - if (bis & bis_sync) + if (bis & bis_sync) { + assistant->src_id = id; + + if (assistant->state == + ASSISTANT_STATE_LOCAL) { + assistant_add_src(assistant, data->bass, + id); + break; + } + assistant_set_state(assistant, ASSISTANT_STATE_ACTIVE); + } break; default: continue; -- 2.54.0