Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3159 insertions, 0 deletions

diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
new file mode 100644
index 00000000..c69aa4dd
--- /dev/null
+++ b/epan/dissectors/packet-usb-audio.c
@@ -0,0 +1,3159 @@
+/* packet-usb-audio.c
+ *
+ * usb audio dissector
+ * Tomasz Mon 2012
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/* the parsing of audio-specific descriptors is based on
+   USB Audio Device Class Specification for Basic Audio Devices, Release 1.0,
+   USB Device Class Definition for Audio Devices, Release 2.0 and
+   USB Device Class Definition for MIDI Devices, Release 1.0 */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/expert.h>
+#include <epan/reassemble.h>
+#include "packet-usb.h"
+
+/* XXX - we use the same macro for mpeg sections,
+         can we put this in a common include file? */
+#define USB_AUDIO_BCD44_TO_DEC(x)  ((((x)&0xf0) >> 4) * 10 + ((x)&0x0f))
+
+void proto_register_usb_audio(void);
+void proto_reg_handoff_usb_audio(void);
+
+/* protocols and header fields */
+static int proto_usb_audio = -1;
+static int hf_midi_cable_number = -1;
+static int hf_midi_code_index = -1;
+static int hf_midi_event = -1;
+static int hf_midi_padding = -1;
+static int hf_ac_if_desc_subtype = -1;
+static int hf_ac_if_hdr_ver = -1;
+static int hf_ac_if_hdr_total_len = -1;
+static int hf_ac_if_hdr_bInCollection = -1;
+static int hf_ac_if_hdr_if_num = -1;
+static int hf_ac_if_hdr_category = -1;
+static int hf_ac_if_hdr_controls = -1;
+static int hf_ac_if_hdr_controls_latency = -1;
+static int hf_ac_if_hdr_controls_rsv = -1;
+static int hf_ac_if_input_terminalid = -1;
+static int hf_ac_if_input_terminaltype = -1;
+static int hf_ac_if_input_assocterminal = -1;
+static int hf_ac_if_input_csourceid = -1;
+static int hf_ac_if_input_nrchannels = -1;
+static int hf_ac_if_input_wchannelconfig = -1;
+static int hf_ac_if_input_wchannelconfig_d0 = -1;
+static int hf_ac_if_input_wchannelconfig_d1 = -1;
+static int hf_ac_if_input_wchannelconfig_d2 = -1;
+static int hf_ac_if_input_wchannelconfig_d3 = -1;
+static int hf_ac_if_input_wchannelconfig_d4 = -1;
+static int hf_ac_if_input_wchannelconfig_d5 = -1;
+static int hf_ac_if_input_wchannelconfig_d6 = -1;
+static int hf_ac_if_input_wchannelconfig_d7 = -1;
+static int hf_ac_if_input_wchannelconfig_d8 = -1;
+static int hf_ac_if_input_wchannelconfig_d9 = -1;
+static int hf_ac_if_input_wchannelconfig_d10 = -1;
+static int hf_ac_if_input_wchannelconfig_d11 = -1;
+static int hf_ac_if_input_wchannelconfig_rsv = -1;
+static int hf_ac_if_input_bmchannelconfig = -1;
+static int hf_ac_if_input_bmchannelconfig_d0 = -1;
+static int hf_ac_if_input_bmchannelconfig_d1 = -1;
+static int hf_ac_if_input_bmchannelconfig_d2 = -1;
+static int hf_ac_if_input_bmchannelconfig_d3 = -1;
+static int hf_ac_if_input_bmchannelconfig_d4 = -1;
+static int hf_ac_if_input_bmchannelconfig_d5 = -1;
+static int hf_ac_if_input_bmchannelconfig_d6 = -1;
+static int hf_ac_if_input_bmchannelconfig_d7 = -1;
+static int hf_ac_if_input_bmchannelconfig_d8 = -1;
+static int hf_ac_if_input_bmchannelconfig_d9 = -1;
+static int hf_ac_if_input_bmchannelconfig_d10 = -1;
+static int hf_ac_if_input_bmchannelconfig_d11 = -1;
+static int hf_ac_if_input_bmchannelconfig_d12 = -1;
+static int hf_ac_if_input_bmchannelconfig_d13 = -1;
+static int hf_ac_if_input_bmchannelconfig_d14 = -1;
+static int hf_ac_if_input_bmchannelconfig_d15 = -1;
+static int hf_ac_if_input_bmchannelconfig_d16 = -1;
+static int hf_ac_if_input_bmchannelconfig_d17 = -1;
+static int hf_ac_if_input_bmchannelconfig_d18 = -1;
+static int hf_ac_if_input_bmchannelconfig_d19 = -1;
+static int hf_ac_if_input_bmchannelconfig_d20 = -1;
+static int hf_ac_if_input_bmchannelconfig_d21 = -1;
+static int hf_ac_if_input_bmchannelconfig_d22 = -1;
+static int hf_ac_if_input_bmchannelconfig_d23 = -1;
+static int hf_ac_if_input_bmchannelconfig_d24 = -1;
+static int hf_ac_if_input_bmchannelconfig_d25 = -1;
+static int hf_ac_if_input_bmchannelconfig_d26 = -1;
+static int hf_ac_if_input_bmchannelconfig_rsv = -1;
+static int hf_ac_if_input_bmchannelconfig_d31 = -1;
+static int hf_ac_if_input_channelnames = -1;
+static int hf_ac_if_input_controls = -1;
+static int hf_ac_if_input_controls_copy = -1;
+static int hf_ac_if_input_controls_connector = -1;
+static int hf_ac_if_input_controls_overload = -1;
+static int hf_ac_if_input_controls_cluster = -1;
+static int hf_ac_if_input_controls_underflow = -1;
+static int hf_ac_if_input_controls_overflow = -1;
+static int hf_ac_if_input_controls_rsv = -1;
+static int hf_ac_if_input_terminal = -1;
+static int hf_ac_if_output_terminalid = -1;
+static int hf_ac_if_output_terminaltype = -1;
+static int hf_ac_if_output_assocterminal = -1;
+static int hf_ac_if_output_sourceid = -1;
+static int hf_ac_if_output_clk_sourceid = -1;
+static int hf_ac_if_output_controls = -1;
+static int hf_ac_if_output_controls_copy = -1;
+static int hf_ac_if_output_controls_connector = -1;
+static int hf_ac_if_output_controls_overload = -1;
+static int hf_ac_if_output_controls_underflow = -1;
+static int hf_ac_if_output_controls_overflow = -1;
+static int hf_ac_if_output_controls_rsv = -1;
+static int hf_ac_if_output_terminal = -1;
+static int hf_ac_if_fu_unitid = -1;
+static int hf_ac_if_fu_sourceid = -1;
+static int hf_ac_if_fu_controlsize = -1;
+static int hf_ac_if_fu_controls = -1;
+static int hf_ac_if_fu_control = -1;
+static int hf_ac_if_fu_controls_d0 = -1;
+static int hf_ac_if_fu_controls_d1 = -1;
+static int hf_ac_if_fu_controls_d2 = -1;
+static int hf_ac_if_fu_controls_d3 = -1;
+static int hf_ac_if_fu_controls_d4 = -1;
+static int hf_ac_if_fu_controls_d5 = -1;
+static int hf_ac_if_fu_controls_d6 = -1;
+static int hf_ac_if_fu_controls_d7 = -1;
+static int hf_ac_if_fu_controls_d8 = -1;
+static int hf_ac_if_fu_controls_d9 = -1;
+static int hf_ac_if_fu_controls_rsv = -1;
+static int hf_ac_if_fu_controls_v2 = -1;
+static int hf_ac_if_fu_control_v2 = -1;
+static int hf_ac_if_fu_controls_v2_d0 = -1;
+static int hf_ac_if_fu_controls_v2_d1 = -1;
+static int hf_ac_if_fu_controls_v2_d2 = -1;
+static int hf_ac_if_fu_controls_v2_d3 = -1;
+static int hf_ac_if_fu_controls_v2_d4 = -1;
+static int hf_ac_if_fu_controls_v2_d5 = -1;
+static int hf_ac_if_fu_controls_v2_d6 = -1;
+static int hf_ac_if_fu_controls_v2_d7 = -1;
+static int hf_ac_if_fu_controls_v2_d8 = -1;
+static int hf_ac_if_fu_controls_v2_d9 = -1;
+static int hf_ac_if_fu_controls_v2_d10 = -1;
+static int hf_ac_if_fu_controls_v2_d11 = -1;
+static int hf_ac_if_fu_controls_v2_d12 = -1;
+static int hf_ac_if_fu_controls_v2_d13 = -1;
+static int hf_ac_if_fu_controls_v2_d14 = -1;
+static int hf_ac_if_fu_controls_v2_rsv = -1;
+static int hf_ac_if_fu_ifeature = -1;
+static int hf_ac_if_su_unitid = -1;
+static int hf_ac_if_su_nrinpins = -1;
+static int hf_ac_if_su_sourceids = -1;
+static int hf_ac_if_su_sourceid = -1;
+static int hf_ac_if_su_controls = -1;
+static int hf_ac_if_su_controls_d0 = -1;
+static int hf_ac_if_su_controls_rsv = -1;
+static int hf_ac_if_su_iselector = -1;
+static int hf_ac_if_mu_unitid = -1;
+static int hf_ac_if_mu_nrinpins = -1;
+static int hf_ac_if_mu_sourceid = -1;
+static int hf_ac_if_mu_nrchannels = -1;
+static int hf_ac_if_mu_channelconfig = -1;
+static int hf_ac_if_mu_channelconfig_d0 = -1;
+static int hf_ac_if_mu_channelconfig_d1 = -1;
+static int hf_ac_if_mu_channelconfig_d2 = -1;
+static int hf_ac_if_mu_channelconfig_d3 = -1;
+static int hf_ac_if_mu_channelconfig_d4 = -1;
+static int hf_ac_if_mu_channelconfig_d5 = -1;
+static int hf_ac_if_mu_channelconfig_d6 = -1;
+static int hf_ac_if_mu_channelconfig_d7 = -1;
+static int hf_ac_if_mu_channelconfig_d8 = -1;
+static int hf_ac_if_mu_channelconfig_d9 = -1;
+static int hf_ac_if_mu_channelconfig_d10 = -1;
+static int hf_ac_if_mu_channelconfig_d11 = -1;
+static int hf_ac_if_mu_channelconfig_rsv = -1;
+static int hf_ac_if_mu_channelnames = -1;
+static int hf_ac_if_mu_controls = -1;
+static int hf_ac_if_mu_imixer = -1;
+static int hf_ac_if_clksrc_id = -1;
+static int hf_ac_if_clksrc_attr = -1;
+static int hf_ac_if_clksrc_attr_type = -1;
+static int hf_ac_if_clksrc_attr_d2 = -1;
+static int hf_ac_if_clksrc_attr_rsv = -1;
+static int hf_ac_if_clksrc_controls = -1;
+static int hf_ac_if_clksrc_controls_freq = -1;
+static int hf_ac_if_clksrc_controls_validity = -1;
+static int hf_ac_if_clksrc_controls_rsv = -1;
+static int hf_ac_if_clksrc_assocterminal = -1;
+static int hf_ac_if_clksrc_clocksource = -1;
+static int hf_ac_if_clksel_id = -1;
+static int hf_ac_if_clksel_nrpins = -1;
+static int hf_ac_if_clksel_sourceid = -1;
+static int hf_ac_if_clksel_controls = -1;
+static int hf_ac_if_clksel_controls_clksel = -1;
+static int hf_ac_if_clksel_controls_rsv = -1;
+static int hf_ac_if_clksel_clockselector = -1;
+static int hf_as_if_desc_subtype = -1;
+static int hf_as_if_gen_term_link = -1;
+static int hf_as_if_gen_delay = -1;
+static int hf_as_if_gen_wformattag = -1;
+static int hf_as_if_gen_controls = -1;
+static int hf_as_if_gen_controls_active = -1;
+static int hf_as_if_gen_controls_valid = -1;
+static int hf_as_if_gen_controls_rsv = -1;
+static int hf_as_if_gen_formattype = -1;
+static int hf_as_if_gen_formats = -1;
+static int hf_as_if_gen_formats_i_d0 = -1;
+static int hf_as_if_gen_formats_i_d1 = -1;
+static int hf_as_if_gen_formats_i_d2 = -1;
+static int hf_as_if_gen_formats_i_d3 = -1;
+static int hf_as_if_gen_formats_i_d4 = -1;
+static int hf_as_if_gen_formats_i_rsv = -1;
+static int hf_as_if_gen_formats_i_d31 = -1;
+static int hf_as_if_gen_formats_ii_d0 = -1;
+static int hf_as_if_gen_formats_ii_d1 = -1;
+static int hf_as_if_gen_formats_ii_d2 = -1;
+static int hf_as_if_gen_formats_ii_d3 = -1;
+static int hf_as_if_gen_formats_ii_rsv = -1;
+static int hf_as_if_gen_formats_ii_d31 = -1;
+static int hf_as_if_gen_formats_iii_d0 = -1;
+static int hf_as_if_gen_formats_iii_d1 = -1;
+static int hf_as_if_gen_formats_iii_d2 = -1;
+static int hf_as_if_gen_formats_iii_d3 = -1;
+static int hf_as_if_gen_formats_iii_d4 = -1;
+static int hf_as_if_gen_formats_iii_d5 = -1;
+static int hf_as_if_gen_formats_iii_d6 = -1;
+static int hf_as_if_gen_formats_iii_d7 = -1;
+static int hf_as_if_gen_formats_iii_d8 = -1;
+static int hf_as_if_gen_formats_iii_d9 = -1;
+static int hf_as_if_gen_formats_iii_d10 = -1;
+static int hf_as_if_gen_formats_iii_d11 = -1;
+static int hf_as_if_gen_formats_iii_d12 = -1;
+static int hf_as_if_gen_formats_iii_rsv = -1;
+static int hf_as_if_gen_formats_iv_d0 = -1;
+static int hf_as_if_gen_formats_iv_d1 = -1;
+static int hf_as_if_gen_formats_iv_d2 = -1;
+static int hf_as_if_gen_formats_iv_d3 = -1;
+static int hf_as_if_gen_formats_iv_d4 = -1;
+static int hf_as_if_gen_formats_iv_d5 = -1;
+static int hf_as_if_gen_formats_iv_d6 = -1;
+static int hf_as_if_gen_formats_iv_d7 = -1;
+static int hf_as_if_gen_formats_iv_d8 = -1;
+static int hf_as_if_gen_formats_iv_d9 = -1;
+static int hf_as_if_gen_formats_iv_d10 = -1;
+static int hf_as_if_gen_formats_iv_d11 = -1;
+static int hf_as_if_gen_formats_iv_d12 = -1;
+static int hf_as_if_gen_formats_iv_d13 = -1;
+static int hf_as_if_gen_formats_iv_d14 = -1;
+static int hf_as_if_gen_formats_iv_d15 = -1;
+static int hf_as_if_gen_formats_iv_d16 = -1;
+static int hf_as_if_gen_formats_iv_d17 = -1;
+static int hf_as_if_gen_formats_iv_d18 = -1;
+static int hf_as_if_gen_formats_iv_d19 = -1;
+static int hf_as_if_gen_formats_iv_d20 = -1;
+static int hf_as_if_gen_formats_iv_d21 = -1;
+static int hf_as_if_gen_formats_iv_rsv = -1;
+static int hf_as_if_gen_nrchannels = -1;
+static int hf_as_if_gen_bmchannelconfig = -1;
+static int hf_as_if_gen_bmchannelconfig_d0 = -1;
+static int hf_as_if_gen_bmchannelconfig_d1 = -1;
+static int hf_as_if_gen_bmchannelconfig_d2 = -1;
+static int hf_as_if_gen_bmchannelconfig_d3 = -1;
+static int hf_as_if_gen_bmchannelconfig_d4 = -1;
+static int hf_as_if_gen_bmchannelconfig_d5 = -1;
+static int hf_as_if_gen_bmchannelconfig_d6 = -1;
+static int hf_as_if_gen_bmchannelconfig_d7 = -1;
+static int hf_as_if_gen_bmchannelconfig_d8 = -1;
+static int hf_as_if_gen_bmchannelconfig_d9 = -1;
+static int hf_as_if_gen_bmchannelconfig_d10 = -1;
+static int hf_as_if_gen_bmchannelconfig_d11 = -1;
+static int hf_as_if_gen_bmchannelconfig_d12 = -1;
+static int hf_as_if_gen_bmchannelconfig_d13 = -1;
+static int hf_as_if_gen_bmchannelconfig_d14 = -1;
+static int hf_as_if_gen_bmchannelconfig_d15 = -1;
+static int hf_as_if_gen_bmchannelconfig_d16 = -1;
+static int hf_as_if_gen_bmchannelconfig_d17 = -1;
+static int hf_as_if_gen_bmchannelconfig_d18 = -1;
+static int hf_as_if_gen_bmchannelconfig_d19 = -1;
+static int hf_as_if_gen_bmchannelconfig_d20 = -1;
+static int hf_as_if_gen_bmchannelconfig_d21 = -1;
+static int hf_as_if_gen_bmchannelconfig_d22 = -1;
+static int hf_as_if_gen_bmchannelconfig_d23 = -1;
+static int hf_as_if_gen_bmchannelconfig_d24 = -1;
+static int hf_as_if_gen_bmchannelconfig_d25 = -1;
+static int hf_as_if_gen_bmchannelconfig_d26 = -1;
+static int hf_as_if_gen_bmchannelconfig_rsv = -1;
+static int hf_as_if_gen_bmchannelconfig_d31 = -1;
+static int hf_as_if_gen_channelnames = -1;
+static int hf_as_if_ft_formattype = -1;
+static int hf_as_if_ft_maxbitrate = -1;
+static int hf_as_if_ft_nrchannels = -1;
+static int hf_as_if_ft_subframesize = -1;
+static int hf_as_if_ft_subslotsize = -1;
+static int hf_as_if_ft_bitresolution = -1;
+static int hf_as_if_ft_samplesperframe = -1;
+static int hf_as_if_ft_samfreqtype = -1;
+static int hf_as_if_ft_lowersamfreq = -1;
+static int hf_as_if_ft_uppersamfreq = -1;
+static int hf_as_if_ft_samfreq = -1;
+static int hf_as_ep_desc_subtype = -1;
+static int hf_as_ep_gen_bmattributes = -1;
+static int hf_as_ep_gen_bmattributes_d0 = -1;
+static int hf_as_ep_gen_bmattributes_d1 = -1;
+static int hf_as_ep_gen_bmattributes_rsv = -1;
+static int hf_as_ep_gen_bmattributes_d7 = -1;
+static int hf_as_ep_gen_controls = -1;
+static int hf_as_ep_gen_controls_pitch = -1;
+static int hf_as_ep_gen_controls_data_overrun = -1;
+static int hf_as_ep_gen_controls_data_underrun = -1;
+static int hf_as_ep_gen_controls_rsv = -1;
+static int hf_as_ep_gen_lockdelayunits = -1;
+static int hf_as_ep_gen_lockdelay = -1;
+static int hf_ms_if_desc_subtype = -1;
+static int hf_ms_if_hdr_ver = -1;
+static int hf_ms_if_hdr_total_len = -1;
+static int hf_ms_if_midi_in_bjacktype = -1;
+static int hf_ms_if_midi_in_bjackid = -1;
+static int hf_ms_if_midi_in_ijack = -1;
+static int hf_ms_if_midi_out_bjacktype = -1;
+static int hf_ms_if_midi_out_bjackid = -1;
+static int hf_ms_if_midi_out_bnrinputpins = -1;
+static int hf_ms_if_midi_out_basourceid = -1;
+static int hf_ms_if_midi_out_basourcepin = -1;
+static int hf_ms_if_midi_out_ijack = -1;
+static int hf_ms_ep_gen_numjacks = -1;
+static int hf_ms_ep_gen_baassocjackid = -1;
+static int hf_ms_ep_desc_subtype = -1;
+
+static reassembly_table midi_data_reassembly_table;
+
+static gint ett_usb_audio      = -1;
+static gint ett_usb_audio_desc = -1;
+
+static gint ett_ac_if_hdr_controls = -1;
+static gint ett_ac_if_fu_controls = -1;
+static gint ett_ac_if_fu_controls0 = -1;
+static gint ett_ac_if_fu_controls1 = -1;
+static gint ett_ac_if_fu_controls_v2 = -1;
+static gint ett_ac_if_fu_control_v2 = -1;
+static gint ett_ac_if_su_sourceids = -1;
+static gint ett_ac_if_su_controls = -1;
+static gint ett_ac_if_input_wchannelconfig = -1;
+static gint ett_ac_if_input_bmchannelconfig = -1;
+static gint ett_ac_if_input_controls = -1;
+static gint ett_ac_if_output_controls = -1;
+static gint ett_ac_if_mu_channelconfig = -1;
+static gint ett_ac_if_clksrc_attr = -1;
+static gint ett_ac_if_clksrc_controls = -1;
+static gint ett_ac_if_clksel_controls = -1;
+static gint ett_as_if_gen_controls = -1;
+static gint ett_as_if_gen_formats = -1;
+static gint ett_as_if_gen_bmchannelconfig = -1;
+static gint ett_as_ep_gen_attributes = -1;
+static gint ett_as_ep_gen_controls = -1;
+
+static dissector_handle_t sysex_handle;
+static dissector_handle_t usb_audio_bulk_handle;
+static dissector_handle_t usb_audio_descr_handle;
+
+
+#define AUDIO_IF_SUBCLASS_UNDEFINED        0x00
+#define AUDIO_IF_SUBCLASS_AUDIOCONTROL     0x01
+#define AUDIO_IF_SUBCLASS_AUDIOSTREAMING   0x02
+#define AUDIO_IF_SUBCLASS_MIDISTREAMING    0x03
+
+static const value_string usb_audio_subclass_vals[] = {
+    {AUDIO_IF_SUBCLASS_UNDEFINED,      "Undefined"},
+    {AUDIO_IF_SUBCLASS_AUDIOCONTROL,   "Audio Control"},
+    {AUDIO_IF_SUBCLASS_AUDIOSTREAMING, "Audio Streaming"},
+    {AUDIO_IF_SUBCLASS_MIDISTREAMING,  "MIDI Streaming"},
+    {0,NULL}
+};
+value_string_ext ext_usb_audio_subclass_vals =
+    VALUE_STRING_EXT_INIT(usb_audio_subclass_vals);
+
+static const value_string code_index_vals[] = {
+    { 0x0, "Miscellaneous (Reserved)" },
+    { 0x1, "Cable events (Reserved)" },
+    { 0x2, "Two-byte System Common message" },
+    { 0x3, "Three-byte System Common message" },
+    { 0x4, "SysEx starts or continues" },
+    { 0x5, "SysEx ends with following single byte/Single-byte System Common Message" },
+    { 0x6, "SysEx ends with following two bytes" },
+    { 0x7, "SysEx ends with following three bytes" },
+    { 0x8, "Note-off" },
+    { 0x9, "Note-on" },
+    { 0xA, "Poly-KeyPress" },
+    { 0xB, "Control Change" },
+    { 0xC, "Program Change" },
+    { 0xD, "Channel Pressure" },
+    { 0xE, "PitchBend Change" },
+    { 0xF, "Single Byte" },
+    { 0, NULL }
+};
+
+/* USB audio specification, section A.8 */
+#define CS_INTERFACE       0x24
+#define CS_ENDPOINT        0x25
+
+static const value_string aud_descriptor_type_vals[] = {
+        {CS_INTERFACE, "audio class interface"},
+        {CS_ENDPOINT,  "audio class endpoint"},
+        {0,NULL}
+};
+static value_string_ext aud_descriptor_type_vals_ext =
+    VALUE_STRING_EXT_INIT(aud_descriptor_type_vals);
+
+#define AC_SUBTYPE_HEADER                0x01
+#define AC_SUBTYPE_INPUT_TERMINAL        0x02
+#define AC_SUBTYPE_OUTPUT_TERMINAL       0x03
+#define AC_SUBTYPE_MIXER_UNIT            0x04
+#define AC_SUBTYPE_SELECTOR_UNIT         0x05
+#define AC_SUBTYPE_FEATURE_UNIT          0x06
+#define AC_SUBTYPE_EFFECT_UNIT           0x07
+#define AC_SUBTYPE_PROCESSING_UNIT       0x08
+#define AC_SUBTYPE_EXTENSION_UNIT        0x09
+#define AC_SUBTYPE_CLOCK_SOURCE          0x0A
+#define AC_SUBTYPE_CLOCK_SELECTOR        0x0B
+#define AC_SUBTYPE_CLOCK_MULTIPLIER      0x0C
+#define AC_SUBTYPE_SAMPLE_RATE_CONVERTER 0x0D
+
+static const value_string ac_subtype_vals[] = {
+    {AC_SUBTYPE_HEADER,                "Header Descriptor"},
+    {AC_SUBTYPE_INPUT_TERMINAL,        "Input terminal descriptor"},
+    {AC_SUBTYPE_OUTPUT_TERMINAL,       "Output terminal descriptor"},
+    {AC_SUBTYPE_MIXER_UNIT,            "Mixer unit descriptor"},
+    {AC_SUBTYPE_SELECTOR_UNIT,         "Selector unit descriptor"},
+    {AC_SUBTYPE_FEATURE_UNIT,          "Feature unit descriptor"},
+    {AC_SUBTYPE_EFFECT_UNIT,           "Effect unit descriptor"},
+    {AC_SUBTYPE_PROCESSING_UNIT,       "Processing unit descriptor"},
+    {AC_SUBTYPE_EXTENSION_UNIT,        "Extension unit descriptor"},
+    {AC_SUBTYPE_CLOCK_SOURCE,          "Clock source descriptor"},
+    {AC_SUBTYPE_CLOCK_SELECTOR,        "Clock selector descriptor"},
+    {AC_SUBTYPE_CLOCK_MULTIPLIER,      "Clock multiplier descriptor"},
+    {AC_SUBTYPE_SAMPLE_RATE_CONVERTER, "Sample rate converter descriptor"},
+    {0,NULL}
+};
+static value_string_ext ac_subtype_vals_ext =
+    VALUE_STRING_EXT_INIT(ac_subtype_vals);
+
+#define AS_SUBTYPE_GENERAL         0x01
+#define AS_SUBTYPE_FORMAT_TYPE     0x02
+#define AS_SUBTYPE_ENCODER         0x03
+
+static const value_string as_subtype_vals[] = {
+    {AS_SUBTYPE_GENERAL,     "General AS Descriptor"},
+    {AS_SUBTYPE_FORMAT_TYPE, "Format type descriptor"},
+    {AS_SUBTYPE_ENCODER,     "Encoder descriptor"},
+    {0,NULL}
+};
+static value_string_ext as_subtype_vals_ext =
+    VALUE_STRING_EXT_INIT(as_subtype_vals);
+
+#define AS_EP_SUBTYPE_GENERAL       0x01
+static const value_string as_ep_subtype_vals[] = {
+    {AS_EP_SUBTYPE_GENERAL,       "General Descriptor"},
+    {0,NULL}
+};
+
+#define MS_IF_SUBTYPE_HEADER        0x01
+#define MS_IF_SUBTYPE_MIDI_IN_JACK  0x02
+#define MS_IF_SUBTYPE_MIDI_OUT_JACK 0x03
+#define MS_IF_SUBTYPE_ELEMENT       0x04
+static const value_string ms_if_subtype_vals[] = {
+    {MS_IF_SUBTYPE_HEADER,        "Header Descriptor"},
+    {MS_IF_SUBTYPE_MIDI_IN_JACK,  "MIDI IN Jack descriptor"},
+    {MS_IF_SUBTYPE_MIDI_OUT_JACK, "MIDI OUT Jack descriptor"},
+    {MS_IF_SUBTYPE_ELEMENT,       "MIDI Element descriptor"},
+    {0,NULL}
+};
+static value_string_ext ms_if_subtype_vals_ext =
+    VALUE_STRING_EXT_INIT(ms_if_subtype_vals);
+
+#define MS_MIDI_JACK_TYPE_EMBEDDED  0x01
+#define MS_MIDI_JACK_TYPE_EXTERNAL  0x02
+static const value_string ms_midi_jack_type_vals[] = {
+    {MS_MIDI_JACK_TYPE_EMBEDDED, "Embedded"},
+    {MS_MIDI_JACK_TYPE_EXTERNAL, "External"},
+    {0,NULL}
+};
+
+#define MS_EP_SUBTYPE_GENERAL       0x01
+static const value_string ms_ep_subtype_vals[] = {
+    {MS_EP_SUBTYPE_GENERAL,       "General Descriptor"},
+    {0,NULL}
+};
+
+/* Table A-7: Audio Function Category Codes */
+static const value_string audio_function_categories_vals[] = {
+    {0x00, "Undefined"},
+    {0x01, "Desktop speaker"},
+    {0x02, "Home theater"},
+    {0x03, "Microphone"},
+    {0x04, "Headset"},
+    {0x05, "Telephone"},
+    {0x06, "Converter"},
+    {0x07, "Voice/Sound recorder"},
+    {0x08, "I/O box"},
+    {0x09, "Musical instrument"},
+    {0x0A, "Pro-audio"},
+    {0x0B, "Audio/Video"},
+    {0x0C, "Control panel"},
+    {0xFF, "Other"},
+    {0,NULL}
+};
+static value_string_ext audio_function_categories_vals_ext =
+    VALUE_STRING_EXT_INIT(audio_function_categories_vals);
+
+/* Described in 4.7.2 Class-Specific AC Interface Descriptor */
+static const value_string controls_capabilities_vals[] = {
+    {0x00, "Not present"},
+    {0x01, "Present, read-only"},
+    {0x02, "Value not allowed"},
+    {0x03, "Host programmable"},
+    {0,NULL}
+};
+static value_string_ext controls_capabilities_vals_ext =
+    VALUE_STRING_EXT_INIT(controls_capabilities_vals);
+
+/* Described in 4.9.2 Class-Specific AS Interface Descriptor */
+static const value_string controls_capabilities_read_only_vals[] = {
+    {0x00, "Not present"},
+    {0x01, "Present, read-only"},
+    {0x02, "Value not allowed"},
+    {0x03, "Value not allowed"},
+    {0,NULL}
+};
+static value_string_ext controls_capabilities_read_only_vals_ext =
+    VALUE_STRING_EXT_INIT(controls_capabilities_read_only_vals);
+
+/* Described in 4.7.2.1 Clock Source Descriptor */
+static const value_string clock_types_vals[] = {
+    {0x00, "External clock"},
+    {0x01, "Internal fixed clock"},
+    {0x02, "Internal variable clock"},
+    {0x03, "Internal programmable clock"},
+    {0,NULL}
+};
+
+static const value_string clock_sync_vals[] = {
+    {0x00, "Free running"},
+    {0x01, "Synchronized to the Start of Frame"},
+    {0,NULL}
+};
+
+static const value_string lock_delay_unit_vals[] = {
+    {0, "Undefined"},
+    {1, "Milliseconds"},
+    {2, "Decoded PCM samples"},
+    {0,NULL}
+};
+
+/* From https://www.usb.org/sites/default/files/termt10.pdf */
+static const value_string terminal_types_vals[] = {
+    /* USB Terminal Types */
+    {0x0100, "USB Undefined"},
+    {0x0101, "USB Streaming"},
+    {0x01FF, "USB vendor specific"},
+    /* Input Terminal Tyoes */
+    {0x0200, "Input Undefined"},
+    {0x0201, "Microphone"},
+    {0x0202, "Desktop Microphone"},
+    {0x0203, "Personal microphone"},
+    {0x0204, "Omni-directional microphone"},
+    {0x0205, "Microphone array"},
+    {0x0206, "Processing microphone array"},
+    {0x0300, "Output Undefined"},
+    {0x0301, "Speaker"},
+    {0x0302, "Headphones"},
+    {0x0303, "Head Mounted Display Audio"},
+    {0x0304, "Desktop speaker"},
+    {0x0305, "Room speaker"},
+    {0x0306, "Communication speaker"},
+    {0x0307, "Low frequency effects speaker"},
+    /* Bi-directional Terminal Types */
+    {0x0400, "Bi-directional Undefined"},
+    {0x0401, "Handset"},
+    {0x0402, "Headset"},
+    {0x0403, "Speakerphone, no echoreduction"},
+    {0x0404, "Echo-suppressing speakerphone"},
+    {0x0405, "Echo-canceling speakerphone"},
+    /* Telephony Terminal Types */
+    {0x0500, "Telephony Undefined"},
+    {0x0501, "Phone line"},
+    {0x0502, "Telephone"},
+    {0x0503, "Down Line Pone"},
+    /* External Terminal Types */
+    {0x0600, "External Undefined"},
+    {0x0601, "Analog connector"},
+    {0x0602, "Digital audio interface"},
+    {0x0603, "Line connector"},
+    {0x0604, "Legacy audio connector"},
+    {0x0605, "S/PDIF interface"},
+    {0x0606, "1394 DA stream"},
+    {0x0607, "1394 DV stream soundtrack"},
+    /* Embedded Function Terminal Types */
+    {0x0700, "Embedded Undefined"},
+    {0x0701, "Level Calibration Noise Source"},
+    {0x0702, "Equalization Noise"},
+    {0x0703, "CD player"},
+    {0x0704, "DAT"},
+    {0x0705, "DCC"},
+    {0x0706, "MiniDisk"},
+    {0x0707, "Analog Tape"},
+    {0x0708, "Phonograph"},
+    {0x0709, "VCR Audio"},
+    {0x070A, "Video Disc Audio"},
+    {0x070B, "DVD Audio"},
+    {0x070C, "TV Tuner Audio"},
+    {0x070D, "Satellite Receiver Audio"},
+    {0x070E, "Cable Tuner Audio"},
+    {0x070F, "DSS Audio"},
+    {0x0710, "Radio Receiver"},
+    {0x0711, "Radio Transmitter"},
+    {0x0712, "Multi-track Recorder"},
+    {0x0713, "Synthesizer"},
+    {0,NULL}
+};
+static value_string_ext terminal_types_vals_ext =
+    VALUE_STRING_EXT_INIT(terminal_types_vals);
+
+/* From https://usb.org/sites/default/files/frmts10.pdf */
+static const value_string audio_data_format_tag_vals[] = {
+    /* Audio Data Format Type I Codes */
+    {0x0000, "Type I Undefined"},
+    {0x0001, "PCM"},
+    {0x0002, "PCM8"},
+    {0x0003, "IEEE Float"},
+    {0x0004, "ALAW"},
+    {0x0005, "MULAW"},
+    /* Audio Data Format Type II Codes */
+    {0x1000, "Type II Undefined"},
+    {0x1001, "MPEG"},
+    {0x1002, "AC-3"},
+    /* Audio Data Format Type III Codes */
+    {0x2000, "Type III Undefined"},
+    {0x2001, "IEC1937 AC-3"},
+    {0x2002, "IEC1937 MPEG-1 Layer1"},
+    {0x2003, "IEC1937 MPEG-1 Layer2/3 or IEC1937 MPEG-2 NOEXT"},
+    {0x2004, "IEC1937 MPEG-2 EXT"},
+    {0x2005, "IEC1937 MPEG-2 Layer1 LS"},
+    {0x2006, "IEC1937 MPEG-2 Layer2/3 LS"},
+    {0,NULL}
+};
+static value_string_ext audio_data_format_tag_vals_ext =
+    VALUE_STRING_EXT_INIT(audio_data_format_tag_vals);
+
+typedef struct _audio_conv_info_t {
+    /* the major version of the USB audio class specification,
+       taken from the AC header descriptor */
+    guint8 audio_ver_major;
+    /* the major version of the USB Device Class Definition for
+       MIDI Devices, taken from the MS header descriptor */
+    guint8 midi_ver_major;
+} audio_conv_info_t;
+
+static int hf_sysex_msg_fragments = -1;
+static int hf_sysex_msg_fragment = -1;
+static int hf_sysex_msg_fragment_overlap = -1;
+static int hf_sysex_msg_fragment_overlap_conflicts = -1;
+static int hf_sysex_msg_fragment_multiple_tails = -1;
+static int hf_sysex_msg_fragment_too_long_fragment = -1;
+static int hf_sysex_msg_fragment_error = -1;
+static int hf_sysex_msg_fragment_count = -1;
+static int hf_sysex_msg_reassembled_in = -1;
+static int hf_sysex_msg_reassembled_length = -1;
+static int hf_sysex_msg_reassembled_data = -1;
+
+static gint ett_sysex_msg_fragment = -1;
+static gint ett_sysex_msg_fragments = -1;
+
+static expert_field ei_usb_audio_undecoded = EI_INIT;
+static expert_field ei_usb_audio_invalid_feature_unit_length = EI_INIT;
+static expert_field ei_usb_audio_invalid_type_3_ft_nrchannels = EI_INIT;
+static expert_field ei_usb_audio_invalid_type_3_ft_subframesize = EI_INIT;
+static expert_field ei_usb_audio_invalid_type_3_ft_bitresolution = EI_INIT;
+
+static const fragment_items sysex_msg_frag_items = {
+    /* Fragment subtrees */
+    &ett_sysex_msg_fragment,
+    &ett_sysex_msg_fragments,
+    /* Fragment fields */
+    &hf_sysex_msg_fragments,
+    &hf_sysex_msg_fragment,
+    &hf_sysex_msg_fragment_overlap,
+    &hf_sysex_msg_fragment_overlap_conflicts,
+    &hf_sysex_msg_fragment_multiple_tails,
+    &hf_sysex_msg_fragment_too_long_fragment,
+    &hf_sysex_msg_fragment_error,
+    &hf_sysex_msg_fragment_count,
+    /* Reassembled in field */
+    &hf_sysex_msg_reassembled_in,
+    /* Reassembled length field */
+    &hf_sysex_msg_reassembled_length,
+    &hf_sysex_msg_reassembled_data,
+    /* Tag */
+    "Message fragments"
+};
+
+static gint
+get_midi_event_size(guint8 code)
+{
+    switch (code)
+    {
+        case 0x0: /* Miscellaneous function codes. Reserved for future extensions. */
+        case 0x1: /* Cable events. Reserved for future expansion. */
+            /* The Event size can be 1, 2 or 3 bytes. Assume 3. */
+            return 3;
+        case 0x5: /* Single-byte System Common Message or SysEx ends with following single byte. */
+        case 0xF: /* Single Byte */
+            return 1;
+        case 0x2: /* 2 Two-byte System Common messages like MTC, SongSelect, etc. */
+        case 0x6: /* SysEx ends with following two bytes. */
+        case 0xC: /* Program Change */
+        case 0xD: /* Channel Pressure */
+            return 2;
+        case 0x3: /* Three-byte System Common messages like SPP, etc. */
+        case 0x4: /* SysEx starts or continues */
+        case 0x7: /* SysEx ends with following three bytes. */
+        case 0x8: /* Note-off */
+        case 0x9: /* Note-on */
+        case 0xA: /* Poly-KeyPress */
+        case 0xB: /* Control Change */
+        case 0xE: /* PitchBend Change */
+            return 3;
+        default:
+            /* Invalid Code Index Number */
+            return 0;
+    }
+}
+
+static inline gboolean
+is_sysex_code(guint8 code)
+{
+    return (code == 0x04 || code == 0x05 || code == 0x06 || code == 0x07);
+}
+
+static gboolean
+is_last_sysex_packet_in_tvb(tvbuff_t *tvb, gint offset)
+{
+    gboolean last   = TRUE;
+    gint     length = tvb_reported_length(tvb);
+
+    offset += 4;
+    while (offset < length)
+    {
+        guint8 code = tvb_get_guint8(tvb, offset);
+        code &= 0x0F;
+
+        if (is_sysex_code(code))
+        {
+            last = FALSE;
+            break;
+        }
+
+        offset += 4;
+    }
+
+    return last;
+}
+
+static void
+dissect_usb_midi_event(tvbuff_t *tvb, packet_info *pinfo,
+                       proto_tree *parent_tree,
+                       gint offset)
+{
+    guint8      code;
+    guint8      cable;
+    gboolean    save_fragmented;
+    proto_tree *tree = NULL;
+
+    code = tvb_get_guint8(tvb, offset);
+    cable = (code & 0xF0) >> 4;
+    code &= 0x0F;
+
+    if (parent_tree)
+    {
+        proto_item *ti;
+        gint event_size, padding_size;
+
+        ti = proto_tree_add_protocol_format(parent_tree, proto_usb_audio, tvb, offset, 4, "USB Midi Event Packet: %s",
+                 try_val_to_str(code, code_index_vals));
+        tree = proto_item_add_subtree(ti, ett_usb_audio);
+        proto_tree_add_item(tree, hf_midi_cable_number, tvb, offset, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(tree, hf_midi_code_index, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+        event_size = get_midi_event_size(code);
+        padding_size = 3 - event_size;
+        if (event_size > 0)
+        {
+            /* TODO: Create MIDI dissector and pass the event data to it */
+            const guint8 *event_data = tvb_get_ptr(tvb, offset+1, event_size);
+            proto_tree_add_bytes(tree, hf_midi_event, tvb, offset+1, event_size, event_data);
+        }
+        if (padding_size > 0)
+        {
+            const guint8 *padding = tvb_get_ptr(tvb, offset+1+event_size, padding_size);
+            proto_tree_add_bytes(tree, hf_midi_padding, tvb, offset+1+event_size, padding_size, padding);
+        }
+    }
+
+    save_fragmented = pinfo->fragmented;
+
+    /* Reassemble SysEx commands */
+    if (is_sysex_code(code))
+    {
+        tvbuff_t* new_tvb = NULL;
+        fragment_head *frag_sysex_msg = NULL;
+
+        pinfo->fragmented = TRUE;
+
+        if (code == 0x04)
+        {
+            frag_sysex_msg = fragment_add_seq_next(&midi_data_reassembly_table,
+                tvb, offset+1,
+                pinfo,
+                cable, /* ID for fragments belonging together */
+                NULL,
+                3,
+                TRUE);
+        }
+        else
+        {
+            frag_sysex_msg = fragment_add_seq_next(&midi_data_reassembly_table,
+                tvb, offset+1,
+                pinfo,
+                cable, /* ID for fragments belonging together */
+                NULL,
+                (gint)(code - 4),
+                FALSE);
+        }
+
+        if (is_last_sysex_packet_in_tvb(tvb, offset))
+        {
+            new_tvb = process_reassembled_data(tvb, offset+1, pinfo,
+                "Reassembled Message", frag_sysex_msg, &sysex_msg_frag_items,
+                NULL, tree);
+
+            if (code != 0x04) { /* Reassembled */
+                col_append_str(pinfo->cinfo, COL_INFO,
+                        " (SysEx Reassembled)");
+            } else { /* Not last packet of reassembled Short Message */
+                col_append_str(pinfo->cinfo, COL_INFO,
+                        " (SysEx fragment)");
+            }
+
+            if (new_tvb)
+            {
+                call_dissector(sysex_handle, new_tvb, pinfo, parent_tree);
+            }
+        }
+    }
+
+    pinfo->fragmented = save_fragmented;
+}
+
+static audio_conv_info_t*
+allocate_audio_conv_info(void)
+{
+    audio_conv_info_t *info = wmem_new(wmem_file_scope(), audio_conv_info_t);
+    info->audio_ver_major = 0;
+    info->midi_ver_major = 0;
+    return info;
+}
+
+/* dissect the body of an AC interface header descriptor
+   return the number of bytes dissected (which may be smaller than the
+   body's length) */
+static gint
+dissect_ac_if_hdr_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    gint     offset_start;
+    guint16  bcdADC;
+    guint8   ver_major;
+    double   ver;
+    guint8   if_in_collection, i;
+    audio_conv_info_t *audio_conv_info;
+
+    static int * const bm_controls[] = {
+        &hf_ac_if_hdr_controls_latency,
+        &hf_ac_if_hdr_controls_rsv,
+        NULL
+    };
+
+    offset_start = offset;
+
+    bcdADC = tvb_get_letohs(tvb, offset);
+    ver_major = USB_AUDIO_BCD44_TO_DEC(bcdADC>>8);
+    ver = ver_major + USB_AUDIO_BCD44_TO_DEC(bcdADC&0xFF) / 100.0;
+
+    proto_tree_add_double_format_value(tree, hf_ac_if_hdr_ver,
+            tvb, offset, 2, ver, "%2.2f", ver);
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if(!audio_conv_info) {
+        audio_conv_info = allocate_audio_conv_info();
+        usb_conv_info->class_data = audio_conv_info;
+        usb_conv_info->class_data_type = USB_CONV_AUDIO;
+        /* XXX - set reasonable default values for all components
+           that are not filled in by this function */
+    } else if (usb_conv_info->class_data_type != USB_CONV_AUDIO) {
+        /* Don't dissect if another USB type is in the conversation */
+        return 0;
+    }
+    audio_conv_info->audio_ver_major = ver_major;
+    offset += 2;
+
+    /* version 1 refers to the Basic Audio Device specification,
+       version 2 is the Audio Device class specification, see above */
+    if (ver_major==1) {
+        proto_tree_add_item(tree, hf_ac_if_hdr_total_len,
+                tvb, offset, 2, ENC_LITTLE_ENDIAN);
+        offset += 2;
+        if_in_collection = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(tree, hf_ac_if_hdr_bInCollection,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        for (i=0; i<if_in_collection; i++) {
+            proto_tree_add_item(tree, hf_ac_if_hdr_if_num,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            offset++;
+        }
+    }
+    else if (ver_major==2) {
+        proto_tree_add_item(tree, hf_ac_if_hdr_category,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_item(tree, hf_ac_if_hdr_total_len,
+                tvb, offset, 2, ENC_LITTLE_ENDIAN);
+        offset += 2;
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_hdr_controls,
+                ett_ac_if_hdr_controls, bm_controls, ENC_LITTLE_ENDIAN);
+        offset++;
+    }
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ac_if_input_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint               offset_start;
+
+    static int * const input_wchannelconfig[] = {
+        &hf_ac_if_input_wchannelconfig_d0,
+        &hf_ac_if_input_wchannelconfig_d1,
+        &hf_ac_if_input_wchannelconfig_d2,
+        &hf_ac_if_input_wchannelconfig_d3,
+        &hf_ac_if_input_wchannelconfig_d4,
+        &hf_ac_if_input_wchannelconfig_d5,
+        &hf_ac_if_input_wchannelconfig_d6,
+        &hf_ac_if_input_wchannelconfig_d7,
+        &hf_ac_if_input_wchannelconfig_d8,
+        &hf_ac_if_input_wchannelconfig_d9,
+        &hf_ac_if_input_wchannelconfig_d10,
+        &hf_ac_if_input_wchannelconfig_d11,
+        &hf_ac_if_input_wchannelconfig_rsv,
+        NULL
+    };
+
+    static int * const input_bmchannelconfig[] = {
+        &hf_ac_if_input_bmchannelconfig_d0,
+        &hf_ac_if_input_bmchannelconfig_d1,
+        &hf_ac_if_input_bmchannelconfig_d2,
+        &hf_ac_if_input_bmchannelconfig_d3,
+        &hf_ac_if_input_bmchannelconfig_d4,
+        &hf_ac_if_input_bmchannelconfig_d5,
+        &hf_ac_if_input_bmchannelconfig_d6,
+        &hf_ac_if_input_bmchannelconfig_d7,
+        &hf_ac_if_input_bmchannelconfig_d8,
+        &hf_ac_if_input_bmchannelconfig_d9,
+        &hf_ac_if_input_bmchannelconfig_d10,
+        &hf_ac_if_input_bmchannelconfig_d11,
+        &hf_ac_if_input_bmchannelconfig_d12,
+        &hf_ac_if_input_bmchannelconfig_d13,
+        &hf_ac_if_input_bmchannelconfig_d14,
+        &hf_ac_if_input_bmchannelconfig_d15,
+        &hf_ac_if_input_bmchannelconfig_d16,
+        &hf_ac_if_input_bmchannelconfig_d17,
+        &hf_ac_if_input_bmchannelconfig_d18,
+        &hf_ac_if_input_bmchannelconfig_d19,
+        &hf_ac_if_input_bmchannelconfig_d20,
+        &hf_ac_if_input_bmchannelconfig_d21,
+        &hf_ac_if_input_bmchannelconfig_d22,
+        &hf_ac_if_input_bmchannelconfig_d23,
+        &hf_ac_if_input_bmchannelconfig_d24,
+        &hf_ac_if_input_bmchannelconfig_d25,
+        &hf_ac_if_input_bmchannelconfig_d26,
+        &hf_ac_if_input_bmchannelconfig_rsv,
+        &hf_ac_if_input_bmchannelconfig_d31,
+        NULL
+    };
+
+    static int * const controls[] = {
+        &hf_ac_if_input_controls_copy,
+        &hf_ac_if_input_controls_connector,
+        &hf_ac_if_input_controls_overload,
+        &hf_ac_if_input_controls_cluster,
+        &hf_ac_if_input_controls_underflow,
+        &hf_ac_if_input_controls_overflow,
+        &hf_ac_if_input_controls_rsv,
+        NULL
+    };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    /* do not try to dissect unknown versions */
+    if (!((audio_conv_info->audio_ver_major==1) || (audio_conv_info->audio_ver_major==2)))
+        return 0;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_input_terminalid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_input_terminaltype, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    proto_tree_add_item(tree, hf_ac_if_input_assocterminal, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    if (audio_conv_info->audio_ver_major == 2) {
+        proto_tree_add_item(tree, hf_ac_if_input_csourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_input_nrchannels, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    if (audio_conv_info->audio_ver_major==1) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_input_wchannelconfig, ett_ac_if_input_wchannelconfig, input_wchannelconfig, ENC_LITTLE_ENDIAN);
+        offset += 2;
+    } else if (audio_conv_info->audio_ver_major==2) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_input_bmchannelconfig, ett_ac_if_input_bmchannelconfig, input_bmchannelconfig, ENC_LITTLE_ENDIAN);
+        offset += 4;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_input_channelnames, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    if (audio_conv_info->audio_ver_major==2) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_input_controls, ett_ac_if_input_controls, controls, ENC_LITTLE_ENDIAN);
+        offset += 2;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_input_terminal, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ac_if_output_terminal(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint               offset_start;
+
+    static int * const controls[] = {
+        &hf_ac_if_output_controls_copy,
+        &hf_ac_if_output_controls_connector,
+        &hf_ac_if_output_controls_overload,
+        &hf_ac_if_output_controls_underflow,
+        &hf_ac_if_output_controls_overflow,
+        &hf_ac_if_output_controls_rsv,
+        NULL
+    };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    /* do not try to dissect unknown versions */
+    if (!((audio_conv_info->audio_ver_major==1) || (audio_conv_info->audio_ver_major==2)))
+        return 0;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_output_terminalid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_output_terminaltype, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    proto_tree_add_item(tree, hf_ac_if_output_assocterminal, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_output_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    if (audio_conv_info->audio_ver_major==2) {
+        proto_tree_add_item(tree, hf_ac_if_output_clk_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_output_controls, ett_ac_if_output_controls, controls, ENC_LITTLE_ENDIAN);
+        offset += 2;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_output_terminal, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ac_if_feature_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_, guint8 desc_len)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint offset_start;
+    gint i;
+    gint ch;
+    guint8 controlsize;
+    proto_tree *bitmap_tree;
+    proto_item *ti;
+
+    static int * const fu_controls0[] = {
+        &hf_ac_if_fu_controls_d0,
+        &hf_ac_if_fu_controls_d1,
+        &hf_ac_if_fu_controls_d2,
+        &hf_ac_if_fu_controls_d3,
+        &hf_ac_if_fu_controls_d4,
+        &hf_ac_if_fu_controls_d5,
+        &hf_ac_if_fu_controls_d6,
+        &hf_ac_if_fu_controls_d7,
+        NULL };
+
+    static int * const fu_controls1[] = {
+        &hf_ac_if_fu_controls_d8,
+        &hf_ac_if_fu_controls_d9,
+        &hf_ac_if_fu_controls_rsv,
+        NULL };
+
+    static int * const v2_fu_controls[] = {
+        &hf_ac_if_fu_controls_v2_d0,
+        &hf_ac_if_fu_controls_v2_d1,
+        &hf_ac_if_fu_controls_v2_d2,
+        &hf_ac_if_fu_controls_v2_d3,
+        &hf_ac_if_fu_controls_v2_d4,
+        &hf_ac_if_fu_controls_v2_d5,
+        &hf_ac_if_fu_controls_v2_d6,
+        &hf_ac_if_fu_controls_v2_d7,
+        &hf_ac_if_fu_controls_v2_d8,
+        &hf_ac_if_fu_controls_v2_d9,
+        &hf_ac_if_fu_controls_v2_d10,
+        &hf_ac_if_fu_controls_v2_d11,
+        &hf_ac_if_fu_controls_v2_d12,
+        &hf_ac_if_fu_controls_v2_d13,
+        &hf_ac_if_fu_controls_v2_d14,
+        &hf_ac_if_fu_controls_v2_rsv,
+        NULL };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    /* do not try to dissect unknown versions */
+    if (!((audio_conv_info->audio_ver_major==1) || (audio_conv_info->audio_ver_major==2)))
+        return 0;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_fu_unitid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_fu_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    if (audio_conv_info->audio_ver_major==1) {
+        proto_tree_add_item(tree, hf_ac_if_fu_controlsize, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        controlsize = tvb_get_guint8(tvb, offset);
+        offset += 1;
+
+        /* Descriptor size is 7+(ch+1)*n where n is controlsize, calculate and validate ch */
+        ch = (controlsize > 0) ? (((desc_len - 7) / (controlsize)) - 1) : 0;
+        if (((7 + ((ch + 1) * controlsize)) != desc_len) || (ch < 0) || (controlsize == 0)){
+            /* Report malformed packet, do not attempt further dissection */
+            proto_tree_add_expert(tree, pinfo, &ei_usb_audio_invalid_feature_unit_length, tvb, offset, desc_len-offset);
+            offset += desc_len-offset;
+            return offset-offset_start;
+        }
+
+        ti = proto_tree_add_item(tree, hf_ac_if_fu_controls, tvb, offset, controlsize * (ch + 1), ENC_NA);
+        bitmap_tree = proto_item_add_subtree(ti, ett_ac_if_fu_controls);
+
+        /* bmaControls has 1 master channel 0 controls, and variable number of logical channel controls */
+        for (i = 0; i < (ch + 1); i++) {
+            ti = proto_tree_add_bitmask(bitmap_tree, tvb, offset, hf_ac_if_fu_control, ett_ac_if_fu_controls0, fu_controls0, ENC_LITTLE_ENDIAN);
+            proto_item_prepend_text(ti, "%s channel %d ", (i == 0) ? "Master" : "Logical", i);
+            if (controlsize > 1) {
+                ti = proto_tree_add_bitmask(bitmap_tree, tvb, offset + 1, hf_ac_if_fu_control, ett_ac_if_fu_controls1, fu_controls1, ENC_LITTLE_ENDIAN);
+                proto_item_prepend_text(ti, "%s channel %d", (i == 0) ? "Master" : "Logical", i);
+            }
+            offset += controlsize;
+        }
+
+    } else if (audio_conv_info->audio_ver_major==2) {
+        /* Descriptor size is 6+(ch+1)*4, calculate and validate ch */
+        ch = (desc_len - 6) / 4 - 1;
+        if (((6 + (ch + 1) * 4) != desc_len) || (ch < 0)) {
+            /* Report malformed packet, do not attempt further dissection */
+            proto_tree_add_expert(tree, pinfo, &ei_usb_audio_invalid_feature_unit_length, tvb, offset, desc_len-offset);
+            offset += desc_len-offset;
+            return offset-offset_start;
+        }
+
+        ti = proto_tree_add_item(tree, hf_ac_if_fu_controls_v2, tvb, offset, 4 * (ch + 1), ENC_NA);
+        bitmap_tree = proto_item_add_subtree(ti, ett_ac_if_fu_controls_v2);
+
+        for (i = 0; i < (ch + 1); i++) {
+            ti = proto_tree_add_bitmask(bitmap_tree, tvb, offset, hf_ac_if_fu_control_v2, ett_ac_if_fu_control_v2, v2_fu_controls, ENC_LITTLE_ENDIAN);
+            proto_item_prepend_text(ti, "%s channel %d ", (i == 0) ? "Master" : "Logical", i);
+            offset += 4;
+        }
+
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_fu_ifeature, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint dissect_ac_if_selector_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint offset_start;
+    guint32 nrinpins,i;
+    guint32 source_id;
+    proto_item *ti;
+    proto_tree *subtree;
+
+    static int * const controls[] = {
+        &hf_ac_if_su_controls_d0,
+        &hf_ac_if_su_controls_rsv,
+        NULL
+    };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    /* do not try to dissect unknown versions */
+    if (!((audio_conv_info->audio_ver_major==1) || (audio_conv_info->audio_ver_major==2)))
+        return 0;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_su_unitid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item_ret_uint(tree, hf_ac_if_su_nrinpins, tvb, offset, 1, ENC_LITTLE_ENDIAN, &nrinpins);
+    offset += 1;
+
+    ti = proto_tree_add_bytes_format_value(tree, hf_ac_if_su_sourceids, tvb, offset, nrinpins, NULL, "%s", "");
+    subtree = proto_item_add_subtree(ti, ett_ac_if_su_sourceids);
+
+    for (i = 0; i < nrinpins; ++i) {
+        proto_tree_add_item_ret_uint(subtree, hf_ac_if_su_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN, &source_id);
+        offset += 1;
+        proto_item_append_text(ti, "%s%d", (i > 0) ? ", " : "", source_id);
+    }
+
+    if (audio_conv_info->audio_ver_major==2) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_su_controls, ett_ac_if_su_controls, controls, ENC_LITTLE_ENDIAN);
+        offset += 1;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_su_iselector, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset - offset_start;
+}
+
+static gint
+dissect_ac_if_mixed_unit(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint     offset_start;
+    guint8 nrinpins;
+
+    static int * const mu_channelconfig[] = {
+        &hf_ac_if_mu_channelconfig_d0,
+        &hf_ac_if_mu_channelconfig_d1,
+        &hf_ac_if_mu_channelconfig_d2,
+        &hf_ac_if_mu_channelconfig_d3,
+        &hf_ac_if_mu_channelconfig_d4,
+        &hf_ac_if_mu_channelconfig_d5,
+        &hf_ac_if_mu_channelconfig_d6,
+        &hf_ac_if_mu_channelconfig_d7,
+        &hf_ac_if_mu_channelconfig_d8,
+        &hf_ac_if_mu_channelconfig_d9,
+        &hf_ac_if_mu_channelconfig_d10,
+        &hf_ac_if_mu_channelconfig_d11,
+        &hf_ac_if_mu_channelconfig_rsv,
+        NULL
+    };
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_mu_unitid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_mu_nrinpins, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    nrinpins = tvb_get_guint8(tvb, offset);
+    offset += 1;
+
+    while(nrinpins){
+        proto_tree_add_item(tree, hf_ac_if_mu_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        nrinpins--;
+        offset += 1;
+    }
+
+    proto_tree_add_item(tree, hf_ac_if_mu_nrchannels, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_mu_channelconfig, ett_ac_if_mu_channelconfig, mu_channelconfig, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    proto_tree_add_item(tree, hf_ac_if_mu_channelnames, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_mu_controls, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_mu_imixer, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ac_if_clock_source(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint offset_start;
+    static int * const cs_attributes[] = {
+        &hf_ac_if_clksrc_attr_type,
+        &hf_ac_if_clksrc_attr_d2,
+        &hf_ac_if_clksrc_attr_rsv,
+        NULL
+    };
+    static int * const cs_controls[] = {
+        &hf_ac_if_clksrc_controls_freq,
+        &hf_ac_if_clksrc_controls_validity,
+        &hf_ac_if_clksrc_controls_rsv,
+        NULL
+    };
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_clksrc_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_clksrc_attr, ett_ac_if_clksrc_attr, cs_attributes, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_clksrc_controls, ett_ac_if_clksrc_controls, cs_controls, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_clksrc_assocterminal, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_clksrc_clocksource, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ac_if_clock_selector(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint   offset_start;
+    guint8 nrinpins;
+    static int * const cs_controls[] = {
+        &hf_ac_if_clksel_controls_clksel,
+        &hf_ac_if_clksel_controls_rsv,
+        NULL
+    };
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ac_if_clksel_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_clksel_nrpins, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    nrinpins = tvb_get_guint8(tvb, offset);
+    offset += 1;
+
+    while (nrinpins) {
+        proto_tree_add_item(tree, hf_ac_if_clksel_sourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        nrinpins--;
+        offset += 1;
+    }
+
+    proto_tree_add_bitmask(tree, tvb, offset, hf_ac_if_clksel_controls, ett_ac_if_clksel_controls, cs_controls, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ac_if_clksel_clockselector, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_as_if_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint               offset_start;
+
+    static int * const v2_controls[] = {
+        &hf_as_if_gen_controls_active,
+        &hf_as_if_gen_controls_valid,
+        &hf_as_if_gen_controls_rsv,
+        NULL
+    };
+
+    static int * const v2_formats_type_i[] = {
+        &hf_as_if_gen_formats_i_d0,
+        &hf_as_if_gen_formats_i_d1,
+        &hf_as_if_gen_formats_i_d2,
+        &hf_as_if_gen_formats_i_d3,
+        &hf_as_if_gen_formats_i_d4,
+        &hf_as_if_gen_formats_i_rsv,
+        &hf_as_if_gen_formats_i_d31,
+        NULL
+    };
+
+    static int * const v2_formats_type_ii[] = {
+        &hf_as_if_gen_formats_ii_d0,
+        &hf_as_if_gen_formats_ii_d1,
+        &hf_as_if_gen_formats_ii_d2,
+        &hf_as_if_gen_formats_ii_d3,
+        &hf_as_if_gen_formats_ii_rsv,
+        &hf_as_if_gen_formats_ii_d31,
+        NULL
+    };
+
+    static int * const v2_formats_type_iii[] = {
+        &hf_as_if_gen_formats_iii_d0,
+        &hf_as_if_gen_formats_iii_d1,
+        &hf_as_if_gen_formats_iii_d2,
+        &hf_as_if_gen_formats_iii_d3,
+        &hf_as_if_gen_formats_iii_d4,
+        &hf_as_if_gen_formats_iii_d5,
+        &hf_as_if_gen_formats_iii_d6,
+        &hf_as_if_gen_formats_iii_d7,
+        &hf_as_if_gen_formats_iii_d8,
+        &hf_as_if_gen_formats_iii_d9,
+        &hf_as_if_gen_formats_iii_d10,
+        &hf_as_if_gen_formats_iii_d11,
+        &hf_as_if_gen_formats_iii_d12,
+        &hf_as_if_gen_formats_iii_rsv,
+        NULL
+    };
+
+    static int * const v2_formats_type_iv[] = {
+        &hf_as_if_gen_formats_iv_d0,
+        &hf_as_if_gen_formats_iv_d1,
+        &hf_as_if_gen_formats_iv_d2,
+        &hf_as_if_gen_formats_iv_d3,
+        &hf_as_if_gen_formats_iv_d4,
+        &hf_as_if_gen_formats_iv_d5,
+        &hf_as_if_gen_formats_iv_d6,
+        &hf_as_if_gen_formats_iv_d7,
+        &hf_as_if_gen_formats_iv_d8,
+        &hf_as_if_gen_formats_iv_d9,
+        &hf_as_if_gen_formats_iv_d10,
+        &hf_as_if_gen_formats_iv_d11,
+        &hf_as_if_gen_formats_iv_d12,
+        &hf_as_if_gen_formats_iv_d13,
+        &hf_as_if_gen_formats_iv_d14,
+        &hf_as_if_gen_formats_iv_d15,
+        &hf_as_if_gen_formats_iv_d16,
+        &hf_as_if_gen_formats_iv_d17,
+        &hf_as_if_gen_formats_iv_d18,
+        &hf_as_if_gen_formats_iv_d19,
+        &hf_as_if_gen_formats_iv_d20,
+        &hf_as_if_gen_formats_iv_d21,
+        &hf_as_if_gen_formats_iv_rsv,
+        NULL
+    };
+
+    static int * const v2_channels[] = {
+        &hf_as_if_gen_bmchannelconfig_d0,
+        &hf_as_if_gen_bmchannelconfig_d1,
+        &hf_as_if_gen_bmchannelconfig_d2,
+        &hf_as_if_gen_bmchannelconfig_d3,
+        &hf_as_if_gen_bmchannelconfig_d4,
+        &hf_as_if_gen_bmchannelconfig_d5,
+        &hf_as_if_gen_bmchannelconfig_d6,
+        &hf_as_if_gen_bmchannelconfig_d7,
+        &hf_as_if_gen_bmchannelconfig_d8,
+        &hf_as_if_gen_bmchannelconfig_d9,
+        &hf_as_if_gen_bmchannelconfig_d10,
+        &hf_as_if_gen_bmchannelconfig_d11,
+        &hf_as_if_gen_bmchannelconfig_d12,
+        &hf_as_if_gen_bmchannelconfig_d13,
+        &hf_as_if_gen_bmchannelconfig_d14,
+        &hf_as_if_gen_bmchannelconfig_d15,
+        &hf_as_if_gen_bmchannelconfig_d16,
+        &hf_as_if_gen_bmchannelconfig_d17,
+        &hf_as_if_gen_bmchannelconfig_d18,
+        &hf_as_if_gen_bmchannelconfig_d19,
+        &hf_as_if_gen_bmchannelconfig_d20,
+        &hf_as_if_gen_bmchannelconfig_d21,
+        &hf_as_if_gen_bmchannelconfig_d22,
+        &hf_as_if_gen_bmchannelconfig_d23,
+        &hf_as_if_gen_bmchannelconfig_d24,
+        &hf_as_if_gen_bmchannelconfig_d25,
+        &hf_as_if_gen_bmchannelconfig_d26,
+        &hf_as_if_gen_bmchannelconfig_rsv,
+        &hf_as_if_gen_bmchannelconfig_d31,
+        NULL
+    };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    offset_start = offset;
+
+    if (audio_conv_info->audio_ver_major==1) {
+        proto_tree_add_item(tree, hf_as_if_gen_term_link, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_item(tree, hf_as_if_gen_delay, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_item(tree, hf_as_if_gen_wformattag, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+        offset += 2;
+    } else if (audio_conv_info->audio_ver_major==2) {
+        guint8 format_type;
+        int * const *formats_bitmask;
+
+        proto_tree_add_item(tree, hf_as_if_gen_term_link, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_bitmask(tree, tvb, offset, hf_as_if_gen_controls, ett_as_if_gen_controls, v2_controls, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_item(tree, hf_as_if_gen_formattype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        format_type = tvb_get_guint8(tvb, offset);
+        offset++;
+        switch(format_type)
+        {
+            case 1:
+                formats_bitmask = v2_formats_type_i;
+                break;
+            case 2:
+                formats_bitmask = v2_formats_type_ii;
+                break;
+            case 3:
+                formats_bitmask = v2_formats_type_iii;
+                break;
+            case 4:
+                formats_bitmask = v2_formats_type_iv;
+                break;
+            default:
+                formats_bitmask = NULL;
+                break;
+        }
+        if (formats_bitmask) {
+            proto_tree_add_bitmask(tree, tvb, offset, hf_as_if_gen_formats, ett_as_if_gen_formats, formats_bitmask, ENC_LITTLE_ENDIAN);
+        } else {
+            proto_tree_add_item(tree, hf_as_if_gen_formats, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+        }
+        offset += 4;
+        proto_tree_add_item(tree, hf_as_if_gen_nrchannels, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_bitmask(tree, tvb, offset, hf_as_if_gen_bmchannelconfig, ett_as_if_gen_bmchannelconfig, v2_channels, ENC_LITTLE_ENDIAN);
+        offset += 4;
+        proto_tree_add_item(tree, hf_as_if_gen_channelnames, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+    }
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_as_if_format_type_ver1_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, audio_conv_info_t *audio_conv_info _U_)
+{
+    gint   offset_start;
+    guint8 SamFreqType;
+    guint8 format_type;
+    guint32 nrchannels;
+    guint32 subframesize;
+    guint32 bitresolution;
+    proto_item *desc_tree_item;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_as_if_ft_formattype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    format_type = tvb_get_guint8(tvb, offset);
+    offset++;
+
+
+    switch(format_type){
+        case 1:
+            proto_tree_add_item(tree, hf_as_if_ft_nrchannels, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            offset += 1;
+
+            proto_tree_add_item(tree, hf_as_if_ft_subframesize, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            offset += 1;
+
+            proto_tree_add_item(tree, hf_as_if_ft_bitresolution, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            offset += 1;
+
+            proto_tree_add_item(tree, hf_as_if_ft_samfreqtype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            SamFreqType = tvb_get_guint8(tvb, offset);
+            offset++;
+
+            if(SamFreqType == 0){
+                proto_tree_add_item(tree, hf_as_if_ft_lowersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+                proto_tree_add_item(tree, hf_as_if_ft_uppersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+            }else {
+                while(SamFreqType){
+                    proto_tree_add_item(tree, hf_as_if_ft_samfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                    offset += 3;
+                    SamFreqType--;
+                }
+            }
+        break;
+        case 2:
+            proto_tree_add_item(tree, hf_as_if_ft_maxbitrate, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+            offset += 2;
+
+            proto_tree_add_item(tree, hf_as_if_ft_samplesperframe, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+            offset += 2;
+
+            proto_tree_add_item(tree, hf_as_if_ft_samfreqtype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            SamFreqType = tvb_get_guint8(tvb, offset);
+            offset++;
+
+            if(SamFreqType == 0){
+                proto_tree_add_item(tree, hf_as_if_ft_lowersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+                proto_tree_add_item(tree, hf_as_if_ft_uppersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+            }else {
+                while(SamFreqType){
+                    proto_tree_add_item(tree, hf_as_if_ft_samfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                    offset += 3;
+                    SamFreqType--;
+                }
+            }
+        break;
+        case 3:
+            desc_tree_item = proto_tree_add_item_ret_uint(tree, hf_as_if_ft_nrchannels, tvb, offset, 1, ENC_LITTLE_ENDIAN, &nrchannels);
+            offset += 1;
+
+            if(nrchannels != 2){
+                expert_add_info(pinfo, desc_tree_item, &ei_usb_audio_invalid_type_3_ft_nrchannels);
+            }
+
+            desc_tree_item = proto_tree_add_item_ret_uint(tree, hf_as_if_ft_subframesize, tvb, offset, 1, ENC_LITTLE_ENDIAN, &subframesize);
+            offset += 1;
+
+            if(subframesize != 2){
+                expert_add_info(pinfo, desc_tree_item, &ei_usb_audio_invalid_type_3_ft_subframesize);
+            }
+
+            desc_tree_item = proto_tree_add_item_ret_uint(tree, hf_as_if_ft_bitresolution, tvb, offset, 1, ENC_LITTLE_ENDIAN, &bitresolution);
+            offset += 1;
+
+            if(bitresolution != 16){
+                expert_add_info(pinfo, desc_tree_item, &ei_usb_audio_invalid_type_3_ft_bitresolution);
+            }
+
+            proto_tree_add_item(tree, hf_as_if_ft_samfreqtype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+            SamFreqType = tvb_get_guint8(tvb, offset);
+            offset++;
+
+            if(SamFreqType == 0){
+                proto_tree_add_item(tree, hf_as_if_ft_lowersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+                proto_tree_add_item(tree, hf_as_if_ft_uppersamfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                offset += 3;
+            }else {
+                while(SamFreqType){
+                    proto_tree_add_item(tree, hf_as_if_ft_samfreq, tvb, offset, 3, ENC_LITTLE_ENDIAN);
+                    offset += 3;
+                    SamFreqType--;
+                }
+            }
+        break;
+        default:
+        break;
+    }
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_as_if_format_type_ver2_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, audio_conv_info_t *audio_conv_info _U_)
+{
+    gint   offset_start;
+    guint8 format_type;
+
+    offset_start = offset;
+
+    proto_tree_add_item(tree, hf_as_if_ft_formattype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    format_type = tvb_get_guint8(tvb, offset);
+    offset++;
+
+    if (format_type==1) {
+        proto_tree_add_item(tree, hf_as_if_ft_subslotsize, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+
+        proto_tree_add_item(tree, hf_as_if_ft_bitresolution, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+    }
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_as_if_format_type_body(tvbuff_t *tvb, gint offset, packet_info *pinfo,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    audio_conv_info_t *audio_conv_info;
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    if (audio_conv_info->audio_ver_major==1) {
+        return dissect_as_if_format_type_ver1_body(tvb, offset, pinfo, tree, audio_conv_info);
+    } else if (audio_conv_info->audio_ver_major==2) {
+        return dissect_as_if_format_type_ver2_body(tvb, offset, pinfo, tree, audio_conv_info);
+    }
+
+    return 0;
+}
+
+static gint
+dissect_as_ep_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    audio_conv_info_t *audio_conv_info;
+    gint               offset_start = offset;
+
+    static int * const v1_attributes[] = {
+        &hf_as_ep_gen_bmattributes_d0,
+        &hf_as_ep_gen_bmattributes_d1,
+        &hf_as_ep_gen_bmattributes_rsv,
+        &hf_as_ep_gen_bmattributes_d7,
+        NULL
+    };
+    static int * const v2_attributes[] = {
+        &hf_as_ep_gen_bmattributes_d7,
+        NULL
+    };
+    static int * const controls[] = {
+        &hf_as_ep_gen_controls_pitch,
+        &hf_as_ep_gen_controls_data_overrun,
+        &hf_as_ep_gen_controls_data_underrun,
+        &hf_as_ep_gen_controls_rsv,
+        NULL
+    };
+
+    /* the caller has already checked that usb_conv_info!=NULL */
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if (!audio_conv_info)
+        return 0;
+
+    /* do not try to dissect unknown versions */
+    if (!((audio_conv_info->audio_ver_major==1) || (audio_conv_info->audio_ver_major==2)))
+        return 0;
+
+    if (audio_conv_info->audio_ver_major==1) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_as_ep_gen_bmattributes, ett_as_ep_gen_attributes, v1_attributes, ENC_LITTLE_ENDIAN);
+        offset++;
+    } else if (audio_conv_info->audio_ver_major==2) {
+        proto_tree_add_bitmask(tree, tvb, offset, hf_as_ep_gen_bmattributes, ett_as_ep_gen_attributes, v2_attributes, ENC_LITTLE_ENDIAN);
+        offset++;
+        proto_tree_add_bitmask(tree, tvb, offset, hf_as_ep_gen_controls, ett_as_ep_gen_controls, controls, ENC_LITTLE_ENDIAN);
+        offset++;
+    }
+
+    proto_tree_add_item(tree, hf_as_ep_gen_lockdelayunits, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(tree, hf_as_ep_gen_lockdelay, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ms_if_hdr_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info)
+{
+    gint     offset_start;
+    guint16  bcdADC;
+    guint8   ver_major;
+    double   ver;
+    audio_conv_info_t *audio_conv_info;
+
+    offset_start = offset;
+
+    bcdADC = tvb_get_letohs(tvb, offset);
+    ver_major = USB_AUDIO_BCD44_TO_DEC(bcdADC>>8);
+    ver = ver_major + USB_AUDIO_BCD44_TO_DEC(bcdADC&0xFF) / 100.0;
+
+    proto_tree_add_double_format_value(tree, hf_ms_if_hdr_ver,
+            tvb, offset, 2, ver, "%2.2f", ver);
+    audio_conv_info = (audio_conv_info_t *)usb_conv_info->class_data;
+    if(!audio_conv_info) {
+        audio_conv_info = allocate_audio_conv_info();
+        usb_conv_info->class_data = audio_conv_info;
+        usb_conv_info->class_data_type = USB_CONV_AUDIO;
+    } else if (usb_conv_info->class_data_type != USB_CONV_AUDIO) {
+        /* Don't dissect if another USB type is in the conversation */
+        return 0;
+    }
+    audio_conv_info->midi_ver_major = ver_major;
+    offset += 2;
+
+    proto_tree_add_item(tree, hf_ms_if_hdr_total_len,
+                tvb, offset, 2, ENC_LITTLE_ENDIAN);
+    offset += 2;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ms_if_midi_in_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint     offset_start = offset;
+
+    proto_tree_add_item(tree, hf_ms_if_midi_in_bjacktype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(tree, hf_ms_if_midi_in_bjackid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(tree, hf_ms_if_midi_in_ijack, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ms_if_midi_out_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint     offset_start = offset;
+    guint8   nrinputpins;
+
+    proto_tree_add_item(tree, hf_ms_if_midi_out_bjacktype, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(tree, hf_ms_if_midi_out_bjackid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_item(tree, hf_ms_if_midi_out_bnrinputpins, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    nrinputpins = tvb_get_guint8(tvb, offset);
+    offset += 1;
+    while (nrinputpins)
+    {
+        proto_tree_add_item(tree, hf_ms_if_midi_out_basourceid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+        proto_tree_add_item(tree, hf_ms_if_midi_out_basourcepin, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+        nrinputpins--;
+    }
+
+    proto_tree_add_item(tree, hf_ms_if_midi_out_ijack, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    offset += 1;
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_ms_ep_general_body(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_,
+        proto_tree *tree, usb_conv_info_t *usb_conv_info _U_)
+{
+    gint     offset_start = offset;
+    guint8   numjacks;
+
+    proto_tree_add_item(tree, hf_ms_ep_gen_numjacks, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    numjacks = tvb_get_guint8(tvb, offset);
+    offset += 1;
+    while (numjacks)
+    {
+        proto_tree_add_item(tree, hf_ms_ep_gen_baassocjackid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+        numjacks--;
+    }
+
+    return offset-offset_start;
+}
+
+static gint
+dissect_usb_audio_descriptor(tvbuff_t *tvb, packet_info *pinfo,
+        proto_tree *tree, void *data)
+{
+    gint             offset = 0;
+    gint             bytes_dissected = 0;
+    usb_conv_info_t *usb_conv_info;
+    proto_tree       *desc_tree = NULL;
+    proto_item       *desc_tree_item;
+    guint8           desc_len;
+    guint8           desc_type;
+    guint8           desc_subtype;
+    const gchar     *subtype_str;
+
+    usb_conv_info = (usb_conv_info_t *)data;
+    if (!usb_conv_info || usb_conv_info->interfaceClass!=IF_CLASS_AUDIO)
+        return 0;
+
+    desc_len  = tvb_get_guint8(tvb, offset);
+    desc_type = tvb_get_guint8(tvb, offset+1);
+
+    if (desc_type==CS_INTERFACE &&
+            usb_conv_info->interfaceSubclass==AUDIO_IF_SUBCLASS_AUDIOCONTROL) {
+
+        desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len,
+                ett_usb_audio_desc, &desc_tree_item,
+                "Class-specific Audio Control Interface Descriptor");
+
+        dissect_usb_descriptor_header(desc_tree, tvb, offset,
+            &aud_descriptor_type_vals_ext);
+        offset += 2;
+
+        desc_subtype = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(desc_tree, hf_ac_if_desc_subtype,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        subtype_str = try_val_to_str_ext(desc_subtype, &ac_subtype_vals_ext);
+        if (subtype_str)
+            proto_item_append_text(desc_tree_item, ": %s", subtype_str);
+        offset++;
+
+        bytes_dissected = offset;
+        switch(desc_subtype) {
+            case AC_SUBTYPE_HEADER:
+                /* these subfunctions return the number of bytes dissected,
+                   this is not necessarily the length of the body
+                   as some components are not yet dissected
+                   we rely on the descriptor's length byte instead */
+                bytes_dissected += dissect_ac_if_hdr_body(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_INPUT_TERMINAL:
+                bytes_dissected += dissect_ac_if_input_terminal(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_OUTPUT_TERMINAL:
+                bytes_dissected += dissect_ac_if_output_terminal(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_MIXER_UNIT:
+                bytes_dissected += dissect_ac_if_mixed_unit(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_SELECTOR_UNIT:
+                bytes_dissected += dissect_ac_if_selector_unit(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_FEATURE_UNIT:
+                bytes_dissected += dissect_ac_if_feature_unit(tvb, offset, pinfo, desc_tree, usb_conv_info, desc_len);
+                break;
+            case AC_SUBTYPE_CLOCK_SOURCE:
+                bytes_dissected += dissect_ac_if_clock_source(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            case AC_SUBTYPE_CLOCK_SELECTOR:
+                bytes_dissected += dissect_ac_if_clock_selector(tvb, offset, pinfo, desc_tree, usb_conv_info);
+                break;
+            default:
+                break;
+        }
+    }
+    else if (desc_type==CS_INTERFACE &&
+            usb_conv_info->interfaceSubclass==AUDIO_IF_SUBCLASS_AUDIOSTREAMING) {
+
+        desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len,
+                ett_usb_audio_desc, &desc_tree_item,
+                "Class-specific Audio Streaming Interface Descriptor");
+
+        dissect_usb_descriptor_header(desc_tree, tvb, offset,
+            &aud_descriptor_type_vals_ext);
+        offset += 2;
+
+        desc_subtype = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(desc_tree, hf_as_if_desc_subtype,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        subtype_str = try_val_to_str_ext(desc_subtype, &as_subtype_vals_ext);
+        if (subtype_str)
+            proto_item_append_text(desc_tree_item, ": %s", subtype_str);
+        offset++;
+
+        bytes_dissected = offset;
+        switch(desc_subtype) {
+            case AS_SUBTYPE_GENERAL:
+                bytes_dissected += dissect_as_if_general_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            case AS_SUBTYPE_FORMAT_TYPE:
+                bytes_dissected += dissect_as_if_format_type_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            default:
+                break;
+        }
+    }
+    /* there are no class-specific endpoint descriptors for audio control */
+    else if (desc_type == CS_ENDPOINT &&
+            usb_conv_info->interfaceSubclass==AUDIO_IF_SUBCLASS_AUDIOSTREAMING) {
+
+        desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len,
+                ett_usb_audio_desc, &desc_tree_item,
+                "Class-specific Audio Streaming Endpoint Descriptor");
+
+        dissect_usb_descriptor_header(desc_tree, tvb, offset,
+            &aud_descriptor_type_vals_ext);
+        offset += 2;
+
+        desc_subtype = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(desc_tree, hf_as_ep_desc_subtype,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        bytes_dissected = offset;
+        switch(desc_subtype) {
+            case AS_EP_SUBTYPE_GENERAL:
+                bytes_dissected += dissect_as_ep_general_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            default:
+                break;
+        }
+    }
+    else if (desc_type==CS_INTERFACE &&
+            usb_conv_info->interfaceSubclass==AUDIO_IF_SUBCLASS_MIDISTREAMING) {
+        desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len,
+                ett_usb_audio_desc, &desc_tree_item,
+                "Class-specific MIDI Streaming Interface Descriptor");
+
+        dissect_usb_descriptor_header(desc_tree, tvb, offset,
+            &aud_descriptor_type_vals_ext);
+        offset += 2;
+
+        desc_subtype = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(desc_tree, hf_ms_if_desc_subtype,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        subtype_str = try_val_to_str_ext(desc_subtype, &ms_if_subtype_vals_ext);
+        if (subtype_str)
+            proto_item_append_text(desc_tree_item, ": %s", subtype_str);
+        offset++;
+
+        bytes_dissected = offset;
+        switch(desc_subtype) {
+            case MS_IF_SUBTYPE_HEADER:
+                bytes_dissected += dissect_ms_if_hdr_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            case MS_IF_SUBTYPE_MIDI_IN_JACK:
+                bytes_dissected += dissect_ms_if_midi_in_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            case MS_IF_SUBTYPE_MIDI_OUT_JACK:
+                bytes_dissected += dissect_ms_if_midi_out_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            default:
+                break;
+        }
+    }
+    else if (desc_type==CS_ENDPOINT &&
+            usb_conv_info->interfaceSubclass==AUDIO_IF_SUBCLASS_MIDISTREAMING) {
+        desc_tree = proto_tree_add_subtree(tree, tvb, offset, desc_len,
+                ett_usb_audio_desc, &desc_tree_item,
+                "Class-specific MIDI Streaming Endpoint Descriptor");
+
+        dissect_usb_descriptor_header(desc_tree, tvb, offset,
+            &aud_descriptor_type_vals_ext);
+        offset += 2;
+
+        desc_subtype = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(desc_tree, hf_ms_ep_desc_subtype,
+                tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        bytes_dissected = offset;
+        switch(desc_subtype) {
+            case MS_EP_SUBTYPE_GENERAL:
+                bytes_dissected += dissect_ms_ep_general_body(tvb, offset, pinfo,
+                        desc_tree, usb_conv_info);
+                break;
+            default:
+                break;
+        }
+    }
+    else
+        return 0;
+
+    if (bytes_dissected < desc_len) {
+        proto_tree_add_expert(desc_tree, pinfo, &ei_usb_audio_undecoded, tvb, bytes_dissected, desc_len-bytes_dissected);
+    }
+    return desc_len;
+}
+
+
+/* dissector for usb midi bulk data */
+static int
+dissect_usb_audio_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data)
+{
+    usb_conv_info_t *usb_conv_info;
+    gint             offset, length;
+    gint             i;
+
+    /* Reject the packet if data is NULL */
+    if (data == NULL)
+        return 0;
+    usb_conv_info = (usb_conv_info_t *)data;
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBAUDIO");
+
+    length = tvb_reported_length(tvb);
+    offset = 0;
+
+    switch (usb_conv_info->interfaceSubclass)
+    {
+        case AUDIO_IF_SUBCLASS_MIDISTREAMING:
+            col_set_str(pinfo->cinfo, COL_INFO, "USB-MIDI Event Packets");
+
+            for (i = 0; i < length / 4; i++)
+            {
+                dissect_usb_midi_event(tvb, pinfo, parent_tree, offset);
+                offset += 4;
+            }
+            break;
+        default:
+            proto_tree_add_expert(parent_tree, pinfo, &ei_usb_audio_undecoded, tvb, offset, length);
+    }
+
+    return length;
+}
+
+void
+proto_register_usb_audio(void)
+{
+    static hf_register_info hf[] = {
+        { &hf_midi_cable_number,
+            { "Cable Number", "usbaudio.midi.cable_number", FT_UINT8, BASE_HEX,
+              NULL, 0xF0, NULL, HFILL }},
+        { &hf_midi_code_index,
+            { "Code Index", "usbaudio.midi.code_index", FT_UINT8, BASE_HEX,
+              VALS(code_index_vals), 0x0F, NULL, HFILL }},
+        { &hf_midi_event,
+            { "MIDI Event", "usbaudio.midi.event", FT_BYTES, BASE_NONE,
+              NULL, 0x0, NULL, HFILL }},
+        { &hf_midi_padding,
+            { "Padding", "usbaudio.midi.padding", FT_BYTES, BASE_NONE,
+              NULL, 0x0, "Must be zero", HFILL }},
+
+        { &hf_ac_if_desc_subtype,
+            { "Subtype", "usbaudio.ac_if_subtype", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
+                &ac_subtype_vals_ext, 0x0, "bDescriptorSubtype", HFILL }},
+        { &hf_ac_if_hdr_ver,
+            { "Version", "usbaudio.ac_if_hdr.bcdADC",
+                FT_DOUBLE, BASE_NONE, NULL, 0, "bcdADC", HFILL }},
+        { &hf_ac_if_hdr_total_len,
+            { "Total length", "usbaudio.ac_if_hdr.wTotalLength",
+              FT_UINT16, BASE_DEC, NULL, 0x0, "wTotalLength", HFILL }},
+        { &hf_ac_if_hdr_bInCollection,
+            { "Total number of interfaces", "usbaudio.ac_if_hdr.bInCollection",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bInCollection", HFILL }},
+        { &hf_ac_if_hdr_if_num,
+            { "Interface number", "usbaudio.ac_if_hdr.baInterfaceNr",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "baInterfaceNr", HFILL }},
+        { &hf_ac_if_hdr_category,
+            { "Category", "usbaudio.ac_if_hdr.bCategory",
+              FT_UINT8, BASE_HEX|BASE_EXT_STRING, &audio_function_categories_vals_ext, 0x00, "bCategory", HFILL }},
+        { &hf_ac_if_hdr_controls,
+            { "Controls", "usbaudio.ac_if_hdr.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_hdr_controls_latency,
+            { "Latency Control", "usbaudio.ac_if_hdr.bmControls.latency",
+              FT_UINT8, BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x03, NULL, HFILL }},
+        { &hf_ac_if_hdr_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_hdr.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xFC, "Must be zero", HFILL }},
+        { &hf_ac_if_input_terminalid,
+            { "Terminal ID", "usbaudio.ac_if_input.bTerminalID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bTerminalID", HFILL }},
+        { &hf_ac_if_input_terminaltype,
+            { "Terminal Type", "usbaudio.ac_if_input.wTerminalType", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &terminal_types_vals_ext, 0x00, "wTerminalType", HFILL }},
+        { &hf_ac_if_input_assocterminal,
+            { "Assoc Terminal", "usbaudio.ac_if_input.bAssocTerminal",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bAssocTerminal", HFILL }},
+        { &hf_ac_if_input_csourceid,
+            { "Connected Clock Entity", "usbaudio.ac_if_input.bCSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bCSourceID", HFILL }},
+        { &hf_ac_if_input_nrchannels,
+            { "Number Channels", "usbaudio.ac_if_input.bNrChannels",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bNrChannels", HFILL }},
+        { &hf_ac_if_input_wchannelconfig,
+            { "Channel Config", "usbaudio.ac_if_input.wChannelConfig",
+              FT_UINT16, BASE_HEX, NULL, 0x0, "wChannelConfig", HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d0,
+            { "Left Front", "usbaudio.ac_if_input.wChannelConfig.d0",
+              FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d1,
+            { "Right Front", "usbaudio.ac_if_input.wChannelConfig.d1",
+              FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d2,
+            { "Center Front", "usbaudio.ac_if_input.wChannelConfig.d2",
+              FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d3,
+            { "Low Frequency Enhancement", "usbaudio.ac_if_input.wChannelConfig.d3",
+              FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d4,
+            { "Left Surround", "usbaudio.ac_if_input.wChannelConfig.d4",
+              FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d5,
+            { "Right Surround", "usbaudio.ac_if_input.wChannelConfig.d5",
+              FT_BOOLEAN, 16, NULL, 0x0020, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d6,
+            { "Left of Center", "usbaudio.ac_if_input.wChannelConfig.d6",
+              FT_BOOLEAN, 16, NULL, 0x0040, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d7,
+            { "Right of Center", "usbaudio.ac_if_input.wChannelConfig.d7",
+              FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d8,
+            { "Surround", "usbaudio.ac_if_input.wChannelConfig.d8",
+              FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d9,
+            { "Side Left", "usbaudio.ac_if_input.wChannelConfig.d9",
+              FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d10,
+            { "Side Right", "usbaudio.ac_if_input.wChannelConfig.d10",
+              FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_d11,
+            { "Top", "usbaudio.ac_if_input.wChannelConfig.d11",
+              FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL }},
+        { &hf_ac_if_input_wchannelconfig_rsv,
+            { "Reserved", "usbaudio.ac_if_input.wChannelConfig.rsv",
+              FT_UINT16, BASE_HEX, NULL, 0xF000, NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig,
+            { "Channel Config", "usbaudio.ac_if_input.bmChannelConfig",
+              FT_UINT32, BASE_HEX, NULL, 0x0, "bmChannelConfig", HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d0,
+            { "Front Left", "usbaudio.ac_if_input.bmChannelConfig.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d1,
+            { "Front Right", "usbaudio.ac_if_input.bmChannelConfig.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d2,
+            { "Front Center", "usbaudio.ac_if_input.bmChannelConfig.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d3,
+            { "Low Frequency Effects", "usbaudio.ac_if_input.bmChannelConfig.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d4,
+            { "Back Left", "usbaudio.ac_if_input.bmChannelConfig.d4",
+              FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d5,
+            { "Back Right", "usbaudio.ac_if_input.bmChannelConfig.d5",
+              FT_BOOLEAN, 32, NULL, (1u << 5), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d6,
+            { "Front Left of Center", "usbaudio.ac_if_input.bmChannelConfig.d6",
+              FT_BOOLEAN, 32, NULL, (1u << 6), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d7,
+            { "Front Right of Center", "usbaudio.ac_if_input.bmChannelConfig.d7",
+              FT_BOOLEAN, 32, NULL, (1u << 7), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d8,
+            { "Back Center", "usbaudio.ac_if_input.bmChannelConfig.d8",
+              FT_BOOLEAN, 32, NULL, (1u << 8), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d9,
+            { "Side Left", "usbaudio.ac_if_input.bmChannelConfig.d9",
+              FT_BOOLEAN, 32, NULL, (1u << 9), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d10,
+            { "Side Right", "usbaudio.ac_if_input.bmChannelConfig.d10",
+              FT_BOOLEAN, 32, NULL, (1u << 10), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d11,
+            { "Top Center", "usbaudio.ac_if_input.bmChannelConfig.d11",
+              FT_BOOLEAN, 32, NULL, (1u << 11), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d12,
+            { "Top Front Left", "usbaudio.ac_if_input.bmChannelConfig.d12",
+              FT_BOOLEAN, 32, NULL, (1u << 12), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d13,
+            { "Top Front Center", "usbaudio.ac_if_input.bmChannelConfig.d13",
+              FT_BOOLEAN, 32, NULL, (1u << 13), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d14,
+            { "Top Front Right", "usbaudio.ac_if_input.bmChannelConfig.d14",
+              FT_BOOLEAN, 32, NULL, (1u << 14), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d15,
+            { "Top Back Left", "usbaudio.ac_if_input.bmChannelConfig.d15",
+              FT_BOOLEAN, 32, NULL, (1u << 15), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d16,
+            { "Top Back Center", "usbaudio.ac_if_input.bmChannelConfig.d16",
+              FT_BOOLEAN, 32, NULL, (1u << 16), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d17,
+            { "Top Back Right", "usbaudio.ac_if_input.bmChannelConfig.d17",
+              FT_BOOLEAN, 32, NULL, (1u << 17), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d18,
+            { "Top Front Left of Center", "usbaudio.ac_if_input.bmChannelConfig.d18",
+              FT_BOOLEAN, 32, NULL, (1u << 18), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d19,
+            { "Top Front Right of Center", "usbaudio.ac_if_input.bmChannelConfig.d19",
+              FT_BOOLEAN, 32, NULL, (1u << 19), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d20,
+            { "Left Low Frequency Effects", "usbaudio.ac_if_input.bmChannelConfig.d20",
+              FT_BOOLEAN, 32, NULL, (1u << 20), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d21,
+            { "Right Low Frequency Effects", "usbaudio.ac_if_input.bmChannelConfig.d21",
+              FT_BOOLEAN, 32, NULL, (1u << 21), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d22,
+            { "Top Side Left", "usbaudio.ac_if_input.bmChannelConfig.d22",
+              FT_BOOLEAN, 32, NULL, (1u << 22), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d23,
+            { "Top Side Right", "usbaudio.ac_if_input.bmChannelConfig.d23",
+              FT_BOOLEAN, 32, NULL, (1u << 23), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d24,
+            { "Bottom Center", "usbaudio.ac_if_input.bmChannelConfig.d24",
+              FT_BOOLEAN, 32, NULL, (1u << 24), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d25,
+            { "Back Left of Center", "usbaudio.ac_if_input.bmChannelConfig.d25",
+              FT_BOOLEAN, 32, NULL, (1u << 25), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d26,
+            { "Back Right of Center", "usbaudio.ac_if_input.bmChannelConfig.d26",
+              FT_BOOLEAN, 32, NULL, (1u << 26), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_rsv,
+            { "Reserved", "usbaudio.ac_if_input.bmChannelConfig.rsv",
+              FT_BOOLEAN, 32, NULL, (0xFu << 27), NULL, HFILL }},
+        { &hf_ac_if_input_bmchannelconfig_d31,
+            { "Raw Data", "usbaudio.ac_if_input.bmChannelConfig.d31",
+              FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }},
+        { &hf_ac_if_input_channelnames,
+            { "Channel Names", "usbaudio.ac_if_input.iChannelNames",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iChannelNames", HFILL }},
+        { &hf_ac_if_input_controls,
+            { "Controls", "usbaudio.ac_if_input.bmControls",
+              FT_UINT16, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_input_controls_copy,
+            { "Copy Protect Control", "usbaudio.ac_if_input.bmControls.copy", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0003, NULL, HFILL }},
+        { &hf_ac_if_input_controls_connector,
+            { "Connector Control", "usbaudio.ac_if_input.bmControls.connector", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x000C, NULL, HFILL }},
+        { &hf_ac_if_input_controls_overload,
+            { "Overload Control", "usbaudio.ac_if_input.bmControls.overload", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0030, NULL, HFILL }},
+        { &hf_ac_if_input_controls_cluster,
+            { "Cluster Control", "usbaudio.ac_if_input.bmControls.cluster", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x00C0, NULL, HFILL }},
+        { &hf_ac_if_input_controls_underflow,
+            { "Underflow Control", "usbaudio.ac_if_input.bmControls.underflow", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0300, NULL, HFILL }},
+        { &hf_ac_if_input_controls_overflow,
+            { "Overflow Control", "usbaudio.ac_if_input.bmControls.overflow", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0C00, NULL, HFILL }},
+        { &hf_ac_if_input_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_input.bmControls.rsv",
+              FT_UINT16, BASE_HEX, NULL, 0xF000, "Must be zero", HFILL }},
+        { &hf_ac_if_input_terminal,
+            { "String descriptor index", "usbaudio.ac_if_input.iTerminal",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iTerminal", HFILL }},
+        { &hf_ac_if_output_terminalid,
+            { "Terminal ID", "usbaudio.ac_if_output.bTerminalID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bTerminalID", HFILL }},
+        { &hf_ac_if_output_terminaltype,
+            { "Terminal Type", "usbaudio.ac_if_output.wTerminalType", FT_UINT16,
+               BASE_HEX|BASE_EXT_STRING, &terminal_types_vals_ext, 0x00, "wTerminalType", HFILL }},
+        { &hf_ac_if_output_assocterminal,
+            { "Assoc Terminal", "usbaudio.ac_if_output.bAssocTerminal",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bAssocTerminal", HFILL }},
+        { &hf_ac_if_output_sourceid,
+            { "Source ID", "usbaudio.ac_if_output.bSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bSourceID", HFILL }},
+        { &hf_ac_if_output_clk_sourceid,
+            { "Connected Clock Entity", "usbaudio.ac_if_output.bCSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bCSourceID", HFILL }},
+        { &hf_ac_if_output_controls,
+            { "Controls", "usbaudio.ac_if_output.bmControls",
+              FT_UINT16, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_output_controls_copy,
+            { "Copy Protect Control", "usbaudio.ac_if_output.bmControls.copy", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0003, NULL, HFILL }},
+        { &hf_ac_if_output_controls_connector,
+            { "Connector Control", "usbaudio.ac_if_output.bmControls.connector", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x000C, NULL, HFILL }},
+        { &hf_ac_if_output_controls_overload,
+            { "Overload Control", "usbaudio.ac_if_output.bmControls.overload", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0030, NULL, HFILL }},
+        { &hf_ac_if_output_controls_underflow,
+            { "Underflow Control", "usbaudio.ac_if_output.bmControls.underflow", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x00C0, NULL, HFILL }},
+        { &hf_ac_if_output_controls_overflow,
+            { "Overflow Control", "usbaudio.ac_if_output.bmControls.overflow", FT_UINT16,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0300, NULL, HFILL }},
+        { &hf_ac_if_output_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_output.bmControls.rsv",
+              FT_UINT16, BASE_HEX, NULL, 0xFC00, "Must be zero", HFILL }},
+        { &hf_ac_if_output_terminal,
+            { "String descriptor index", "usbaudio.ac_if_output.iTerminal",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iTerminal", HFILL }},
+        { &hf_ac_if_fu_unitid,
+            { "Unit ID", "usbaudio.ac_if_fu.bUnitID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bUnitID", HFILL }},
+        { &hf_ac_if_fu_sourceid,
+            { "Source ID", "usbaudio.ac_if_fu.bSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bSourceID", HFILL }},
+        { &hf_ac_if_fu_controlsize,
+            { "Control Size", "usbaudio.ac_if_fu.bControlSize",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bControlSize", HFILL }},
+        { &hf_ac_if_fu_controls,
+            { "Controls", "usbaudio.ac_if_fu.bmaControls",
+              FT_BYTES, BASE_NONE, NULL, 0x0, "bmaControls", HFILL }},
+        { &hf_ac_if_fu_control,
+            { "Control", "usbaudio.ac_if_fu.bmaControl",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmaControls", HFILL }},
+        { &hf_ac_if_fu_controls_d0,
+            { "Mute", "usbaudio.ac_if_fu.bmaControls.d0",
+              FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d1,
+            { "Volume", "usbaudio.ac_if_fu.bmaControls.d1",
+              FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d2,
+            { "Bass", "usbaudio.ac_if_fu.bmaControls.d2",
+              FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d3,
+            { "Mid", "usbaudio.ac_if_fu.bmaControls.d3",
+              FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d4,
+            { "Treble", "usbaudio.ac_if_fu.bmaControls.d4",
+              FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d5,
+            { "Graphic Equalizer", "usbaudio.ac_if_fu.bmaControls.d5",
+              FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d6,
+            { "Automatic Gain", "usbaudio.ac_if_fu.bmaControls.d6",
+              FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d7,
+            { "Delay", "usbaudio.ac_if_fu.bmaControls.d7",
+              FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d8,
+            { "Bass Boost", "usbaudio.ac_if_fu.bmaControls.d8",
+              FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_d9,
+            { "Loudness", "usbaudio.ac_if_fu.bmaControls.d9",
+              FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
+        { &hf_ac_if_fu_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_fu.bmaControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xFC, "Must be zero", HFILL }},
+        { &hf_ac_if_fu_controls_v2,
+            { "Controls", "usbaudio.ac_if_fu.bmaControls_v2",
+              FT_BYTES, BASE_NONE, NULL, 0x0, "bmaControls", HFILL }},
+        { &hf_ac_if_fu_control_v2,
+            { "Control", "usbaudio.ac_if_fu.bmaControl_v2",
+              FT_UINT32, BASE_HEX, NULL, 0x0, "bmaControls", HFILL }},
+        { &hf_ac_if_fu_controls_v2_d0,
+            { "Mute", "usbaudio.ac_if_fu.bmaControls_v2.d0", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 0), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d1,
+            { "Volume", "usbaudio.ac_if_fu.bmaControls_v2.d1", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 2), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d2,
+            { "Bass", "usbaudio.ac_if_fu.bmaControls_v2.d2", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 4), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d3,
+            { "Mid", "usbaudio.ac_if_fu.bmaControls_v2.d3", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 6), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d4,
+            { "Treble", "usbaudio.ac_if_fu.bmaControls_v2.d4", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 8), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d5,
+            { "Graphic Equalizer", "usbaudio.ac_if_fu.bmaControls_v2.d5", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 10), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d6,
+            { "Automatic Gain", "usbaudio.ac_if_fu.bmaControls_v2.d6", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 12), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d7,
+            { "Delay", "usbaudio.ac_if_fu.bmaControl_v2s.d7", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 14), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d8,
+            { "Bass Boost", "usbaudio.ac_if_fu.bmaControls_v2.d8", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 16), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d9,
+            { "Loudness", "usbaudio.ac_if_fu.bmaControls_v2.d9", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 18), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d10,
+            { "Input Gain", "usbaudio.ac_if_fu.bmaControls_v2.d10", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 20), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d11,
+            { "Input Gain Pad", "usbaudio.ac_if_fu.bmaControls_v2.d11", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 22), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d12,
+            { "Phase Inverter", "usbaudio.ac_if_fu.bmaControls_v2.d12", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 24), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d13,
+            { "Underflow", "usbaudio.ac_if_fu.bmaControls_v2.d13", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 26), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_d14,
+            { "Overflow", "usbaudio.ac_if_fu.bmaControls_v2.d14", FT_UINT32,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, (3u << 28), NULL, HFILL }},
+        { &hf_ac_if_fu_controls_v2_rsv,
+            { "Reserved", "usbaudio.ac_if_fu.bmaControls_v2.rsv", FT_UINT32,
+              BASE_HEX, NULL, (3u << 30), "Must be zero", HFILL }},
+        { &hf_ac_if_fu_ifeature,
+            { "Feature", "usbaudio.ac_if_fu.iFeature",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iFeature", HFILL }},
+        { &hf_ac_if_su_unitid,
+            { "Unit ID", "usbaudio.ac_if_su.bUnitID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bUnitID", HFILL }},
+        { &hf_ac_if_su_nrinpins,
+            { "Input Pins", "usbaudio.ac_if_su.bNrInPins",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bNrInPins", HFILL }},
+        { &hf_ac_if_su_sourceids,
+            { "Source IDs", "usbaudio.ac_if_su.baSourceIDs",
+              FT_BYTES, BASE_NONE, NULL, 0x0, "baSourceIDs", HFILL }},
+        { &hf_ac_if_su_sourceid,
+            { "Source ID", "usbaudio.ac_if_su.baSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "baSourceID", HFILL}},
+        { &hf_ac_if_su_controls,
+            { "Controls", "usbaudio.ac_if_su.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL}},
+        { &hf_ac_if_su_controls_d0,
+            { "Selector Control", "usbaudio.ac_if_su.bmControls.d0",
+              FT_UINT8, BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x03, NULL, HFILL}},
+        { &hf_ac_if_su_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_su.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xFC, "Must be zero", HFILL}},
+        { &hf_ac_if_su_iselector,
+            { "Selector Index", "usbaudio.ac_if_su.iSelector",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iSelector", HFILL }},
+        { &hf_ac_if_mu_unitid,
+            { "Unit ID", "usbaudio.ac_if_mu.bUnitID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bUnitID", HFILL }},
+        { &hf_ac_if_mu_nrinpins,
+            { "Number In Pins", "usbaudio.ac_if_mu.bNrInPins",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bNrInPins", HFILL }},
+        { &hf_ac_if_mu_sourceid,
+            { "Source ID", "usbaudio.ac_if_mu.baSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "baSourceID", HFILL }},
+        { &hf_ac_if_mu_nrchannels,
+            { "Number Channels", "usbaudio.ac_if_mu.bNrChannels",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bNrChannels", HFILL }},
+        { &hf_ac_if_mu_channelconfig,
+            { "Channel Config", "usbaudio.ac_if_mu.wChannelConfig",
+              FT_UINT16, BASE_HEX, NULL, 0x0, "wChannelConfig", HFILL }},
+        { &hf_ac_if_mu_channelconfig_d0,
+            { "Left Front", "usbaudio.ac_if_mu.wChannelConfig.d0",
+              FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d1,
+            { "Right Front", "usbaudio.ac_if_mu.wChannelConfig.d1",
+              FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d2,
+            { "Center Front", "usbaudio.ac_if_mu.wChannelConfig.d2",
+              FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d3,
+            { "Low Frequency Enhancement", "usbaudio.ac_if_mu.wChannelConfig.d3",
+              FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d4,
+            { "Left Surround", "usbaudio.ac_if_mu.wChannelConfig.d4",
+              FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d5,
+            { "Right Surround", "usbaudio.ac_if_mu.wChannelConfig.d5",
+              FT_BOOLEAN, 16, NULL, 0x0020, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d6,
+            { "Left of Center", "usbaudio.ac_if_mu.wChannelConfig.d6",
+              FT_BOOLEAN, 16, NULL, 0x0040, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d7,
+            { "Right of Center", "usbaudio.ac_if_mu.wChannelConfig.d7",
+              FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d8,
+            { "Surround", "usbaudio.ac_if_mu.wChannelConfig.d8",
+              FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d9,
+            { "Side Left", "usbaudio.ac_if_mu.wChannelConfig.d9",
+              FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d10,
+            { "Side Right", "usbaudio.ac_if_mu.wChannelConfig.d10",
+              FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_d11,
+            { "Top", "usbaudio.ac_if_mu.wChannelConfig.d11",
+              FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL }},
+        { &hf_ac_if_mu_channelconfig_rsv,
+            { "Reserved", "usbaudio.ac_if_mu.wChannelConfig.rsv",
+              FT_UINT16, BASE_HEX, NULL, 0xF000, NULL, HFILL }},
+        { &hf_ac_if_mu_channelnames,
+            { "Channel Names", "usbaudio.ac_if_mu.iChannelNames",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iChannelNames", HFILL }},
+        { &hf_ac_if_mu_controls,
+            { "Controls", "usbaudio.ac_if_mu.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_mu_imixer,
+            { "Mixer", "usbaudio.ac_if_mu.iMixer",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iMixer", HFILL }},
+        { &hf_ac_if_clksrc_id,
+            { "Clock Source Entity", "usbaudio.ac_if_clksrc.bClockID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bClockID", HFILL }},
+        { &hf_ac_if_clksrc_attr,
+            { "Attributes", "usbaudio.ac_if_clksrc.bmAttributes",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmAttributes", HFILL }},
+        { &hf_ac_if_clksrc_attr_type,
+            { "Type", "usbaudio.ac_if_clksrc.bmAttributes.type", FT_UINT8,
+              BASE_HEX, VALS(clock_types_vals), 0x03, NULL, HFILL }},
+        { &hf_ac_if_clksrc_attr_d2,
+            { "Synchronization", "usbaudio.ac_if_clksrc.bmAttributes.d2", FT_UINT8,
+              BASE_HEX, VALS(clock_sync_vals), 0x04, NULL, HFILL }},
+        { &hf_ac_if_clksrc_attr_rsv,
+            { "Reserved", "usbaudio.ac_if_clksrc.bmAttributes.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xF8, "Must be zero", HFILL }},
+        { &hf_ac_if_clksrc_controls,
+            { "Controls", "usbaudio.ac_if_clksrc.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_clksrc_controls_freq,
+            { "Clock Frequency Control", "usbaudio.ac_if_clksrc.bmControls.freq", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x03, NULL, HFILL }},
+        { &hf_ac_if_clksrc_controls_validity,
+            { "Clock Validity Control", "usbaudio.ac_if_clksrc.bmControls.validity", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x0C, NULL, HFILL }},
+        { &hf_ac_if_clksrc_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_clksrc.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xF0, "Must be zero", HFILL }},
+        { &hf_ac_if_clksrc_assocterminal,
+            { "Terminal", "usbaudio.ac_if_clksrc.bAssocTerminal",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bAssocTerminal", HFILL }},
+        { &hf_ac_if_clksrc_clocksource,
+            { "String descriptor index", "usbaudio.ac_if_clksrc.iClockSource",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iClockSource", HFILL }},
+        { &hf_ac_if_clksel_id,
+            { "Clock Selector Entity", "usbaudio.ac_if_clksel.bClockID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bClockID", HFILL }},
+        { &hf_ac_if_clksel_nrpins,
+            { "Number of Input Pins", "usbaudio.ac_if_clksel.bNrInPins",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bNrInPins", HFILL }},
+        { &hf_ac_if_clksel_sourceid,
+            { "Connected Clock Entity", "usbaudio.ac_if_clksel.baCSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "baCSourceID", HFILL }},
+        { &hf_ac_if_clksel_controls,
+            { "Controls", "usbaudio.ac_if_clksel.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_ac_if_clksel_controls_clksel,
+            { "Clock Selector Control", "usbaudio.ac_if_clksel.bmControls.clksel", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_vals_ext, 0x03, NULL, HFILL }},
+        { &hf_ac_if_clksel_controls_rsv,
+            { "Reserved", "usbaudio.ac_if_clksel.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xFC, "Must be zero", HFILL }},
+        { &hf_ac_if_clksel_clockselector,
+            { "String descriptor index", "usbaudio.ac_if_clksel.iClockSelector",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "iClockSelector", HFILL }},
+        { &hf_as_if_desc_subtype,
+            { "Subtype", "usbaudio.as_if_subtype", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
+                &as_subtype_vals_ext, 0x0, "bDescriptorSubtype", HFILL }},
+        { &hf_as_if_gen_term_link,
+            { "Connected Terminal ID", "usbaudio.as_if_gen.bTerminalLink",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bTerminalLink", HFILL }},
+        { &hf_as_if_gen_delay,
+            { "Interface delay in frames", "usbaudio.as_if_gen.bDelay",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bDelay", HFILL }},
+        { &hf_as_if_gen_wformattag,
+            { "Format", "usbaudio.as_if_gen.wFormatTag", FT_UINT16, BASE_HEX|BASE_EXT_STRING,
+              &audio_data_format_tag_vals_ext, 0x0, "wFormatTag", HFILL }},
+        { &hf_as_if_gen_controls,
+            { "Controls", "usbaudio.as_if_gen.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x0, "bmControls", HFILL }},
+        { &hf_as_if_gen_controls_active,
+            { "Active Alternate Setting Control", "usbaudio.as_if_gen.bmControls.active", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_read_only_vals_ext, 0x03, NULL, HFILL }},
+        { &hf_as_if_gen_controls_valid,
+            { "Valid Alternate Settings Control", "usbaudio.as_if_gen.bmControls.valid", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_read_only_vals_ext, 0x0C, NULL, HFILL }},
+        { &hf_as_if_gen_controls_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xF0, "Must be zero", HFILL }},
+        { &hf_as_if_gen_formattype,
+            { "Format Type", "usbaudio.as_if_gen.bFormatType",
+              FT_UINT8, BASE_DEC, NULL, 0x0, "bFormatType", HFILL }},
+        { &hf_as_if_gen_formats,
+            { "Formats", "usbaudio.as_if_gen.bmFormats",
+              FT_UINT32, BASE_HEX, NULL, 0x0, "bmFormats", HFILL }},
+
+        { &hf_as_if_gen_formats_i_d0,
+            { "PCM", "usbaudio.as_if_gen.bmFormats.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_if_gen_formats_i_d1,
+            { "PCM8", "usbaudio.as_if_gen.bmFormats.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_if_gen_formats_i_d2,
+            { "IEEE Float", "usbaudio.as_if_gen.bmFormats.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_as_if_gen_formats_i_d3,
+            { "ALAW", "usbaudio.as_if_gen.bmFormats.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_as_if_gen_formats_i_d4,
+            { "MULAW", "usbaudio.as_if_gen.bmFormats.d4",
+              FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }},
+        { &hf_as_if_gen_formats_i_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv",
+              FT_UINT32, BASE_HEX, NULL, (0x7FFFFFE0u), "Must be zero", HFILL }},
+        { &hf_as_if_gen_formats_i_d31,
+            { "Type I Raw Data", "usbaudio.as_if_gen.bmFormats.d31",
+              FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }},
+
+        { &hf_as_if_gen_formats_ii_d0,
+            { "MPEG", "usbaudio.as_if_gen.bmFormats.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_if_gen_formats_ii_d1,
+            { "AC-3", "usbaudio.as_if_gen.bmFormats.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_if_gen_formats_ii_d2,
+            { "WMA", "usbaudio.as_if_gen.bmFormats.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_as_if_gen_formats_ii_d3,
+            { "DTS", "usbaudio.as_if_gen.bmFormats.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_as_if_gen_formats_ii_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv",
+              FT_UINT32, BASE_HEX, NULL, (0x7FFFFFF0u), "Must be zero", HFILL }},
+        { &hf_as_if_gen_formats_ii_d31,
+            { "Type II Raw Data", "usbaudio.as_if_gen.bmFormats.d31",
+              FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }},
+
+        { &hf_as_if_gen_formats_iii_d0,
+            { "IEC61937 AC-3", "usbaudio.as_if_gen.bmFormats.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d1,
+            { "IEC61937 MPEG-1 Layer1", "usbaudio.as_if_gen.bmFormats.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d2,
+            { "IEC61937 MPEG-1 Layer2/3 or IEC61937 MPEG-2 NOEXT", "usbaudio.as_if_gen.bmFormats.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d3,
+            { "IEC61937 MPEG-2 EXT", "usbaudio.as_if_gen.bmFormats.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d4,
+            { "IEC61937 MPEG-2 AAC ADTS", "usbaudio.as_if_gen.bmFormats.d4",
+              FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d5,
+            { "IEC61937 MPEG-2 Layer1 LS", "usbaudio.as_if_gen.bmFormats.d5",
+              FT_BOOLEAN, 32, NULL, (1u << 5), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d6,
+            { "IEC61937 MPEG-2 Layer2/3 LS", "usbaudio.as_if_gen.bmFormats.d6",
+              FT_BOOLEAN, 32, NULL, (1u << 6), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d7,
+            { "IEC61937 DTS-I", "usbaudio.as_if_gen.bmFormats.d7",
+              FT_BOOLEAN, 32, NULL, (1u << 7), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d8,
+            { "IEC61937 DTS-II", "usbaudio.as_if_gen.bmFormats.d8",
+              FT_BOOLEAN, 32, NULL, (1u << 8), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d9,
+            { "IEC61937 DTS-III", "usbaudio.as_if_gen.bmFormats.d9",
+              FT_BOOLEAN, 32, NULL, (1u << 9), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d10,
+            { "IEC61937 ATRAC", "usbaudio.as_if_gen.bmFormats.d10",
+              FT_BOOLEAN, 32, NULL, (1u << 10), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d11,
+            { "IEC61937 ATRAC2/3", "usbaudio.as_if_gen.bmFormats.d11",
+              FT_BOOLEAN, 32, NULL, (1u << 11), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_d12,
+            { "Type III WMA", "usbaudio.as_if_gen.bmFormats.d12",
+              FT_BOOLEAN, 32, NULL, (1u << 12), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iii_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv",
+              FT_UINT32, BASE_HEX, NULL, (0xFFFFE000u), "Must be zero", HFILL }},
+
+        { &hf_as_if_gen_formats_iv_d0,
+            { "PCM", "usbaudio.as_if_gen.bmFormats.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d1,
+            { "PCM8", "usbaudio.as_if_gen.bmFormats.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d2,
+            { "IEEE Float", "usbaudio.as_if_gen.bmFormats.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d3,
+            { "ALAW", "usbaudio.as_if_gen.bmFormats.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d4,
+            { "MULAW", "usbaudio.as_if_gen.bmFormats.d4",
+              FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d5,
+            { "MPEG", "usbaudio.as_if_gen.bmFormats.d5",
+              FT_BOOLEAN, 32, NULL, (1u << 5), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d6,
+            { "AC-3", "usbaudio.as_if_gen.bmFormats.d6",
+              FT_BOOLEAN, 32, NULL, (1u << 6), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d7,
+            { "WMA", "usbaudio.as_if_gen.bmFormats.d7",
+              FT_BOOLEAN, 32, NULL, (1u << 7), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d8,
+            { "IEC61937 AC-3", "usbaudio.as_if_gen.bmFormats.d8",
+              FT_BOOLEAN, 32, NULL, (1u << 8), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d9,
+            { "IEC61937 MPEG-1 Layer1", "usbaudio.as_if_gen.bmFormats.d9",
+              FT_BOOLEAN, 32, NULL, (1u << 9), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d10,
+            { "IEC61937 MPEG-1 Layer2/3 or IEC61937 MPEG-2 NOEXT", "usbaudio.as_if_gen.bmFormats.d10",
+              FT_BOOLEAN, 32, NULL, (1u << 10), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d11,
+            { "IEC61937 MPEG-2 EXT", "usbaudio.as_if_gen.bmFormats.d11",
+              FT_BOOLEAN, 32, NULL, (1u << 11), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d12,
+            { "IEC61937 MPEG-2 AAC ADTS", "usbaudio.as_if_gen.bmFormats.d12",
+              FT_BOOLEAN, 32, NULL, (1u << 12), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d13,
+            { "IEC61937 MPEG-2 Layer1 LS", "usbaudio.as_if_gen.bmFormats.d13",
+              FT_BOOLEAN, 32, NULL, (1u << 13), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d14,
+            { "IEC61937 MPEG-2 Layer2/3 LS", "usbaudio.as_if_gen.bmFormats.d14",
+              FT_BOOLEAN, 32, NULL, (1u << 14), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d15,
+            { "IEC61937 DTS-I", "usbaudio.as_if_gen.bmFormats.d15",
+              FT_BOOLEAN, 32, NULL, (1u << 15), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d16,
+            { "IEC61937 DTS-II", "usbaudio.as_if_gen.bmFormats.d16",
+              FT_BOOLEAN, 32, NULL, (1u << 16), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d17,
+            { "IEC61937 DTS-III", "usbaudio.as_if_gen.bmFormats.d17",
+              FT_BOOLEAN, 32, NULL, (1u << 17), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d18,
+            { "IEC61937 ATRAC", "usbaudio.as_if_gen.bmFormats.d18",
+              FT_BOOLEAN, 32, NULL, (1u << 18), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d19,
+            { "IEC61937 ATRAC2/3", "usbaudio.as_if_gen.bmFormats.d19",
+              FT_BOOLEAN, 32, NULL, (1u << 19), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d20,
+            { "Type III WMA", "usbaudio.as_if_gen.bmFormats.d20",
+              FT_BOOLEAN, 32, NULL, (1u << 20), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_d21,
+            { "IEC60958 PCM", "usbaudio.as_if_gen.bmFormats.d21",
+              FT_BOOLEAN, 32, NULL, (1u << 21), NULL, HFILL }},
+        { &hf_as_if_gen_formats_iv_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmFormats.rsv",
+              FT_UINT32, BASE_HEX, NULL, (0xFFE00000u), "Must be zero", HFILL }},
+
+        { &hf_as_if_gen_nrchannels,
+            { "Number of channels", "usbaudio.as_if_gen.bNrChannels",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bNrChannels", HFILL }},
+        { &hf_as_if_gen_bmchannelconfig,
+            { "Channel Config", "usbaudio.as_if_gen.bmChannelConfig",
+              FT_UINT32, BASE_HEX, NULL, 0x0, "bmChannelConfig", HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d0,
+            { "Front Left", "usbaudio.as_if_gen.bmChannelConfig.d0",
+              FT_BOOLEAN, 32, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d1,
+            { "Front Right", "usbaudio.as_if_gen.bmChannelConfig.d1",
+              FT_BOOLEAN, 32, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d2,
+            { "Front Center", "usbaudio.as_if_gen.bmChannelConfig.d2",
+              FT_BOOLEAN, 32, NULL, (1u << 2), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d3,
+            { "Low Frequency Effects", "usbaudio.as_if_gen.bmChannelConfig.d3",
+              FT_BOOLEAN, 32, NULL, (1u << 3), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d4,
+            { "Back Left", "usbaudio.as_if_gen.bmChannelConfig.d4",
+              FT_BOOLEAN, 32, NULL, (1u << 4), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d5,
+            { "Back Right", "usbaudio.as_if_gen.bmChannelConfig.d5",
+              FT_BOOLEAN, 32, NULL, (1u << 5), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d6,
+            { "Front Left of Center", "usbaudio.as_if_gen.bmChannelConfig.d6",
+              FT_BOOLEAN, 32, NULL, (1u << 6), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d7,
+            { "Front Right of Center", "usbaudio.as_if_gen.bmChannelConfig.d7",
+              FT_BOOLEAN, 32, NULL, (1u << 7), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d8,
+            { "Back Center", "usbaudio.as_if_gen.bmChannelConfig.d8",
+              FT_BOOLEAN, 32, NULL, (1u << 8), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d9,
+            { "Side Left", "usbaudio.as_if_gen.bmChannelConfig.d9",
+              FT_BOOLEAN, 32, NULL, (1u << 9), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d10,
+            { "Side Right", "usbaudio.as_if_gen.bmChannelConfig.d10",
+              FT_BOOLEAN, 32, NULL, (1u << 10), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d11,
+            { "Top Center", "usbaudio.as_if_gen.bmChannelConfig.d11",
+              FT_BOOLEAN, 32, NULL, (1u << 11), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d12,
+            { "Top Front Left", "usbaudio.as_if_gen.bmChannelConfig.d12",
+              FT_BOOLEAN, 32, NULL, (1u << 12), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d13,
+            { "Top Front Center", "usbaudio.as_if_gen.bmChannelConfig.d13",
+              FT_BOOLEAN, 32, NULL, (1u << 13), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d14,
+            { "Top Front Right", "usbaudio.as_if_gen.bmChannelConfig.d14",
+              FT_BOOLEAN, 32, NULL, (1u << 14), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d15,
+            { "Top Back Left", "usbaudio.as_if_gen.bmChannelConfig.d15",
+              FT_BOOLEAN, 32, NULL, (1u << 15), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d16,
+            { "Top Back Center", "usbaudio.as_if_gen.bmChannelConfig.d16",
+              FT_BOOLEAN, 32, NULL, (1u << 16), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d17,
+            { "Top Back Right", "usbaudio.as_if_gen.bmChannelConfig.d17",
+              FT_BOOLEAN, 32, NULL, (1u << 17), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d18,
+            { "Top Front Left of Center", "usbaudio.as_if_gen.bmChannelConfig.d18",
+              FT_BOOLEAN, 32, NULL, (1u << 18), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d19,
+            { "Top Front Right of Center", "usbaudio.as_if_gen.bmChannelConfig.d19",
+              FT_BOOLEAN, 32, NULL, (1u << 19), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d20,
+            { "Left Low Frequency Effects", "usbaudio.as_if_gen.bmChannelConfig.d20",
+              FT_BOOLEAN, 32, NULL, (1u << 20), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d21,
+            { "Right Low Frequency Effects", "usbaudio.as_if_gen.bmChannelConfig.d21",
+              FT_BOOLEAN, 32, NULL, (1u << 21), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d22,
+            { "Top Side Left", "usbaudio.as_if_gen.bmChannelConfig.d22",
+              FT_BOOLEAN, 32, NULL, (1u << 22), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d23,
+            { "Top Side Right", "usbaudio.as_if_gen.bmChannelConfig.d23",
+              FT_BOOLEAN, 32, NULL, (1u << 23), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d24,
+            { "Bottom Center", "usbaudio.as_if_gen.bmChannelConfig.d24",
+              FT_BOOLEAN, 32, NULL, (1u << 24), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d25,
+            { "Back Left of Center", "usbaudio.as_if_gen.bmChannelConfig.d25",
+              FT_BOOLEAN, 32, NULL, (1u << 25), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d26,
+            { "Back Right of Center", "usbaudio.as_if_gen.bmChannelConfig.d26",
+              FT_BOOLEAN, 32, NULL, (1u << 26), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_rsv,
+            { "Reserved", "usbaudio.as_if_gen.bmChannelConfig.rsv",
+              FT_BOOLEAN, 32, NULL, (0xFu << 27), NULL, HFILL }},
+        { &hf_as_if_gen_bmchannelconfig_d31,
+            { "Raw Data", "usbaudio.as_if_gen.bmChannelConfig.d31",
+              FT_BOOLEAN, 32, NULL, (1u << 31), NULL, HFILL }},
+        { &hf_as_if_gen_channelnames,
+            { "String descriptor index", "usbaudio.as_if_gen.iChannelNames",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "iChannelNames", HFILL }},
+
+        { &hf_as_if_ft_formattype,
+            { "FormatType", "usbaudio.as_if_ft.bFormatType",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "wFormatType", HFILL }},
+        { &hf_as_if_ft_maxbitrate,
+            { "Max Bit Rate", "usbaudio.as_if_ft.wMaxBitRate",
+              FT_UINT16, BASE_DEC, NULL, 0x00, "wMaxBitRate", HFILL }},
+        { &hf_as_if_ft_nrchannels,
+            { "Number Channels", "usbaudio.as_if_ft.bNrChannels",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bNrChannels", HFILL }},
+        { &hf_as_if_ft_subframesize,
+            { "Subframe Size", "usbaudio.as_if_ft.bSubframeSize",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bSubframeSize", HFILL }},
+        { &hf_as_if_ft_subslotsize,
+            { "Subslot Size", "usbaudio.as_if_ft.bSubslotSize",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bSubslotSize", HFILL }},
+        { &hf_as_if_ft_bitresolution,
+            { "Bit Resolution", "usbaudio.as_if_ft.bBitResolution",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bBitResolution", HFILL }},
+        { &hf_as_if_ft_samplesperframe,
+            { "Samples Per Frame", "usbaudio.as_if_ft.wSamplesPerFrame",
+              FT_UINT16, BASE_DEC, NULL, 0x00, "wSamplesPerFrame", HFILL }},
+        { &hf_as_if_ft_samfreqtype,
+            { "Samples Frequence Type", "usbaudio.as_if_ft.bSamFreqType",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bSamFreqType", HFILL }},
+        { &hf_as_if_ft_lowersamfreq,
+            { "Lower Samples Frequence", "usbaudio.as_if_ft.tLowerSamFreq",
+              FT_UINT24, BASE_DEC, NULL, 0x00, "tLowerSamFreq", HFILL }},
+        { &hf_as_if_ft_uppersamfreq,
+            { "Upper Samples Frequence", "usbaudio.as_if_ft.tUpperSamFreq",
+              FT_UINT24, BASE_DEC, NULL, 0x00, "tUpperSamFreq", HFILL }},
+        { &hf_as_if_ft_samfreq,
+            { "Samples Frequence", "usbaudio.as_if_ft.tSamFreq",
+              FT_UINT24, BASE_DEC, NULL, 0x00, "tSamFreq", HFILL }},
+        { &hf_as_ep_desc_subtype,
+            { "Subtype", "usbaudio.as_ep_subtype", FT_UINT8,
+                BASE_HEX, VALS(as_ep_subtype_vals), 0x00, "bDescriptorSubtype", HFILL }},
+        { &hf_as_ep_gen_bmattributes,
+            { "Attributes", "usbaudio.as_ep_gen.bmAttributes", FT_UINT8,
+              BASE_HEX, NULL, 0x00, "bmAttributes", HFILL }},
+        { &hf_as_ep_gen_bmattributes_d0,
+            { "Sampling Frequency Control", "usbaudio.as_ep_gen.bmAttributes.d0", FT_BOOLEAN,
+              8, NULL, (1u << 0), NULL, HFILL }},
+        { &hf_as_ep_gen_bmattributes_d1,
+            { "Pitch Control", "usbaudio.as_ep_gen.bmAttributes.d1", FT_BOOLEAN,
+              8, NULL, (1u << 1), NULL, HFILL }},
+        { &hf_as_ep_gen_bmattributes_rsv,
+            { "Reserved", "usbaudio.as_ep_gen.bmAttributes.rsv", FT_UINT8,
+              BASE_HEX, NULL, 0x7C, NULL, HFILL }},
+        { &hf_as_ep_gen_bmattributes_d7,
+            { "MaxPacketsOnly", "usbaudio.as_ep_gen.bmAttributes.d7", FT_BOOLEAN,
+              8, NULL, (1u << 7), NULL, HFILL }},
+        { &hf_as_ep_gen_controls,
+            { "Controls", "usbaudio.as_ep_gen.bmControls",
+              FT_UINT8, BASE_HEX, NULL, 0x00, "bmControls", HFILL }},
+        { &hf_as_ep_gen_controls_pitch,
+            { "Pitch Control", "usbaudio.as_ep_gen.bmControls.pitch", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_read_only_vals_ext, 0x03, NULL, HFILL }},
+        { &hf_as_ep_gen_controls_data_overrun,
+            { "Data Overrun Control", "usbaudio.as_ep_gen.bmControls.overrun", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_read_only_vals_ext, 0x0C, NULL, HFILL }},
+        { &hf_as_ep_gen_controls_data_underrun,
+            { "Valid Alternate Settings Control", "usbaudio.as_ep_gen.bmControls.underrun", FT_UINT8,
+              BASE_HEX|BASE_EXT_STRING, &controls_capabilities_read_only_vals_ext, 0x30, NULL, HFILL }},
+        { &hf_as_ep_gen_controls_rsv,
+            { "Reserved", "usbaudio.as_ep_gen.bmControls.bmControls.rsv",
+              FT_UINT8, BASE_HEX, NULL, 0xC0, "Must be zero", HFILL }},
+        { &hf_as_ep_gen_lockdelayunits,
+            { "Lock Delay Units", "usbaudio.as_ep_gen.bLockDelayUnits",
+              FT_UINT8, BASE_DEC, VALS(lock_delay_unit_vals), 0x00, NULL, HFILL }},
+        { &hf_as_ep_gen_lockdelay,
+            { "Lock Delay", "usbaudio.as_ep_gen.wLockDelay",
+              FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+
+        { &hf_ms_if_desc_subtype,
+            { "Subtype", "usbaudio.ms_if_subtype", FT_UINT8, BASE_HEX|BASE_EXT_STRING,
+              &ms_if_subtype_vals_ext, 0x0, "bDescriptorSubtype", HFILL }},
+        { &hf_ms_if_hdr_ver,
+            { "Version", "usbaudio.ms_if_hdr.bcdADC",
+              FT_DOUBLE, BASE_NONE, NULL, 0, "bcdADC", HFILL }},
+        { &hf_ms_if_hdr_total_len,
+            { "Total length", "usbaudio.ms_if_hdr.wTotalLength",
+              FT_UINT16, BASE_DEC, NULL, 0x00, "wTotalLength", HFILL }},
+        { &hf_ms_if_midi_in_bjacktype,
+            { "Jack Type", "usbaudio.ms_if_midi_in.bJackType",
+              FT_UINT8, BASE_HEX, VALS(ms_midi_jack_type_vals), 0x00, "bJackType", HFILL }},
+        { &hf_ms_if_midi_in_bjackid,
+            { "Jack ID", "usbaudio.ms_if_midi_in.bJackID",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bJackID", HFILL }},
+        { &hf_ms_if_midi_in_ijack,
+            { "String descriptor index", "usbaudio.ms_if_midi_in.iJack",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "iJack", HFILL }},
+        { &hf_ms_if_midi_out_bjacktype,
+            { "Jack Type", "usbaudio.ms_if_midi_out.bJackType",
+              FT_UINT8, BASE_HEX, VALS(ms_midi_jack_type_vals), 0x00, "bJackType", HFILL }},
+        { &hf_ms_if_midi_out_bjackid,
+            { "Jack ID", "usbaudio.ms_if_midi_out.bJackID",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bJackID", HFILL }},
+       { &hf_ms_if_midi_out_bnrinputpins,
+            { "Number of Input Pins", "usbaudio.ms_if_midi_out.bNrInputPins",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "bNrInputPins", HFILL }},
+        { &hf_ms_if_midi_out_basourceid,
+            { "Connected MIDI Entity", "usbaudio.ms_if_midi_out.baSourceID",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "baSourceID", HFILL }},
+        { &hf_ms_if_midi_out_basourcepin,
+            { "Entity Output Pin", "usbaudio.ms_if_midi_out.BaSourcePin",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "BaSourcePin", HFILL }},
+        { &hf_ms_if_midi_out_ijack,
+            { "String descriptor index", "usbaudio.ms_if_midi_out.iJack",
+              FT_UINT8, BASE_DEC, NULL, 0x00, "iJack", HFILL }},
+
+        { &hf_ms_ep_desc_subtype,
+            { "Subtype", "usbaudio.ms_ep_subtype", FT_UINT8,
+              BASE_HEX, VALS(ms_ep_subtype_vals), 0x00, "bDescriptorSubtype", HFILL }},
+        { &hf_ms_ep_gen_numjacks,
+            { "Number of Embedded MIDI Jacks", "usbaudio.ms_ep_gen.bNumEmbMIDIJack", FT_UINT8,
+              BASE_DEC, NULL, 0x00, "bNumEmbMIDIJack", HFILL }},
+        { &hf_ms_ep_gen_baassocjackid,
+            { "Associated Embedded Jack ID", "usbaudio.ms_ep_gen.baAssocJackID", FT_UINT8,
+              BASE_DEC, NULL, 0x00, "baAssocJackID", HFILL }},
+
+        { &hf_sysex_msg_fragments,
+            { "Message fragments", "usbaudio.sysex.fragments",
+              FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment,
+            { "Message fragment", "usbaudio.sysex.fragment",
+              FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_overlap,
+            { "Message fragment overlap", "usbaudio.sysex.fragment.overlap",
+              FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_overlap_conflicts,
+            { "Message fragment overlapping with conflicting data",
+              "usbaudio.sysex.fragment.overlap.conflicts",
+              FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_multiple_tails,
+            { "Message has multiple tail fragments",
+              "usbaudio.sysex.fragment.multiple_tails",
+              FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_too_long_fragment,
+            { "Message fragment too long", "usbaudio.sysex.fragment.too_long_fragment",
+              FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_error,
+            { "Message defragmentation error", "usbaudio.sysex.fragment.error",
+              FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_fragment_count,
+            { "Message fragment count", "usbaudio.sysex.fragment.count",
+              FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_reassembled_in,
+            { "Reassembled in", "usbaudio.sysex.reassembled.in",
+              FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_reassembled_length,
+            { "Reassembled length", "usbaudio.sysex.reassembled.length",
+              FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }},
+        { &hf_sysex_msg_reassembled_data,
+            { "Reassembled data", "usbaudio.sysex.reassembled.data",
+              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }}
+    };
+
+    static gint *usb_audio_subtrees[] = {
+        &ett_usb_audio,
+        &ett_usb_audio_desc,
+        &ett_sysex_msg_fragment,
+        &ett_sysex_msg_fragments,
+        &ett_ac_if_hdr_controls,
+        &ett_ac_if_fu_controls,
+        &ett_ac_if_fu_controls0,
+        &ett_ac_if_fu_controls1,
+        &ett_ac_if_fu_controls_v2,
+        &ett_ac_if_fu_control_v2,
+        &ett_ac_if_su_sourceids,
+        &ett_ac_if_su_controls,
+        &ett_ac_if_input_wchannelconfig,
+        &ett_ac_if_input_bmchannelconfig,
+        &ett_ac_if_input_controls,
+        &ett_ac_if_output_controls,
+        &ett_ac_if_mu_channelconfig,
+        &ett_ac_if_clksrc_attr,
+        &ett_ac_if_clksrc_controls,
+        &ett_ac_if_clksel_controls,
+        &ett_as_if_gen_controls,
+        &ett_as_if_gen_formats,
+        &ett_as_if_gen_bmchannelconfig,
+        &ett_as_ep_gen_attributes,
+        &ett_as_ep_gen_controls
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_usb_audio_undecoded, { "usbaudio.undecoded", PI_UNDECODED, PI_WARN, "Not dissected yet (report to wireshark.org)", EXPFILL }},
+        { &ei_usb_audio_invalid_feature_unit_length, { "usbaudio.ac_if_fu.invalid_length", PI_MALFORMED, PI_ERROR, "Descriptor size is not 7+(ch+1)*n where n=bControlSize", EXPFILL }},
+        { &ei_usb_audio_invalid_type_3_ft_nrchannels, { "usbaudio.as_if_ft.bNrChannels.invalid_value", PI_MALFORMED, PI_ERROR, "bNrChannels must be 2 for Type III Format Type descriptors", EXPFILL }},
+        { &ei_usb_audio_invalid_type_3_ft_subframesize, { "usbaudio.as_if_ft.subframesize.invalid_value", PI_MALFORMED, PI_ERROR, "bSubFrameSize must be 2 for Type III Format Type descriptors", EXPFILL }},
+        { &ei_usb_audio_invalid_type_3_ft_bitresolution, { "usbaudio.hf_as_if_ft_bitresolution.invalid_value", PI_MALFORMED, PI_ERROR, "bBitResolution must be 16 for Type III Format Type descriptors", EXPFILL }},
+    };
+
+    expert_module_t *expert_usb_audio;
+
+    proto_usb_audio = proto_register_protocol("USB Audio", "USBAUDIO", "usbaudio");
+    proto_register_field_array(proto_usb_audio, hf, array_length(hf));
+    proto_register_subtree_array(usb_audio_subtrees, array_length(usb_audio_subtrees));
+    expert_usb_audio = expert_register_protocol(proto_usb_audio);
+    expert_register_field_array(expert_usb_audio, ei, array_length(ei));
+    reassembly_table_register(&midi_data_reassembly_table,
+                          &addresses_reassembly_table_functions);
+
+    usb_audio_bulk_handle = register_dissector("usbaudio", dissect_usb_audio_bulk, proto_usb_audio);
+    usb_audio_descr_handle = register_dissector("usbaudio.bulk",  dissect_usb_audio_descriptor, proto_usb_audio);
+}
+
+void
+proto_reg_handoff_usb_audio(void)
+{
+    dissector_add_uint("usb.descriptor", IF_CLASS_AUDIO, usb_audio_descr_handle);
+
+    dissector_add_uint("usb.bulk", IF_CLASS_AUDIO, usb_audio_bulk_handle);
+
+    sysex_handle = find_dissector_add_dependency("sysex", proto_usb_audio);
+}
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */