diff options
author | ValdikSS <iam@valdikss.org.ru> | 2018-08-20 13:08:38 +0300 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-08-21 04:05:14 +0000 |
commit | 1f1c9c9af16d287f203ff21bc99394bb338f8d04 (patch) | |
tree | b886a5258cfd252c87598a29b9885ed3b63608c8 /epan/dissectors/packet-sbc.c | |
parent | e831d07fc0dac44d797e6bed21d6ed3c3117607c (diff) |
SBC: Fix DUAL CHANNEL SBC packet dissection
Change-Id: I51f3a052d2eec67e757cc5ac5eeb2cba2c47b327
Reviewed-on: https://code.wireshark.org/review/29197
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sbc.c')
-rw-r--r-- | epan/dissectors/packet-sbc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index ca729e835a..0af522ecf6 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -19,6 +19,7 @@ #include "packet-btavdtp.h" #define CHANNELS_MONO 0x00 +#define CHANNELS_DUAL_CHANNEL 0x01 #define CHANNELS_JOINT_STEREO 0x03 #define FREQUENCY_16000 0x00 @@ -176,7 +177,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) sbc_blocks = 4 * (blocks + 1); frame_length = (4 * sbc_subbands * sbc_channels) / 8; - if (sbc_channels == 1) + if (sbc_channels == 1 || channels == CHANNELS_DUAL_CHANNEL) val = sbc_blocks * sbc_channels * bitpool; else val = (((channels == CHANNELS_JOINT_STEREO) ? 1 : 0) * sbc_subbands + sbc_blocks * bitpool); |