From patchwork Mon Feb 5 17:03:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pauli Virtanen X-Patchwork-Id: 770147 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D3BA3FE44 for ; Mon, 5 Feb 2024 17:03:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707152609; cv=pass; b=DV/SXSPaDOjBwQruVDwvwHgBFGoLA2clKwafv27EmNFZr8uCIywdcSrQStvLS7HJUl00qeDlPyNrg1aXFPIxWQ/yX7cS/375WdeAjspENe5dDztd+YcMUrYVKk3IwtYXLOEhYSyDnaaIsMCpDURVThbyo9ETWxXl3is3GJBa7jU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707152609; c=relaxed/simple; bh=uFDtGSZRql9Thhh1IYzgZeOc4zMuBZoMz+qPWwGzgxQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EECEU3AP9mU/Ll1InMILbqHSj30+ZLZ1PlMk71d44NIl21+jBu3ITpsD5ChKSBHMGE6UXUCLYXWDxcI9Uwzf55JUM1h5qKnR+BwfZqevtLYx0zPNYQ2c3gVnW1x8A1kUDBI/rdrSqULarIXHtfNJyUXHWRhWKkevdXyYFvB9rt4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=FlOtkn7P; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="FlOtkn7P" Received: from monolith.lan (unknown [193.138.7.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: pav) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4TTCPl0Z94z49Q2f; Mon, 5 Feb 2024 19:03:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1707152604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zShLttf7eREGYIGkYVJagwktj2Lunjtcq1Iw/LRIUCU=; b=FlOtkn7PbbFRUQ2NwUUo6Vv6QHEonP+1olvEi0Uyzxos8CMLPczWcQhY/ds5AR77jial08 s4w9fjy48IxF67m5+7QpZXcyNJ9lbJaSuWuzv17afMIgMWB+oH+lIwHW+MdFM55DVM7Cod JFtEF2cXOOp8B4G7Zz8MX+KYcn9Mx6iOJwL2vLY2znExK+6f/8pthiNsKqyxGHExP2lpEn XeikphKjtpW8rZhbE7CdSo1hJf7ZnRXPwJ7mN1SbfEbpyDX8iOBaBMTYYpf8/z0SNJtFdE /LkNE/8hAPvT/ZOuU27DMtLBNe7OoSfwScpikZv+TjPhoV/8Fu+lPfVwgU60hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1707152604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zShLttf7eREGYIGkYVJagwktj2Lunjtcq1Iw/LRIUCU=; b=cEGhqUwP6MKqmUDeriifCxFy9ZTSQTunKT2W1Tgr6On/jmnBQnoKwbGTEgirgukuqXJh89 Ucyb/mqPx6ViiVxq/Oyp4rGGr+BBQAO26SRBwxcMEsQkg4974BWx7VlBqJzarBltWpGlxn qeX1qnEvUdh1n6VYNThEsLk+WClXrPw5ZC1wdZvdB3BcTGdcZkSF5u9uoqys8kVFuLHJcK IXBgXzIzLeboJruVuknHZhU7N/ZtdWEFGxh7mAnt4J5T/GRcKX/1btfwo3NQscOrqgwHgn Kwgle7eBtiLwTUxvlMMfHOrZOVv05YgJNzGozw9095DasWFQf7otP+RfCAVT+Q== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1707152604; a=rsa-sha256; cv=none; b=bBu/h+rt179FO3EnTwYjoW11+MqtTPj4naCO5vGPQ37z7t/We7fXH0sjsSoYKd7JURRyB4 dtjULSX27iV6fmvkqMJNfku9Zs3MCWQWFmEtBwceUAwvrbjMENhq/aAQF3zHUxRu6GeHT4 AARBob1E6p9I4DKTisDS3aF+76LLzzj5iITccTxqUgV9k7haxe+H1uYs0onEQaQQIBrIVF yR0GRD+ikJeYn92GyRqeQkJSiCO/kYSmdMeRAxzxfph29yZsTBizeWtrpVVdErsYFtNk2o dQnr2AeIQb7u0udHqchytve2JqfcqMFVt57VjgqSkSlH0ezAyUPLeEtUOr3LSw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=pav smtp.mailfrom=pav@iki.fi From: Pauli Virtanen To: linux-bluetooth@vger.kernel.org Cc: Pauli Virtanen Subject: [PATCH BlueZ v2 1/2] monitor: parse Google's Opus A2DP vendor codec capabilities Date: Mon, 5 Feb 2024 19:03:16 +0200 Message-ID: <5ae678a1c4353818744a6bff31b21055371d2592.1707152569.git.pav@iki.fi> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Support parsing Opus (Google) A2DP vendor codec capabilities. AOSP & Google Pixel Buds Pro has this implemented. > ACL Data RX: Handle 256 flags 0x02 dlen 21 #419 [hci0] 26.905032 Channel: 65 len 17 [PSM 25 mode Basic (0x00)] {chan 4} AVDTP: Get All Capabilities (0x0c) Response Accept (0x02) type 0x00 label 3 nosp 0 Service Category: Media Transport (0x01) Service Category: Media Codec (0x07) Media Type: Audio (0x00) Media Codec: Non-A2DP (0xff) Vendor ID: Google (0x000000e0) Vendor Specific Codec ID: Opus (Google) (0x0001) Frequency: 0x80 48000 Frame Duration: 0x18 10 ms 20 ms Channel Mode: 0x07 Mono Stereo Dual Mono Reserved: 0x60 Service Category: Delay Reporting (0x08) --- Notes: As far as I know, Opus is in no Bluetooth standard, only vendor codec. monitor/a2dp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/monitor/a2dp.c b/monitor/a2dp.c index f6e99ab26..ae88f565e 100644 --- a/monitor/a2dp.c +++ b/monitor/a2dp.c @@ -47,6 +47,8 @@ #define APTX_HD_CODEC_ID 0x0024 #define LDAC_VENDOR_ID 0x0000012d #define LDAC_CODEC_ID 0x00aa +#define OPUS_G_VENDOR_ID 0x000000e0 +#define OPUS_G_CODEC_ID 0x0001 struct bit_desc { uint8_t bit_num; @@ -201,6 +203,24 @@ static const struct bit_desc faststream_source_frequency_table[] = { { } }; +static const struct bit_desc opus_g_frequency_table[] = { + { 7, "48000" }, + { } +}; + +static const struct bit_desc opus_g_duration_table[] = { + { 3, "10 ms" }, + { 4, "20 ms" }, + { } +}; + +static const struct bit_desc opus_g_channels_table[] = { + { 0, "Mono" }, + { 1, "Stereo" }, + { 2, "Dual Mono" }, + { } +}; + static void print_value_bits(uint8_t indent, uint32_t value, const struct bit_desc *table) { @@ -244,6 +264,7 @@ static bool codec_vendor_aptx_ll_cfg(uint8_t losc, struct l2cap_frame *frame); static bool codec_vendor_aptx_hd_cap(uint8_t losc, struct l2cap_frame *frame); static bool codec_vendor_aptx_hd_cfg(uint8_t losc, struct l2cap_frame *frame); static bool codec_vendor_ldac(uint8_t losc, struct l2cap_frame *frame); +static bool codec_vendor_opus_g(uint8_t losc, struct l2cap_frame *frame); static const struct vndcodec vndcodecs[] = { { APTX_VENDOR_ID, APTX_CODEC_ID, "aptX", @@ -256,6 +277,8 @@ static const struct vndcodec vndcodecs[] = { codec_vendor_aptx_hd_cap, codec_vendor_aptx_hd_cfg }, { LDAC_VENDOR_ID, LDAC_CODEC_ID, "LDAC", codec_vendor_ldac, codec_vendor_ldac }, + { OPUS_G_VENDOR_ID, OPUS_G_CODEC_ID, "Opus (Google)", + codec_vendor_opus_g, codec_vendor_opus_g }, { } }; @@ -685,6 +708,31 @@ static bool codec_vendor_ldac(uint8_t losc, struct l2cap_frame *frame) return true; } +static bool codec_vendor_opus_g(uint8_t losc, struct l2cap_frame *frame) +{ + uint8_t cap = 0; + + if (losc != 1) + return false; + + l2cap_frame_get_u8(frame, &cap); + + print_field("%*cFrequency: 0x%02x", BASE_INDENT + 2, ' ', cap & 0x80); + print_value_bits(BASE_INDENT + 2, cap, opus_g_frequency_table); + + print_field("%*cFrame Duration: 0x%02x", BASE_INDENT + 2, ' ', + cap & 0x18); + print_value_bits(BASE_INDENT + 2, cap, opus_g_duration_table); + + print_field("%*cChannel Mode: 0x%02x", BASE_INDENT + 2, ' ', + cap & 0x07); + print_value_bits(BASE_INDENT + 2, cap, opus_g_channels_table); + + print_field("%*cReserved: 0x%02x", BASE_INDENT + 2, ' ', cap & 0x60); + + return true; +} + static bool codec_vendor_cap(uint8_t losc, struct l2cap_frame *frame) { uint32_t vendor_id = 0; From patchwork Mon Feb 5 17:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pauli Virtanen X-Patchwork-Id: 770686 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 665173FE4F for ; Mon, 5 Feb 2024 17:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707152609; cv=pass; b=LE4AHyAaW753hYN8N4CZm4kmCQ9fjDrTTt7LueNgHsHlM6CnOvQRS6ZR04bakm4AdEEIMCyPdyTlYQoy+BWlb53aps49HWFfNYfKNWwx7pt8EYrvadl17KTXiYVlZsfwUtXPI/0tIBsWtdIEMTp7WeZ/HhgSG6FBDlaCvI2/WmM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707152609; c=relaxed/simple; bh=peV5kYgpSiPEnG4t3+EHVJ416RR4W3k58gZceZoc6ok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SznVFqEaA5sooCsJwvxw45SYWIoUoQEx10oY5e8IAlpQsyHIRvkt8VGQ1RZ7LP3h6pFNEW1VGb0NwWwZ51zwLNucT9afmAlYDXNgaUEPFGkLUQ+/JSclOS2Ql2PQb2nhgvynOAbCU0esZdUV02jWCS9kx38383GToMSO/yoB2pc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=U4oDQxHR; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="U4oDQxHR" Received: from monolith.lan (unknown [193.138.7.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: pav) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4TTCPm4hZNz49Q4s; Mon, 5 Feb 2024 19:03:24 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1707152605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cBLbQOEXDllWzF9PWEBorYN4aRuRVcOcjWvY/mlTdRY=; b=U4oDQxHRacq9xghmxzaDpiiK7ll7lFR06Of4vod8WTSzn/CAJBQ5f41Oqd9jfNwO5Xhhic ke7zJVNT/8s5D0UkWS5vj5vX7Z91WPc5FrNtXkZpfeGGG1CVknXezCXa3I4IHn4l4ntzLN lvB4Kmp5tac53ioZOkMG2a0/bzfPiuLSbfXsUUaX9ME83j+GLzuPtrsFEdYGhwFRKxmEPH xFi0Y2lzQEQWfO5WZfIp02JSE0Bdd1IcA+5ItzVETfJz51KoCKATxPqKcaZKSdCKuJVVDu Sl1xZd5EUQvnZZjyzvQfq+NZPO6URRRlaMB0VVatzfr2e+n1CMP7sMZTO0dQrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1707152605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cBLbQOEXDllWzF9PWEBorYN4aRuRVcOcjWvY/mlTdRY=; b=Iy16zqbdzN7RsziT2l2MGirVArLlAM5GpP/O9f8HjeBiNlOp/6HS10vIhK4SRMBby9tF9H a+8qlvTO1rT6CRyvRUAC7c0Rr5sOcFv1QjVpYyrDEwP++NpTnh2v3qdEI4nFDA0DpA1eKV HGPYaz4IbsUD7O+OYFh4ifb5f9+PUMCEPR22irRa4+3rhooMR0Dl2BMw4V0KU1HxAdkO0x Z+tkI2k/8UeUPY92bRb+4HFNhxXrPFAn+qj5wCmjTATP4VNFts3ATXnnO7H9IZBjAPOdoq 4OXKIIW7CAc6OJRSUlTE+8hBtgVke2jIzLMLiVuJJN8FAenH3pz6lOAXqJN7nA== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1707152605; a=rsa-sha256; cv=none; b=KkIV4JCJGGm1GzADQ0MqAb3tA+c0ieNkiblIVKXXw55fk428BwmossyOHAoW+rpL5XpPq0 7pVH/CH9MVtDWvRf6tbm4IkOr6oYlN+o9WrDQNv7UMiRR6Jwy0N8i2B4Mw4pbmPpfYqQK7 XjaYYRx4HgVXKH2VEvq6fLfUsXSGA6M7/FF9I/Ua5nKQLrYrbUbd2+r+coz4soCcUdjDAO wxyP7MQO6G+RJ+bmkVDy+AU8HwJfD0JzS5AbblmTqk5kEKsdIw9+hemVGZslq3Q0LW887k j2Yj+Ra37gLicGQGEds/6VoPMBfpCcLHKz02bVLWoT2sCkwjpyLyZujUtSctww== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=pav smtp.mailfrom=pav@iki.fi From: Pauli Virtanen To: linux-bluetooth@vger.kernel.org Cc: Pauli Virtanen Subject: [PATCH BlueZ v2 2/2] client/player: parse Google's Opus A2DP vendor codec capabilities Date: Mon, 5 Feb 2024 19:03:17 +0200 Message-ID: <85bd33f548fd177b392f067d54ad3922a0db6cec.1707152569.git.pav@iki.fi> X-Mailer: git-send-email 2.43.0 In-Reply-To: <5ae678a1c4353818744a6bff31b21055371d2592.1707152569.git.pav@iki.fi> References: <5ae678a1c4353818744a6bff31b21055371d2592.1707152569.git.pav@iki.fi> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Support parsing Opus (Google) A2DP vendor codec capabilities. Transport /org/bluez/hci0/dev_B8_7B_D4_32_44_15/sep3/fd2 UUID: 0000110a-0000-1000-8000-00805f9b34fb Codec: 0xff (255) Media Codec: Vendor Specific A2DP Codec Vendor ID 0x000000e0 Vendor Specific Codec ID 0x0001 Vendor Specific Data: 0x92 Vendor Specific Value (Opus [Google]) Frequencies: 48kHz Channel modes: Stereo Frame durations: 20 ms Device: /org/bluez/hci0/dev_B8_7B_D4_32_44_15 State: idle Delay: 0x0898 (2200) Volume: 0x001e (30) Endpoint: /org/bluez/hci0/dev_B8_7B_D4_32_44_15/sep3 --- client/player.c | 32 ++++++++++++++++++++++++++++++++ profiles/audio/a2dp-codecs.h | 17 +++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/client/player.c b/client/player.c index b43b4b867..a40bf66e3 100644 --- a/client/player.c +++ b/client/player.c @@ -2471,6 +2471,36 @@ static void print_ldac(a2dp_ldac_t *ldac, uint8_t size) bt_shell_printf("\n"); } +static void print_opus_g(a2dp_opus_g_t *opus, uint8_t size) +{ + bt_shell_printf("\t\tVendor Specific Value (Opus [Google])"); + + if (size < sizeof(*opus)) { + bt_shell_printf(" (broken)\n"); + return; + } + + bt_shell_printf("\n\t\tFrequencies: "); + if (opus->data & OPUS_G_FREQUENCY_48000) + bt_shell_printf("48kHz "); + + bt_shell_printf("\n\t\tChannel modes: "); + if (opus->data & OPUS_G_CHANNELS_MONO) + bt_shell_printf("Mono "); + if (opus->data & OPUS_G_CHANNELS_STEREO) + bt_shell_printf("Stereo "); + if (opus->data & OPUS_G_CHANNELS_DUAL) + bt_shell_printf("Dual Mono "); + + bt_shell_printf("\n\t\tFrame durations: "); + if (opus->data & OPUS_G_DURATION_100) + bt_shell_printf("10 ms "); + if (opus->data & OPUS_G_DURATION_200) + bt_shell_printf("20 ms "); + + bt_shell_printf("\n"); +} + static void print_vendor(a2dp_vendor_codec_t *vendor, uint8_t size) { uint32_t vendor_id; @@ -2508,6 +2538,8 @@ static void print_vendor(a2dp_vendor_codec_t *vendor, uint8_t size) print_aptx_hd((void *) vendor, size); else if (vendor_id == LDAC_VENDOR_ID && codec_id == LDAC_CODEC_ID) print_ldac((void *) vendor, size); + else if (vendor_id == OPUS_G_VENDOR_ID && codec_id == OPUS_G_CODEC_ID) + print_opus_g((void *) vendor, size); } static void print_mpeg24(a2dp_aac_t *aac, uint8_t size) diff --git a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h index 6f5670947..38b9038f8 100644 --- a/profiles/audio/a2dp-codecs.h +++ b/profiles/audio/a2dp-codecs.h @@ -250,6 +250,18 @@ #define LDAC_CHANNEL_MODE_DUAL 0x02 #define LDAC_CHANNEL_MODE_STEREO 0x01 +#define OPUS_G_VENDOR_ID 0x000000e0 +#define OPUS_G_CODEC_ID 0x0001 + +#define OPUS_G_FREQUENCY_48000 0x80 + +#define OPUS_G_DURATION_100 0x08 +#define OPUS_G_DURATION_200 0x10 + +#define OPUS_G_CHANNELS_MONO 0x01 +#define OPUS_G_CHANNELS_STEREO 0x02 +#define OPUS_G_CHANNELS_DUAL 0x04 + typedef struct { uint8_t vendor_id4; uint8_t vendor_id3; @@ -420,3 +432,8 @@ typedef struct { uint8_t reserved2; uint8_t reserved3; } __attribute__ ((packed)) a2dp_aptx_hd_t; + +typedef struct { + a2dp_vendor_codec_t info; + uint8_t data; +} __attribute__ ((packed)) a2dp_opus_g_t;