diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-03-25 08:59:28 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-25 09:08:58 +0000 |
| commit | ab42220b6549630c99ca3a066b7943876e901843 (patch) | |
| tree | 3c1a5b1a811dcbb37084d2f30dee0737288723d3 | |
| parent | e90f660cb3155b796e9d0fba57298ceebc4a1a4b (diff) | |
| download | wireshark-ab42220b6549630c99ca3a066b7943876e901843.tar.gz wireshark-ab42220b6549630c99ca3a066b7943876e901843.tar.bz2 wireshark-ab42220b6549630c99ca3a066b7943876e901843.zip | |
Bluetooth: AVDTP: Add option to disable Force Codec preference
In real option "SBC" was Default/Off, now user can choose between
Default and Force SBC Codec.
Change-Id: I605320d89fade11dc7172793bc0492bc4b319e9c
Reviewed-on: https://code.wireshark.org/review/822
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-btavdtp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index f747f06b73..ba80ae425a 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -83,6 +83,7 @@ #define STREAM_TYPE_MEDIA 0x00 #define STREAM_TYPE_SIGNAL 0x01 +#define CODEC_DEFAULT 0xFFFF #define CODEC_SBC 0x00 #define CODEC_MPEG12_AUDIO 0x01 #define CODEC_MPEG24_AAC 0x02 @@ -269,9 +270,10 @@ static dissector_handle_t mpeg_audio_handle; static dissector_handle_t atrac_handle; static gboolean force_a2dp_scms_t = FALSE; -static gint force_a2dp_codec = CODEC_SBC; +static gint force_a2dp_codec = CODEC_DEFAULT; static const enum_val_t pref_a2dp_codec[] = { + { "default", "Default", CODEC_DEFAULT }, { "sbc", "SBC", CODEC_SBC }, { "mp2t", "MPEG12 AUDIO", CODEC_MPEG12_AUDIO }, { "mpeg-audio", "MPEG24 AAC", CODEC_MPEG24_AAC }, @@ -2251,13 +2253,13 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) sep_data.acp_seid = 0; sep_data.int_seid = 0; - if (force_a2dp_scms_t || force_a2dp_codec) { + if (force_a2dp_scms_t || force_a2dp_codec != CODEC_DEFAULT) { if (force_a2dp_scms_t) sep_data.content_protection_type = 2; else if (data) sep_data.content_protection_type = ((sep_data_t *) data)->content_protection_type; - if (force_a2dp_codec) + if (force_a2dp_codec != CODEC_DEFAULT) sep_data.codec = force_a2dp_codec; else if (data) sep_data.codec = ((sep_data_t *) data)->codec; |