LinuxLists.cc - [PATCH] tools/hcidump: Decode FastStream, aptX Low Latency, aptX HD and LDAC

2019-01-23 17:45:18

Subject: [PATCH] tools/hcidump: Decode FastStream, aptX Low Latency, aptX HD and LDAC

---
tools/parser/avdtp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c
index 18569c895..a21410f5a 100644
--- a/tools/parser/avdtp.c
+++ b/tools/parser/avdtp.c
@@ -155,6 +155,12 @@ static char *vndcodec2str(uint32_t vendor, uint16_t vndcodec)
{
if (vendor == 0x0000004f && vndcodec == 0x0001)
return "aptX";
+ else if (vendor == 0x0000000a && vndcodec == 0x0001)
+ return "FastStream";
+ else if (vendor == 0x0000000a && vndcodec == 0x0002)
+ return "aptX Low Latency";
+ else if (vendor == 0x000000d7 && vndcodec == 0x0024)
+ return "aptX HD";
else if (vendor == 0x0000012d && vndcodec == 0x00aa)
return "LDAC";
return "Unknown";
@@ -403,8 +409,10 @@ static void capabilities(int level, struct frame *frm)
printf("%s\n", tmp & 0x80 ? "VBR" : "");
break;
case 255:
- if (vendor == 0x0000004f &&
- vndcodec == 0x0001) {
+ if ((vendor == 0x0000004f && vndcodec == 0x0001) ||
+ (vendor == 0x0000000a && vndcodec == 0x0002) ||
+ (vendor == 0x000000d7 && vndcodec == 0x0024)) {
+ /* aptX, aptX Low Latency, aptX HD */
tmp = p_get_u8(frm);
p_indent(level + 1, frm);
if (tmp & 0x80)
@@ -422,7 +430,51 @@ static void capabilities(int level, struct frame *frm)
if (tmp & 0x01)
printf("Mono ");
printf("\n");
- break;
+ } else if (vendor == 0x0000000a && vndcodec == 0x0001) {
+ /* FastStream */
+ tmp = p_get_u8(frm);
+ freq = p_get_u8(frm);
+ if (tmp & 0x1) {
+ p_indent(level + 1, frm);
+ printf("Sink ");
+ if (freq & 0x2)
+ printf("44.1kHz ");
+ if (freq & 0x1)
+ printf("48kHz ");
+ printf("\n");
+ }
+ if (tmp & 0x2) {
+ p_indent(level + 1, frm);
+ printf("Source ");
+ if (freq & 0x20)
+ printf("16kHz ");
+ printf("\n");
+ }
+ } else if (vendor == 0x0000012d && vndcodec == 0x00aa) {
+ /* LDAC */
+ tmp = p_get_u8(frm);
+ p_indent(level + 1, frm);
+ if (tmp & 0x20)
+ printf("44.1kHz ");
+ if (tmp & 0x10)
+ printf("48kHz ");
+ if (tmp & 0x08)
+ printf("88.2kHz ");
+ if (tmp & 0x04)
+ printf("96kHz ");
+ if (tmp & 0x02)
+ printf("176.4kHz ");
+ if (tmp & 0x01)
+ printf("192kHz ");
+ printf("\n");
+ p_indent(level + 1, frm);
+ if (tmp & 0x01)
+ printf("Stereo ");
+ if (tmp & 0x02)
+ printf("Dual ");
+ if (tmp & 0x04)
+ printf("Mono ");
+ printf("\n");
} else {
hex_dump(level + 1, frm, len - 8);
frm->ptr += (len - 8);
--
2.11.0

2019-01-23 17:46:20

by Marcel Holtmann

[permalink] [raw]

Subject: Re: [PATCH] tools/hcidump: Decode FastStream, aptX Low Latency, aptX HD and LDAC

Hi Pali,

> ---
> tools/parser/avdtp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 55 insertions(+), 3 deletions(-)
>
> diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c
> index 18569c895..a21410f5a 100644
> --- a/tools/parser/avdtp.c
> +++ b/tools/parser/avdtp.c
> @@ -155,6 +155,12 @@ static char *vndcodec2str(uint32_t vendor, uint16_t vndcodec)
> {
> if (vendor == 0x0000004f && vndcodec == 0x0001)
> return "aptX";
> + else if (vendor == 0x0000000a && vndcodec == 0x0001)
> + return "FastStream";
> + else if (vendor == 0x0000000a && vndcodec == 0x0002)
> + return "aptX Low Latency";
> + else if (vendor == 0x000000d7 && vndcodec == 0x0024)
> + return "aptX HD";
> else if (vendor == 0x0000012d && vndcodec == 0x00aa)
> return "LDAC";
> return "Unknown”;

lets keep the focus on btmon support since nobody should be using hcidump anymore.

Regards

Marcel

2019-01-23 17:54:52

On Saturday 08 August 2020 15:24:58 Pali Rohár wrote:
> On Sunday 03 May 2020 13:14:49 Pali Rohár wrote:
> > On Wednesday 15 April 2020 01:00:15 Pali Rohár wrote:
> > > On Sunday 09 February 2020 14:05:32 Pali Rohár wrote:
> > > > On Monday 14 October 2019 13:07:46 Pali Rohár wrote:
> > > > > On Friday 07 June 2019 15:07:39 Pali Rohár wrote:
> > > > > > On Wednesday 10 April 2019 10:29:24 Pali Rohár wrote:
> > > > > > > On Tuesday 05 March 2019 13:26:30 Pali Rohár wrote:
> > > > > > > > On Sunday 24 February 2019 15:19:07 Pasi Kärkkäinen wrote:
> > > > > > > > > On Wed, Feb 06, 2019 at 12:43:00PM +0100, Pali Rohár wrote:
> > > > > > > > > > On Friday 01 February 2019 14:43:53 Pasi Kärkkäinen wrote:
> > > > > > > > > > > Hi,
> > > > > > > > > > >
> > > > > > > > > > > On Wed, Jan 30, 2019 at 02:24:11PM +0200, Luiz Augusto von Dentz wrote:
> > > > > > > > > > > > Hi Pali, Pasi,
> > > > > > > > > > > > On Wed, Jan 30, 2019 at 2:09 PM Pali Rohár <[email protected]> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Wednesday 30 January 2019 10:15:17 Pasi Kärkkäinen wrote:
> > > > > > > > > > > > > > On Wed, Jan 23, 2019 at 06:54:48PM +0100, Pali Rohár wrote:
> > > > > > > > > > > > > > > On Wednesday 23 January 2019 18:46:18 Marcel Holtmann wrote:
> > > > > > > > > > > > > > > > Hi Pali,
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > ---
> > > > > > > > > > > > > > > > > tools/parser/avdtp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
> > > > > > > > > > > > > > > > > 1 file changed, 55 insertions(+), 3 deletions(-)
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c
> > > > > > > > > > > > > > > > > index 18569c895..a21410f5a 100644
> > > > > > > > > > > > > > > > > --- a/tools/parser/avdtp.c
> > > > > > > > > > > > > > > > > +++ b/tools/parser/avdtp.c
> > > > > > > > > > > > > > > > > @@ -155,6 +155,12 @@ static char *vndcodec2str(uint32_t vendor, uint16_t vndcodec)
> > > > > > > > > > > > > > > > > {
> > > > > > > > > > > > > > > > > if (vendor == 0x0000004f && vndcodec == 0x0001)
> > > > > > > > > > > > > > > > > return "aptX";
> > > > > > > > > > > > > > > > > + else if (vendor == 0x0000000a && vndcodec == 0x0001)
> > > > > > > > > > > > > > > > > + return "FastStream";
> > > > > > > > > > > > > > > > > + else if (vendor == 0x0000000a && vndcodec == 0x0002)
> > > > > > > > > > > > > > > > > + return "aptX Low Latency";
> > > > > > > > > > > > > > > > > + else if (vendor == 0x000000d7 && vndcodec == 0x0024)
> > > > > > > > > > > > > > > > > + return "aptX HD";
> > > > > > > > > > > > > > > > > else if (vendor == 0x0000012d && vndcodec == 0x00aa)
> > > > > > > > > > > > > > > > > return "LDAC";
> > > > > > > > > > > > > > > > > return "Unknown???;
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > lets keep the focus on btmon support since nobody should be using hcidump anymore.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > In btmon I already implemented it and patches are now merged. I just
> > > > > > > > > > > > > > > found another place where this capability parsing is implemented and
> > > > > > > > > > > > > > > based on fact that users still use hcidump I quickly looked at it and
> > > > > > > > > > > > > > > implemented this parsing.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I agree, hcidump still comes up on many places (guides, blogs, mailinglist posts, etc),
> > > > > > > > > > > > > > so it makes sense to add these patches to hcidump aswell. Especially when the patch is quite small.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Exactly, people still use hcidump...
> > > > > > > > > > > >
> > > > > > > > > > > > Well it is a deprecated tool which we might remove starting on BlueZ
> > > > > > > > > > > > 6.x which we would like to do in the very next release, if that
> > > > > > > > > > > > doesn't happen than perhaps Id take these patches in for a very last
> > > > > > > > > > > > BlueZ 5.x release.
> > > > > > > > > > > >
> > > > > > > > > > > > @Marcel: Or you have a better plan? We could do one last 5.x and then
> > > > > > > > > > > > start working on removing the deprecated tools/etc.
> > > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > +1 for doing one last 5.x release before deprecating and removing tools etc!
> > > > > > > > > >
> > > > > > > > > > Ok, what is the plan? If hcidump is not going to be deleted in upcoming
> > > > > > > > > > release, can you take this patch?
> > > > > > > > > >
> > > > > > > > >
> > > > > > > > > How about applying this patch now, considering it's small, and has value for anyone using hcidump.
> > > > > > > > > hcidump then gets removed later whenever the removal of deprecated features/tools starts.
> > > > > > > >
> > > > > > > > So... what are plans for next release?
> > > > > > >
> > > > > > > Marcel, Luiz, can you comment next steps? It is waiting there for your
> > > > > > > info here for more than 2 months.
> > > > > >
> > > > > > PING!
> > > > >
> > > > > Just a gentle reminder for this thread and patch.
> > > > >
> > > >
> > > > Ping, another reminder.
> > >
> > > Ping, could you please give us information what is the state of this
> > > tool and a linked patch?
> >
> > Ping again, I have not got any reply for this patch for more then year.
> > Patch can be still cleanly applied on top of git master branch.
>
> Hello! Have you had a time to look at this patch?

BUMP