Updates on AVB IEEE 1722 protocol to support more 1722 subtypes.

packet-ieee1722.c now contains the entire protocol.
packet-ieee1722a.c file was removed, because the term 1722a is outdated
and now part of 1722 protocol.

Change-Id: Ic2f44a2752f9254cde62d878dc971f09cddc5adc
Reviewed-on: https://code.wireshark.org/review/15810
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 918 insertions, 781 deletions

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 9fe553e09a..68e1da5159 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -753,7 +753,6 @@ set(DISSECTOR_SRC
 	packet-iec104.c
 	packet-ieee1722.c
 	packet-ieee17221.c
-	packet-ieee1722a.c
 	packet-ieee80211-netmon.c
 	packet-ieee80211-prism.c
 	packet-ieee80211-radio.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index efb668a9bd..e1665e2d8d 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -736,7 +736,6 @@ DISSECTOR_SRC = \
 	packet-iec104.c		\
 	packet-ieee1722.c	\
 	packet-ieee17221.c	\
-	packet-ieee1722a.c	\
 	packet-ieee80211-netmon.c	\
 	packet-ieee80211-prism.c	\
 	packet-ieee80211-radio.c	\
diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c
index ed79f36f0b..6e1a5c9b8f 100644
--- a/epan/dissectors/packet-ieee1722.c
+++ b/epan/dissectors/packet-ieee1722.c
@@ -6,6 +6,9 @@
  *
  * Copyright 2011, Thomas Bottom <tom.bottom@labxtechnologies.com>
  *
+ * Copyright 2016, Andreas Leibold <andreas.leibold@harman.com>
+ *                 This file contains all 1722 dissectors.
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -37,92 +40,161 @@
 
 void proto_register_1722(void);
 void proto_reg_handoff_1722(void);
+void proto_register_1722_crf(void);
+void proto_reg_handoff_1722_crf(void);
+void proto_register_1722_aaf(void);
+void proto_reg_handoff_1722_aaf(void);
+void proto_register_1722_61883(void);
+void proto_reg_handoff_1722_61883(void);
 
-/* 1722 Offsets */
-#define IEEE_1722_CD_OFFSET                  0
-#define IEEE_1722_VERSION_OFFSET             1
-#define IEEE_1722_SEQ_NUM_OFFSET             2
-#define IEEE_1722_TU_FIELD_OFFSET            3
-#define IEEE_1722_STREAM_ID_OFFSET           4
-#define IEEE_1722_TIMESTAMP_OFFSET          12
-#define IEEE_1722_GW_INFO_OFFSET            16
-#define IEEE_1722_PKT_DATA_LENGTH_OFFSET    20
-#define IEEE_1722_TAG_OFFSET                22
-#define IEEE_1722_TCODE_OFFSET              23
-#define IEEE_1722_SID_OFFSET                24
-#define IEEE_1722_DBS_OFFSET                25
-#define IEEE_1722_FN_OFFSET                 26
-#define IEEE_1722_DBC_OFFSET                27
-#define IEEE_1722_FMT_OFFSET                28
-#define IEEE_1722_FDF_OFFSET                29
-#define IEEE_1722_SYT_OFFSET                30
-#define IEEE_1722_DATA_OFFSET               32
-
-#define IEEE_1722_CIP_HEADER_SIZE    8
 
 /* Bit Field Masks */
-#define IEEE_1722_CD_MASK       0x80
-#define IEEE_1722_SUBTYPE_MASK  0x7f
-#define IEEE_1722_SV_MASK       0x80
-#define IEEE_1722_VER_MASK      0x70
-#define IEEE_1722_MR_MASK       0x08
-#define IEEE_1722_GV_MASK       0x02
-#define IEEE_1722_TV_MASK       0x01
-#define IEEE_1722_TU_MASK       0x01
-#define IEEE_1722_TAG_MASK      0xc0
-#define IEEE_1722_CHANNEL_MASK  0x3f
-#define IEEE_1722_TCODE_MASK    0xf0
-#define IEEE_1722_SY_MASK       0x0f
-#define IEEE_1722_SID_MASK      0x3f
-#define IEEE_1722_FN_MASK       0xc0
-#define IEEE_1722_QPC_MASK      0x38
-#define IEEE_1722_SPH_MASK      0x04
-#define IEEE_1722_FMT_MASK      0x3f
+#define IEEE_1722_SV_MASK        0x80
+#define IEEE_1722_VER_MASK       0x70
+#define IEEE_1722_SUBTYPE_MASK   0x7F
 
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
+static int proto_1722_crf = -1;
+static int hf_1722_crf_mrfield = -1;
+static int hf_1722_crf_fsfield = -1;
+static int hf_1722_crf_tufield = -1;
+static int hf_1722_crf_seqnum = -1;
+static int hf_1722_crf_type = -1;
+static int hf_1722_crf_stream_id = -1;
+static int hf_1722_crf_pull = -1;
+static int hf_1722_crf_base_frequency = -1;
+static int hf_1722_crf_data_length = -1;
+static int hf_1722_crf_timestamp_interval = -1;
+static int hf_1722_crf_timestamp_data = -1;
+static int hf_1722_crf_timestamp = -1;
+
+static int proto_1722_aaf = -1;
+static int hf_1722_aaf_mrfield = -1;
+static int hf_1722_aaf_tvfield = -1;
+static int hf_1722_aaf_seqnum = -1;
+static int hf_1722_aaf_tufield = -1;
+static int hf_1722_aaf_stream_id = -1;
+static int hf_1722_aaf_avtp_timestamp = -1;
+static int hf_1722_aaf_format = -1;
+static int hf_1722_aaf_nominal_sample_rate = -1;
+static int hf_1722_aaf_bit_depth = -1;
+static int hf_1722_aaf_stream_data_length = -1;
+static int hf_1722_aaf_sparse_timestamp = -1;
+static int hf_1722_aaf_evtfield = -1;
+static int hf_1722_aaf_channels_per_frame = -1;
+static int hf_1722_aaf_data = -1;
+static int hf_1722_aaf_sample = -1;
+
 static int proto_1722 = -1;
-static int hf_1722_cdfield = -1;
 static int hf_1722_subtype = -1;
 static int hf_1722_svfield = -1;
 static int hf_1722_verfield = -1;
-static int hf_1722_mrfield = -1;
-static int hf_1722_gvfield = -1;
-static int hf_1722_tvfield = -1;
-static int hf_1722_seqnum = -1;
-static int hf_1722_tufield = -1;
-static int hf_1722_stream_id = -1;
-static int hf_1722_avbtp_timestamp = -1;
-static int hf_1722_gateway_info = -1;
-static int hf_1722_packet_data_length = -1;
-static int hf_1722_tag = -1;
-static int hf_1722_channel = -1;
-static int hf_1722_tcode = -1;
-static int hf_1722_sy = -1;
-static int hf_1722_sid = -1;
-static int hf_1722_dbs = -1;
-static int hf_1722_fn = -1;
-static int hf_1722_qpc = -1;
-static int hf_1722_sph = -1;
-static int hf_1722_dbc = -1;
-static int hf_1722_fmt = -1;
-static int hf_1722_fdf = -1;
-static int hf_1722_syt = -1;
-static int hf_1722_data = -1;
-static int hf_1722_label = -1;
-static int hf_1722_sample = -1;
+
+static int proto_1722_61883 = -1;
+static int hf_1722_61883_mrfield = -1;
+static int hf_1722_61883_gvfield = -1;
+static int hf_1722_61883_tvfield = -1;
+static int hf_1722_61883_seqnum = -1;
+static int hf_1722_61883_tufield = -1;
+static int hf_1722_61883_stream_id = -1;
+static int hf_1722_61883_avtp_timestamp = -1;
+static int hf_1722_61883_gateway_info = -1;
+static int hf_1722_61883_stream_data_length = -1;
+static int hf_1722_61883_tag = -1;
+static int hf_1722_61883_channel = -1;
+static int hf_1722_61883_tcode = -1;
+static int hf_1722_61883_sy = -1;
+static int hf_1722_61883_cip_qi1 = -1;
+static int hf_1722_61883_cip_sid = -1;
+static int hf_1722_61883_cip_dbs = -1;
+static int hf_1722_61883_cip_fn = -1;
+static int hf_1722_61883_cip_qpc = -1;
+static int hf_1722_61883_cip_sph = -1;
+static int hf_1722_61883_cip_dbc = -1;
+static int hf_1722_61883_cip_qi2 = -1;
+static int hf_1722_61883_cip_fmt = -1;
+static int hf_1722_61883_cip_fdf = -1;
+static int hf_1722_61883_cip_syt = -1;
+static int hf_1722_61883_audio_data = -1;
+static int hf_1722_61883_label = -1;
+static int hf_1722_61883_sample = -1;
+static int hf_1722_61883_video_data = -1;
+static int hf_1722_61883_source_packet_header_timestamp = -1;
 
 /* Initialize the subtree pointers */
+static int ett_1722_crf = -1;
+static int ett_1722_crf_timestamp = -1;
+
+static int ett_1722_aaf = -1;
+static int ett_1722_aaf_audio = -1;
+static int ett_1722_aaf_sample = -1;
+
+static int ett_1722_61883 = -1;
+static int ett_1722_61883_audio = -1;
+static int ett_1722_61883_sample = -1;
+
 static int ett_1722 = -1;
-static int ett_1722_audio = -1;
-static int ett_1722_sample = -1;
 
-static expert_field ei_1722_incorrect_dbs = EI_INIT;
+static expert_field ei_clock_reference_type = EI_INIT;
+static expert_field ei_crf_datalen = EI_INIT;
+
+static expert_field ei_sample_width = EI_INIT;
+static expert_field ei_channels_per_frame = EI_INIT;
+static expert_field ei_format_reserved = EI_INIT;
+
+static expert_field ei_1722_61883_incorrect_tag = EI_INIT;
+static expert_field ei_1722_61883_incorrect_tcode = EI_INIT;
+static expert_field ei_1722_61883_incorrect_qi1 = EI_INIT;
+static expert_field ei_1722_61883_incorrect_qpc = EI_INIT;
+static expert_field ei_1722_61883_incorrect_qi2 = EI_INIT;
+static expert_field ei_1722_61883_unknown_format = EI_INIT;
 
 static dissector_table_t avb_dissector_table;
 
-static const true_false_string tfs_ieee1722_control_data = { "Control", "Data" };
+#define IEEE_1722_SUBTYPE_61883             0x00
+#define IEEE_1722_SUBTYPE_AAF               0x02
+#define IEEE_1722_SUBTYPE_CRF               0x04
+
+/* 1722 CRF */
+#define IEEE_1722_MR_MASK                   0x08
+#define IEEE_1722_FS_MASK                   0x02
+#define IEEE_1722_TU_MASK                   0x01
+#define IEEE_1722_PULL_MASK                 0xe0000000
+#define IEEE_1722_BASE_FREQUENCY_MASK       0x1fffffff
+
+#define IEEE_1722_CRF_TIMESTAMP_SIZE        8 /* size of the CRF timestamp in bytes */
+
+#define CLOCK_MULTIPLIER_0                  0
+#define CLOCK_MULTIPLIER_1                  1
+#define CLOCK_MULTIPLIER_2                  2
+#define CLOCK_MULTIPLIER_3                  3
+#define CLOCK_MULTIPLIER_4                  4
+#define CLOCK_MULTIPLIER_5                  5
+static const value_string pull_vals [] = {
+    {CLOCK_MULTIPLIER_0,       "[1.0]"},
+    {CLOCK_MULTIPLIER_1,       "[1/1.001]"},
+    {CLOCK_MULTIPLIER_2,       "[1.001]"},
+    {CLOCK_MULTIPLIER_3,       "[24/25]"},
+    {CLOCK_MULTIPLIER_4,       "[25/24]"},
+    {CLOCK_MULTIPLIER_5,       "[1/8]"},
+    {0,                          NULL}
+};
+
+#define CRF_TYPE_USER                       0
+#define CRF_TYPE_AUDIO_SAMPLE               1
+#define CRF_TYPE_VIDEO_FRAME_SYNC           2
+#define CRF_TYPE_VIDEO_LINE_SYNC            3
+#define CRF_TYPE_MACHINE_CYCLE              4
+static const value_string type_vals [] = {
+    {CRF_TYPE_USER,                  "User Specified"},
+    {CRF_TYPE_AUDIO_SAMPLE,          "Audio Sample Timestamp"},
+    {CRF_TYPE_VIDEO_FRAME_SYNC,      "Video Frame Sync Timestamp"},
+    {CRF_TYPE_VIDEO_LINE_SYNC,       "Video Line Sync Timestamp"},
+    {CRF_TYPE_MACHINE_CYCLE,         "Machine Cycle Timestamp"},
+    {0,                              NULL}
+};
 
 
 static const range_string ieee1722_subtype_range_vals[] = {
@@ -140,276 +212,879 @@ static const range_string ieee1722_subtype_range_vals[] = {
     { 0,0,             NULL }
 };
 
-static int
-dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+static int dissect_1722_crf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
     proto_item *ti;
-    proto_tree *ieee1722_tree = NULL;
+    proto_tree *ieee1722_crf_tree;
+    proto_tree *timestamp_tree;
+    gint        offset = 1;
+    guint32     datalen;
+    guint       j;
+    const gint *fields[] = {
+        &hf_1722_crf_mrfield,
+        &hf_1722_crf_fsfield,
+        &hf_1722_crf_tufield,
+        NULL
+    };
+    const gint *pull_frequency[] = {
+        &hf_1722_crf_pull,
+        &hf_1722_crf_base_frequency,
+        NULL
+    };
+
+    ti = proto_tree_add_item(tree, proto_1722_crf, tvb, 0, -1, ENC_NA);
+    ieee1722_crf_tree = proto_item_add_subtree(ti, ett_1722_crf);
+
+    proto_tree_add_bitmask_list(ieee1722_crf_tree, tvb, offset, 1, fields, ENC_NA);
+    offset += 1;
+    proto_tree_add_item(ieee1722_crf_tree, hf_1722_crf_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_crf_tree, hf_1722_crf_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_crf_tree, hf_1722_crf_stream_id, tvb, offset, 8, ENC_BIG_ENDIAN);
+    offset += 8;
+    proto_tree_add_bitmask_list(ieee1722_crf_tree, tvb, offset, 4, pull_frequency, ENC_NA);
+    offset += 4;
+    ti = proto_tree_add_item_ret_uint(ieee1722_crf_tree, hf_1722_crf_data_length, tvb, offset, 2, ENC_BIG_ENDIAN, &datalen);
+    proto_item_append_text(ti, " bytes");
+    offset += 2;
+    proto_tree_add_item(ieee1722_crf_tree, hf_1722_crf_timestamp_interval, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /* Make the Timestamp tree. */
+    ti = proto_tree_add_item(ieee1722_crf_tree, hf_1722_crf_timestamp_data, tvb, offset, datalen, ENC_NA);
+    timestamp_tree = proto_item_add_subtree(ti, ett_1722_crf_timestamp);
+
+    if (datalen%8)
+    {
+        expert_add_info(pinfo, ti, &ei_crf_datalen);
+    }
+    else
+    {
+        /* Loop through all timestamps and add them to the timestamp tree. */
+        for (j = 0; j < (datalen / IEEE_1722_CRF_TIMESTAMP_SIZE); j++)
+        {
+            ti = proto_tree_add_item(timestamp_tree, hf_1722_crf_timestamp, tvb, offset, IEEE_1722_CRF_TIMESTAMP_SIZE, ENC_BIG_ENDIAN);
+            proto_item_prepend_text(ti, "Timestamp %d ", j);
+            offset += IEEE_1722_CRF_TIMESTAMP_SIZE;
+        }
+    }
+
+    return tvb_captured_length(tvb);
+}
+
+/* Bit Field Masks */
+/* 1722 AAF */
+#define IEEE_1722_MR_MASK                               0x08
+#define IEEE_1722_TV_MASK                               0x01
+#define IEEE_1722_SEQ_NUM_MASK                          0x00
+#define IEEE_1722_TU_MASK                               0x01
+#define IEEE_1722_STREAM_ID_MASK                        0x00
+#define IEEE_1722_TIMESTAMP_MASK                        0x00
+#define IEEE_1722_FORMAT_MASK                           0x00
+#define IEEE_1722_NOM_SAMPLE_RATE_MASK                  0xf000
+#define IEEE_1722_CHANNEL_PER_FRAME_MASK                0x03ff
+#define IEEE_1722_BIT_DEPTH_MASK                        0x00
+#define IEEE_1722_STREAM_DATA_LENGTH_MASK               0x00
+#define IEEE_1722_SP_MASK                               0x10
+#define IEEE_1722_EVT_MASK                              0x0f
+#define IEEE_1722_DATA_MASK                             0x00
+#define IEEE_1722_SAMPLE_MASK                           0x00
+
+#define FORMAT_INFO_USER_SPECIFIED                      0
+#define FORMAT_INFO_32FLOAT                             1
+#define FORMAT_INFO_32INTEGER                           2
+#define FORMAT_INFO_24INTEGER                           3
+#define FORMAT_INFO_16INTEGER                           4
+#define FORMAT_INFO_32AES3                              5
+static const value_string format_info_vals [] = {
+    {FORMAT_INFO_USER_SPECIFIED,        "User specified"},
+    {FORMAT_INFO_32FLOAT,               "[32bit floating]"},
+    {FORMAT_INFO_32INTEGER,             "[32bit integer]"},
+    {FORMAT_INFO_24INTEGER,             "[24bit integer]"},
+    {FORMAT_INFO_16INTEGER,             "[16bit integer]"},
+    {FORMAT_INFO_32AES3,                "[32bit AES3]"},
+    {0,                                 NULL}
+};
+
+#define SAMPLE_RATE_USER_SPECIFIED                      0
+#define SAMPLE_RATE_8K                                  1
+#define SAMPLE_RATE_16K                                 2
+#define SAMPLE_RATE_32K                                 3
+#define SAMPLE_RATE_44K1                                4
+#define SAMPLE_RATE_48K                                 5
+#define SAMPLE_RATE_88K2                                6
+#define SAMPLE_RATE_96K                                 7
+#define SAMPLE_RATE_176K4                               8
+#define SAMPLE_RATE_192K                                9
+#define SAMPLE_RATE_24K                                 10
+static const value_string sample_rate_type_vals [] = {
+    {SAMPLE_RATE_USER_SPECIFIED,        "User specified"},
+    {SAMPLE_RATE_8K,                    "[8kHz]"},
+    {SAMPLE_RATE_16K,                   "[16kHz]"},
+    {SAMPLE_RATE_32K,                   "[32kHz]"},
+    {SAMPLE_RATE_44K1,                  "[44.1kHz]"},
+    {SAMPLE_RATE_48K,                   "[48kHz]"},
+    {SAMPLE_RATE_88K2,                  "[88.2kHz]"},
+    {SAMPLE_RATE_96K,                   "[96kHz]"},
+    {SAMPLE_RATE_176K4,                 "[176.4kHz]"},
+    {SAMPLE_RATE_192K,                  "[192kHz]"},
+    {SAMPLE_RATE_24K,                   "[24kHz]"},
+    {0,                                 NULL}
+};
+
+#define SPARSE_TIMESTAMP_NORMAL_OPERATION               0
+#define SPARSE_TIMESTAMP_SPARSE_MODE                    1
+static const value_string sparse_mode_vals [] = {
+    {SPARSE_TIMESTAMP_NORMAL_OPERATION, "[Normal operation, timestamp in every AAF AVTPDU]"},
+    {SPARSE_TIMESTAMP_SPARSE_MODE,      "[Sparse mode, timestamp in every eighth AAF AVTPDU]"},
+    {0,                                 NULL}
+};
+
+static int dissect_1722_aaf (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+    proto_item *ti;
+    proto_tree *ieee1722_aaf_tree;
     proto_tree *audio_tree;
     proto_tree *sample_tree;
-    gint offset;
-    guint16 datalen;
-    guint8 dbs;
-    guint8 subtype;
-    int i, j;
+    gint        offset = 1;
+    guint32     datalen;
+    guint16     channels_per_frame = 0;
+    gint        sample_width       = 0;
+    guint32     format_offset;
+    guint       i, j;
+    const gint *fields[] = {
+        &hf_1722_aaf_mrfield,
+        &hf_1722_aaf_tvfield,
+        NULL
+    };
+    const gint *fields2[] = {
+        &hf_1722_aaf_nominal_sample_rate,
+        &hf_1722_aaf_channels_per_frame,
+        NULL
+    };
+    const gint *fields3[] = {
+        &hf_1722_aaf_sparse_timestamp,
+        &hf_1722_aaf_evtfield,
+        NULL
+    };
 
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE1722");
+    ti = proto_tree_add_item(tree, proto_1722_aaf, tvb, 0, -1, ENC_NA);
+    ieee1722_aaf_tree = proto_item_add_subtree(ti, ett_1722_aaf);
 
-    col_set_str(pinfo->cinfo, COL_INFO, "AVB Transportation Protocol");
+    proto_tree_add_bitmask_list(ieee1722_aaf_tree, tvb, offset, 1, fields, ENC_NA);
+    offset += 1;
+    proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_tufield, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_stream_id, tvb, offset, 8, ENC_BIG_ENDIAN);
+    offset += 8;
+    proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_avtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN);
+    offset += 4;
+
+    ti = proto_tree_add_item_ret_uint(ieee1722_aaf_tree, hf_1722_aaf_format, tvb, offset, 1, ENC_BIG_ENDIAN, &format_offset);
+    offset += 1;
+    switch (format_offset)
+    {
+    case 0:
+        break;
+    case 1:
+        sample_width = 32;
+        break;
+    case 2:
+        sample_width = 32;
+        break;
+    case 3:
+        sample_width = 24;
+        break;
+    case 4:
+        sample_width = 16;
+        break;
+    case 5:
+        sample_width = 32;
+        break;
+    default:
+        expert_add_info(pinfo, ti, &ei_format_reserved);
+        break;
+    }
 
-     ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, ENC_NA);
-     ieee1722_tree = proto_item_add_subtree(ti, ett_1722);
+    proto_tree_add_bitmask_list(ieee1722_aaf_tree, tvb, offset, 2, fields2, ENC_BIG_ENDIAN);
+    channels_per_frame = tvb_get_ntohs(tvb, offset) & IEEE_1722_CHANNEL_PER_FRAME_MASK;
+    offset += 2;
+    proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_bit_depth, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    ti = proto_tree_add_item_ret_uint(ieee1722_aaf_tree, hf_1722_aaf_stream_data_length, tvb, offset, 2, ENC_BIG_ENDIAN, &datalen);
+    proto_item_append_text(ti, " bytes");
+    offset += 2;
 
-    if (tree) {
-        /* Add the CD and Subtype fields
-         * CD field is 1 bit
-         * Subtype field is 7 bits
-         */
-        proto_tree_add_item(ieee1722_tree, hf_1722_cdfield, tvb, IEEE_1722_CD_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_subtype, tvb, IEEE_1722_CD_OFFSET, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_bitmask_list(ieee1722_aaf_tree, tvb, offset, 1, fields3, ENC_BIG_ENDIAN);
+    offset += 2; /* Padding? */
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_svfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_verfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN);
+    /* Make the Audio sample tree. */
+    ti         = proto_tree_add_item(ieee1722_aaf_tree, hf_1722_aaf_data, tvb, offset, datalen, ENC_NA);
+    audio_tree = proto_item_add_subtree(ti, ett_1722_aaf_audio);
+
+    if (sample_width == 0)
+    {
+        expert_add_info(pinfo, ti, &ei_sample_width);
+    }
+    else
+    {
+        if (channels_per_frame == 0)
+        {
+            expert_add_info(pinfo, ti, &ei_channels_per_frame);
+        }
+        else
+        {
+            if (audio_tree)
+            {
+                /* Loop through all samples and add them to the audio tree. */
+                for (j = 0; j < ((datalen * 8) / (channels_per_frame * sample_width)); j++)
+                {
+                    sample_tree = proto_tree_add_subtree_format(audio_tree, tvb, offset, 1,
+                                                    ett_1722_aaf_sample, NULL, "Sample Chunk %d", j);
+                    for (i = 0; i < channels_per_frame; i++)
+                    {
+                        ti = proto_tree_add_item(sample_tree, hf_1722_aaf_sample, tvb, offset, sample_width / 8, ENC_NA);
+                        proto_item_prepend_text(ti, "Channel: %d ", i);
+                        offset += (sample_width / 8);
+                    }
+                }
+            }
+        }
     }
+    return tvb_captured_length(tvb);
+}
 
+/* Bit Field Masks */
+#define IEEE_1722_MR_MASK       0x08
+#define IEEE_1722_GV_MASK       0x02
+#define IEEE_1722_TV_MASK       0x01
+#define IEEE_1722_TU_MASK       0x01
+#define IEEE_1722_TAG_MASK      0xc0
+#define IEEE_1722_CHANNEL_MASK  0x3f
+#define IEEE_1722_TCODE_MASK    0xf0
+#define IEEE_1722_SY_MASK       0x0f
+#define IEEE_1722_QI1_MASK      0xc0
+#define IEEE_1722_SID_MASK      0x3f
+#define IEEE_1722_FN_MASK       0xc0
+#define IEEE_1722_QPC_MASK      0x38
+#define IEEE_1722_SPH_MASK      0x04
+#define IEEE_1722_QI2_MASK      0xc0
+#define IEEE_1722_FMT_MASK      0x3f
 
-    /* Version field ends the common AVTPDU. Now parse the specfic packet type */
-    subtype = tvb_get_guint8(tvb, IEEE_1722_CD_OFFSET);
-    subtype &= 0x7F;
+#define IEEE_1722_CIP_HEADER_SIZE           8
+#define IEEE_1722_61883_TAG_NO_CIP          0x00
+#define IEEE_1722_61883_TAG_CIP             0x40
+#define IEEE_1722_61883_CHANNEL_AVTP        31
+#define IEEE_1722_61883_SID_AVTP            63
+#define IEEE_1722_61883_4_LEN_SOURCE_PACKET 192
+#define IEEE_1722_61883_4_LEN_SP_TIMESTAMP  4
 
-    /* call any registered subtype dissectors which use only the common AVTPDU (e.g. 1722.1 and MAAP) */
-    if (dissector_try_uint(avb_dissector_table, subtype, tvb, pinfo, tree))
-        return tvb_captured_length(tvb);
+#define TAG_NO_CIP_HEADER                    0
+#define TAG_CIP_HEADER                       1
+static const value_string tag_vals [] = {
+    {TAG_NO_CIP_HEADER, "No CIP header included"},
+    {TAG_CIP_HEADER,    "CIP header included"},
+    {0,                 NULL}
+};
 
-    if (tree) {
-        proto_tree_add_item(ieee1722_tree, hf_1722_mrfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_gvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_tvfield, tvb, IEEE_1722_VERSION_OFFSET, 1, ENC_BIG_ENDIAN);
+#define IEEE_1722_61883_4                   0x20
+#define IEEE_1722_61883_6                   0x10
+static const value_string format_vals [] = {
+    {IEEE_1722_61883_4,    "IEC 61883-4: MPEG2-TS data transmission"},
+    {IEEE_1722_61883_6,    "IEC 61883-6: Audio and music transmission protocol"},
+    {0,                    NULL}
+};
 
-        /* Add the rest of the packet fields */
-        proto_tree_add_item(ieee1722_tree, hf_1722_seqnum, tvb,
-                            IEEE_1722_SEQ_NUM_OFFSET, 1, ENC_BIG_ENDIAN);
+static int dissect_1722_61883(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+    proto_item *ti;
+    proto_tree *ieee1722_61883_tree;
+    proto_tree *audio_tree;
+    proto_tree *sample_tree;
+    proto_tree *video_tree;
+    gint offset = 1;
+    guint8 dbs, tag, channel, tcode, cip_qi1, cip_sid, cip_qpc, cip_qi2, cip_fmt;
+    guint32 datalen;
+    guint db_size, numSourcePackets;
+    guint i, j;
+    const gint *fields[] = {
+        &hf_1722_61883_mrfield,
+        &hf_1722_61883_gvfield,
+        &hf_1722_61883_tvfield,
+        NULL
+    };
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_tufield, tvb,
-                            IEEE_1722_TU_FIELD_OFFSET, 1, ENC_BIG_ENDIAN);
+    ti = proto_tree_add_item(tree, proto_1722_61883, tvb, 0, -1, ENC_NA);
+    ieee1722_61883_tree = proto_item_add_subtree(ti, ett_1722_61883);
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_stream_id, tvb,
-                            IEEE_1722_STREAM_ID_OFFSET, 8, ENC_BIG_ENDIAN);
+    proto_tree_add_bitmask_list(ieee1722_61883_tree, tvb, offset, 1, fields, ENC_NA);
+    offset += 1;
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_seqnum, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_tufield, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_stream_id, tvb, offset, 8, ENC_BIG_ENDIAN);
+    offset += 8;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_avbtp_timestamp, tvb,
-                            IEEE_1722_TIMESTAMP_OFFSET, 4, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_avtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN);
+    offset += 4;
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_gateway_info, tvb, offset, 4, ENC_BIG_ENDIAN);
+    offset += 4;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_gateway_info, tvb,
-                            IEEE_1722_GW_INFO_OFFSET, 4, ENC_BIG_ENDIAN);
+    ti = proto_tree_add_item_ret_uint(ieee1722_61883_tree, hf_1722_61883_stream_data_length, tvb, offset, 2, ENC_BIG_ENDIAN, &datalen);
+    proto_item_append_text(ti, " bytes");
+    offset += 2;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_packet_data_length, tvb,
-                            IEEE_1722_PKT_DATA_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN);
+    /* tag field defines if CIP header is included or not */
+    ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_tag, tvb, offset, 1, ENC_BIG_ENDIAN);
+    tag = tvb_get_guint8(tvb, offset) & IEEE_1722_TAG_MASK;
+    if (tag > 0x40)
+    {
+        expert_add_info(pinfo, ti, &ei_1722_61883_incorrect_tag);
+    }
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_tag, tvb,
-                            IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_channel, tvb,
-                            IEEE_1722_TAG_OFFSET, 1, ENC_BIG_ENDIAN);
+    ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_channel, tvb, offset, 1, ENC_BIG_ENDIAN);
+    channel = tvb_get_guint8(tvb, offset) & IEEE_1722_CHANNEL_MASK;
+    if (channel != IEEE_1722_61883_CHANNEL_AVTP)
+    {
+        proto_item_append_text(ti, ": Originating  Source  ID  from  an  IEEE  1394  serial  bus");
+    }
+    else
+    {
+        proto_item_append_text(ti, ":  Originating source is on AVTP network (native AVTP)");
+    }
+    offset += 1;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_tcode, tvb,
-                            IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_sy, tvb,
-                            IEEE_1722_TCODE_OFFSET, 1, ENC_BIG_ENDIAN);
+    ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_tcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+    tcode = tvb_get_guint8(tvb, offset) & IEEE_1722_TCODE_MASK;
+    if (tcode != 0xa0)
+    {
+        expert_add_info(pinfo, ti, &ei_1722_61883_incorrect_tcode);
+    }
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_sid, tvb,
-                            IEEE_1722_SID_OFFSET, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_sy, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_dbs, tvb,
-                            IEEE_1722_DBS_OFFSET, 1, ENC_BIG_ENDIAN);
+    switch (tag) {
+    case IEEE_1722_61883_TAG_NO_CIP:
+        proto_item_prepend_text(ti, "IIDC 1394 video payload:");
+        break;
+    case IEEE_1722_61883_TAG_CIP:
+        ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_qi1, tvb, offset, 1, ENC_BIG_ENDIAN);
+        cip_qi1 = tvb_get_guint8(tvb, offset) & IEEE_1722_QI1_MASK;
+        if (cip_qi1 != 0)
+        {
+            expert_add_info(pinfo, ti, &ei_1722_61883_incorrect_qi1);
+        }
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_fn, tvb,
-                            IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_qpc, tvb,
-                            IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722_tree, hf_1722_sph, tvb,
-                            IEEE_1722_FN_OFFSET, 1, ENC_BIG_ENDIAN);
+        ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_sid, tvb, offset, 1, ENC_BIG_ENDIAN);
+        cip_sid = tvb_get_guint8(tvb, offset) & IEEE_1722_SID_MASK;
+        if (cip_sid != IEEE_1722_61883_SID_AVTP)
+        {
+            proto_item_append_text(ti, ": Originating  Source  ID  from  an  IEEE  1394  serial  bus");
+        }
+        else
+        {
+            proto_item_append_text(ti, ": Originating source is on AVTP network");
+        }
+        offset += 1;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_dbc, tvb,
-                            IEEE_1722_DBC_OFFSET, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_dbs, tvb, offset, 1, ENC_BIG_ENDIAN);
+        dbs = tvb_get_guint8(tvb, offset);
+        offset += 1;
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_fn, tvb, offset, 1, ENC_BIG_ENDIAN);
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_fmt, tvb,
-                            IEEE_1722_FMT_OFFSET, 1, ENC_BIG_ENDIAN);
+        ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_qpc, tvb, offset, 1, ENC_BIG_ENDIAN);
+        cip_qpc = tvb_get_guint8(tvb, offset) & IEEE_1722_QPC_MASK;
+        if (cip_qpc != 0)
+        {
+            expert_add_info(pinfo, ti, &ei_1722_61883_incorrect_qpc);
+        }
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_fdf, tvb,
-                            IEEE_1722_FDF_OFFSET, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_sph, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_dbc, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
 
-        proto_tree_add_item(ieee1722_tree, hf_1722_syt, tvb,
-                            IEEE_1722_SYT_OFFSET, 2, ENC_BIG_ENDIAN);
-    }
+        ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_qi2, tvb, offset, 1, ENC_BIG_ENDIAN);
+        cip_qi2 = tvb_get_guint8(tvb, offset) & IEEE_1722_QI2_MASK;
+        if (cip_qi2 != 0x80)
+        {
+            expert_add_info(pinfo, ti, &ei_1722_61883_incorrect_qi2);
+        }
 
-    /* Calculate the remaining size by subtracting the CIP header size
-           from the value in the packet data length field */
-    datalen = tvb_get_ntohs(tvb, IEEE_1722_PKT_DATA_LENGTH_OFFSET);
-    datalen -= IEEE_1722_CIP_HEADER_SIZE;
+        /* Check format field for 61883-4 MPEG-TS video or 61883-6 for audio */
+        ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_fmt, tvb, offset, 1, ENC_BIG_ENDIAN);
+        cip_fmt = tvb_get_guint8(tvb, offset) & IEEE_1722_FMT_MASK;
 
-    /* Make the Audio sample tree. */
-    ti = proto_tree_add_item(ieee1722_tree, hf_1722_data, tvb,
-                                IEEE_1722_DATA_OFFSET, datalen, ENC_NA);
-
-    audio_tree = proto_item_add_subtree(ti, ett_1722_audio);
-
-    /* Need to get the offset of where the audio data starts */
-    offset = IEEE_1722_DATA_OFFSET;
-    dbs = tvb_get_guint8(tvb, IEEE_1722_DBS_OFFSET);
-
-    /* If the DBS is ever 0 for whatever reason, then just add the rest of packet as unknown */
-    if(dbs == 0)
-        expert_add_info(pinfo, ti, &ei_1722_incorrect_dbs);
-    else {
-        if (audio_tree) {
-            /* Loop through all samples and add them to the audio tree. */
-            for (j = 0; j < (datalen / (dbs*4)); j++) {
-                sample_tree = proto_tree_add_subtree_format(audio_tree, tvb, offset, 1, ett_1722_sample, NULL, "Sample %d", j+1);
-                for (i = 0; i < dbs; i++) {
-                    proto_tree_add_item(sample_tree, hf_1722_label, tvb, offset, 1, ENC_BIG_ENDIAN);
-                    offset += 1;
-
-                    proto_tree_add_item(sample_tree, hf_1722_sample, tvb, offset, 3, ENC_NA);
-                    offset += 3;
+        if ((cip_fmt != IEEE_1722_61883_6) && (cip_fmt != IEEE_1722_61883_4))
+        {
+            expert_add_info(pinfo, ti, &ei_1722_61883_unknown_format);
+        }
+        offset += 1;
+
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_fdf, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+        proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_cip_syt, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
+
+        switch (cip_fmt) {
+        case IEEE_1722_61883_6:
+            /* Calculate the remaining size by subtracting the CIP header size from the value in the packet data length field */
+            datalen -= IEEE_1722_CIP_HEADER_SIZE;
+
+            if (dbs == 0) {
+                db_size = 256;
+            }
+            else {
+                db_size = dbs;
+            }
+
+            /* Make the Audio sample tree. */
+            ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_audio_data, tvb, offset, datalen, ENC_NA);
+            audio_tree = proto_item_add_subtree(ti, ett_1722_61883_audio);
+
+            if (audio_tree) {
+                /* Loop through all samples and add them to the audio tree. */
+                for (j = 0; j < (datalen / (db_size*4)); j++) {
+                    sample_tree = proto_tree_add_subtree_format(audio_tree, tvb, offset, 1, ett_1722_61883_sample, NULL, "Sample %d", j+1);
+                    for (i = 0; i < db_size; i++) {
+                        proto_tree_add_item(sample_tree, hf_1722_61883_label, tvb, offset, 1, ENC_BIG_ENDIAN);
+                        offset += 1;
+                        proto_tree_add_item(sample_tree, hf_1722_61883_sample, tvb, offset, 3, ENC_NA);
+                        offset += 3;
+                    }
+                }
+            }
+            break;
+        case IEEE_1722_61883_4:
+            /* Make the video tree. */
+            ti = proto_tree_add_item(ieee1722_61883_tree, hf_1722_61883_video_data, tvb, offset, datalen, ENC_NA);
+            video_tree = proto_item_add_subtree(ti, ett_1722_61883_audio);
+
+            if (video_tree) {
+                /* Loop through all packets and add them to the video tree. */
+                numSourcePackets = datalen / IEEE_1722_61883_4_LEN_SOURCE_PACKET;
+                for (j = 0; j < numSourcePackets; j++) {
+                    proto_tree_add_item(video_tree, hf_1722_61883_source_packet_header_timestamp, tvb, offset, IEEE_1722_61883_4_LEN_SP_TIMESTAMP, ENC_BIG_ENDIAN);
+                    offset += IEEE_1722_61883_4_LEN_SP_TIMESTAMP;
+                    proto_tree_add_item(video_tree, hf_1722_61883_video_data, tvb, offset, (IEEE_1722_61883_4_LEN_SOURCE_PACKET - IEEE_1722_61883_4_LEN_SP_TIMESTAMP), ENC_NA);
+                    offset += (IEEE_1722_61883_4_LEN_SOURCE_PACKET - IEEE_1722_61883_4_LEN_SP_TIMESTAMP);
                 }
             }
+            break;
+        default:
+            break;
         }
+        break;
+    default:
+        break;
     }
+
     return tvb_captured_length(tvb);
 }
 
-/* Register the protocol with Wireshark */
-void proto_register_1722(void)
+static int
+dissect_1722(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-    static hf_register_info hf[] = {
-        { &hf_1722_cdfield,
-            { "Control/Data Indicator", "ieee1722.cdfield",
-              FT_BOOLEAN, 8, TFS(&tfs_ieee1722_control_data), IEEE_1722_CD_MASK, NULL, HFILL }
+    proto_item *ti;
+    proto_tree *ieee1722_tree;
+    guint32 subtype;
+    int offset = 0;
+    const gint *fields[] = {
+        &hf_1722_svfield,
+        &hf_1722_verfield,
+        NULL
+    };
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE1722");
+    col_set_str(pinfo->cinfo, COL_INFO, "AVB Transportation Protocol");
+
+    ti = proto_tree_add_item(tree, proto_1722, tvb, 0, -1, ENC_NA);
+    ieee1722_tree = proto_item_add_subtree(ti, ett_1722);
+
+    proto_tree_add_item_ret_uint(ieee1722_tree, hf_1722_subtype, tvb, offset, 1, ENC_BIG_ENDIAN, &subtype);
+    offset += 1;
+    proto_tree_add_bitmask_list(ieee1722_tree, tvb, offset, 1, fields, ENC_NA);
+
+    /* Version field ends the common AVTPDU. Now parse the specfic packet type */
+
+    /* call any registered subtype dissectors which use only the common AVTPDU (e.g. 1722.1, MAAP, 61883, AAF or CRF) */
+    if (dissector_try_uint(avb_dissector_table, subtype, tvb, pinfo, tree))
+        return tvb_captured_length(tvb);
+
+    return tvb_captured_length(tvb);
+}
+
+
+void proto_register_1722_crf(void)
+{
+    static hf_register_info hf[] =
+    {
+        { &hf_1722_crf_mrfield,
+          { "Media Clock Restart", "crf.mrfield",
+            FT_BOOLEAN, 8, NULL, IEEE_1722_MR_MASK, NULL, HFILL }
         },
-        { &hf_1722_subtype,
-            { "AVBTP Subtype", "ieee1722.subtype",
-              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(ieee1722_subtype_range_vals), IEEE_1722_SUBTYPE_MASK, NULL, HFILL }
+        { &hf_1722_crf_fsfield,
+          { "Frame Sync", "crf.fsfield",
+            FT_BOOLEAN, 8, NULL, IEEE_1722_FS_MASK, NULL, HFILL }
         },
-        { &hf_1722_svfield,
-            { "AVBTP Stream ID Valid", "ieee1722.svfield",
-              FT_BOOLEAN, 8, NULL, IEEE_1722_SV_MASK, NULL, HFILL }
+        { &hf_1722_crf_tufield,
+            { "Timestamp Uncertain", "crf.tufield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_TU_MASK, NULL, HFILL }
         },
-        { &hf_1722_verfield,
-            { "AVBTP Version", "ieee1722.verfield",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722_VER_MASK, NULL, HFILL }
+        { &hf_1722_crf_seqnum,
+            { "Sequence Number", "crf.seqnum",
+              FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_type,
+            { "Type", "crf.type",
+              FT_UINT8, BASE_HEX, VALS(type_vals), 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_stream_id,
+            { "Stream ID", "crf.stream_id",
+              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_pull,
+            { "Pull", "crf.pull",
+              FT_UINT32, BASE_HEX, VALS(pull_vals), IEEE_1722_PULL_MASK, NULL, HFILL }
+        },
+        { &hf_1722_crf_base_frequency,
+            { "Base Frequency", "crf.base_frequency",
+              FT_UINT32, BASE_DEC, NULL, IEEE_1722_BASE_FREQUENCY_MASK, NULL, HFILL }
+        },
+        { &hf_1722_crf_data_length,
+            { "Data Length", "crf.data_len",
+              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_timestamp_interval,
+            { "Timestamp Interval", "crf.timestamp_interval",
+              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_timestamp_data,
+            { "Timestamp Data", "crf.timestamp_data",
+              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_crf_timestamp,
+            { "Data", "crf.timestamp",
+              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+        }
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_clock_reference_type, { "crf.expert.clock_reference_format_type", PI_PROTOCOL, PI_WARN, "The CRF type is not supported", EXPFILL }},
+        { &ei_crf_datalen,          { "crf.expert.crf_datalen", PI_PROTOCOL, PI_WARN, "The CRF data length must be multiple of 8", EXPFILL }}
+    };
+
+    static gint *ett[] =
+    {
+        &ett_1722_crf,
+        &ett_1722_crf_timestamp
+    };
+
+    expert_module_t *expert_1722_crf;
+
+    /* Register the protocol name and description */
+    proto_1722_crf = proto_register_protocol("Clock Reference Format", "CRF", "crf");
+
+    /* Required function calls to register the header fields and subtrees used */
+    proto_register_field_array(proto_1722_crf, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_1722_crf = expert_register_protocol(proto_1722_crf);
+    expert_register_field_array(expert_1722_crf, ei, array_length(ei));
+}
+
+void proto_reg_handoff_1722_crf(void)
+{
+    dissector_handle_t avb1722_crf_handle;
+
+    avb1722_crf_handle = create_dissector_handle(dissect_1722_crf, proto_1722_crf);
+    dissector_add_uint("ieee1722.subtype", IEEE_1722_SUBTYPE_CRF, avb1722_crf_handle);
+}
+
+void proto_register_1722_aaf (void)
+{
+    static hf_register_info hf[] =
+    {
+        { &hf_1722_aaf_mrfield,
+            { "Media Clock Restart", "aaf.mrfield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_MR_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_tvfield,
+            { "Source Timestamp Valid", "aaf.tvfield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_TV_MASK, NULL, HFILL }
+            },
+        { &hf_1722_aaf_seqnum,
+            { "Sequence Number", "aaf.seqnum",
+              FT_UINT8, BASE_DEC, NULL, IEEE_1722_SEQ_NUM_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_tufield,
+            { "Timestamp Uncertain", "aaf.tufield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_TU_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_stream_id,
+            { "Stream ID", "aaf.stream_id",
+              FT_UINT64, BASE_HEX, NULL, IEEE_1722_STREAM_ID_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_avtp_timestamp,
+            { "AVTP Timestamp", "aaf.avtp_timestamp",
+              FT_UINT32, BASE_DEC, NULL, IEEE_1722_TIMESTAMP_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_format,
+            { "Format", "aaf.format_info",
+              FT_UINT8, BASE_HEX, VALS(format_info_vals), IEEE_1722_FORMAT_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_nominal_sample_rate,
+            { "Nominal Sample Rate", "aaf.nominal_sample_rate",
+              FT_UINT16, BASE_HEX, VALS(sample_rate_type_vals), IEEE_1722_NOM_SAMPLE_RATE_MASK, NULL, HFILL }
         },
-        { &hf_1722_mrfield,
-            { "AVBTP Media Reset", "ieee1722.mrfield",
-              FT_UINT8, BASE_DEC, NULL, IEEE_1722_MR_MASK, NULL, HFILL }
+        { &hf_1722_aaf_channels_per_frame,
+            { "Channels per Frame", "aaf.channels_per_frame",
+              FT_UINT16, BASE_DEC, NULL, IEEE_1722_CHANNEL_PER_FRAME_MASK, NULL, HFILL }
         },
-        { &hf_1722_gvfield,
-            { "AVBTP Gateway Info Valid", "ieee1722.gvfield",
+        { &hf_1722_aaf_bit_depth,
+            { "Bit Depth", "aaf.bit_depth",
+              FT_UINT8, BASE_DEC, NULL, IEEE_1722_BIT_DEPTH_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_stream_data_length,
+            { "Stream Data Length", "aaf.stream_data_len",
+              FT_UINT16, BASE_DEC, NULL, IEEE_1722_STREAM_DATA_LENGTH_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_sparse_timestamp,
+            { "Sparse Timestamp Mode", "aaf.sparse_timestamp",
+              FT_UINT8, BASE_DEC, VALS(sparse_mode_vals), IEEE_1722_SP_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_evtfield,
+            { "EVT", "aaf.evtfield",
+              FT_UINT8, BASE_HEX, NULL, IEEE_1722_EVT_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_data,
+            { "Audio Data", "aaf.data",
+              FT_BYTES, BASE_NONE, NULL, IEEE_1722_DATA_MASK, NULL, HFILL }
+        },
+        { &hf_1722_aaf_sample,
+            { "Sample Data", "aaf.data.sample",
+              FT_BYTES, BASE_NONE, NULL, IEEE_1722_SAMPLE_MASK, NULL, HFILL }
+        }
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_sample_width,          { "aaf.expert.sample_width_zero", PI_PROTOCOL, PI_WARN, "Wrong value for sample width", EXPFILL }},
+        { &ei_channels_per_frame,    { "aaf.expert.channels_per_frame_zero", PI_PROTOCOL, PI_WARN, "Wrong value for parameter channels per Frame", EXPFILL }},
+        { &ei_format_reserved,       { "aaf.expert.format_reserved", PI_PROTOCOL, PI_WARN, "Reserved value", EXPFILL }}
+    };
+
+    static gint *ett[] =
+    {
+        &ett_1722_aaf,
+        &ett_1722_aaf_audio,
+        &ett_1722_aaf_sample,
+    };
+
+    expert_module_t *expert_1722_aaf;
+
+    /* Register the protocol name and description */
+    proto_1722_aaf = proto_register_protocol("AVTP Audio Format", "AAF", "aaf");
+
+    /* Required function calls to register the header fields and subtrees used */
+    proto_register_field_array(proto_1722_aaf, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    expert_1722_aaf = expert_register_protocol(proto_1722_aaf);
+    expert_register_field_array(expert_1722_aaf, ei, array_length(ei));
+}
+
+void proto_reg_handoff_1722_aaf(void)
+{
+    dissector_handle_t avb1722_aaf_handle;
+
+    avb1722_aaf_handle = create_dissector_handle(dissect_1722_aaf, proto_1722_aaf);
+    dissector_add_uint("ieee1722.subtype", IEEE_1722_SUBTYPE_AAF, avb1722_aaf_handle);
+}
+
+void proto_register_1722_61883(void)
+{
+    static hf_register_info hf[] = {
+        { &hf_1722_61883_mrfield,
+            { "Media Clock Restart", "61883.mrfield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_MR_MASK, NULL, HFILL }
+        },
+        { &hf_1722_61883_gvfield,
+            { "Gateway Info Valid", "61883.gvfield",
               FT_BOOLEAN, 8, NULL, IEEE_1722_GV_MASK, NULL, HFILL }
         },
-        { &hf_1722_tvfield,
-            { "Source Timestamp Valid", "ieee1722.tvfield",
+        { &hf_1722_61883_tvfield,
+            { "Timestamp Valid", "61883.tvfield",
               FT_BOOLEAN, 8, NULL, IEEE_1722_TV_MASK, NULL, HFILL }
             },
-        { &hf_1722_seqnum,
-            { "Sequence Number", "ieee1722.seqnum",
+        { &hf_1722_61883_seqnum,
+            { "Sequence Number", "61883.seqnum",
               FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_tufield,
-            { "AVBTP Timestamp Uncertain", "ieee1722.tufield",
+        { &hf_1722_61883_tufield,
+            { "Timestamp Uncertain", "61883.tufield",
               FT_BOOLEAN, 8, NULL, IEEE_1722_TU_MASK, NULL, HFILL }
         },
-        { &hf_1722_stream_id,
-            { "Stream ID", "ieee1722.stream_id",
+        { &hf_1722_61883_stream_id,
+            { "Stream ID", "61883.stream_id",
               FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_avbtp_timestamp,
-            { "AVBTP Timestamp", "ieee1722.avbtp_timestamp",
+        { &hf_1722_61883_avtp_timestamp,
+            { "AVTP Timestamp", "61883.avtp_timestamp",
               FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_gateway_info,
-            { "Gateway Info", "ieee1722.gateway_info",
+        { &hf_1722_61883_gateway_info,
+            { "Gateway Info", "61883.gateway_info",
               FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_packet_data_length,
-            { "1394 Packet Data Length", "ieee1722.packet_data_len",
+        { &hf_1722_61883_stream_data_length,
+            { "1394 Stream Data Length", "61883.stream_data_len",
               FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_tag,
-            { "1394 Packet Format Tag", "ieee1722.tag",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722_TAG_MASK, NULL, HFILL }
+        { &hf_1722_61883_tag,
+            { "1394 Packet Format Tag", "61883.tag",
+              FT_UINT8, BASE_HEX, VALS(tag_vals), IEEE_1722_TAG_MASK, NULL, HFILL }
         },
-        { &hf_1722_channel,
-            { "1394 Packet Channel", "ieee1722.channel",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722_CHANNEL_MASK, NULL, HFILL }
+        { &hf_1722_61883_channel,
+            { "1394 Packet Channel", "61883.channel",
+                FT_UINT8, BASE_DEC, NULL, IEEE_1722_CHANNEL_MASK, NULL, HFILL }
         },
-        { &hf_1722_tcode,
-            { "1394 Packet Tcode", "ieee1722.tcode",
+        { &hf_1722_61883_tcode,
+            { "1394 Packet Tcode", "61883.tcode",
               FT_UINT8, BASE_HEX, NULL, IEEE_1722_TCODE_MASK, NULL, HFILL }
         },
-        { &hf_1722_sy,
-            { "1394 App-specific Control", "ieee1722.sy",
+        { &hf_1722_61883_sy,
+            { "1394 App-specific Control", "61883.sy",
               FT_UINT8, BASE_HEX, NULL, IEEE_1722_SY_MASK, NULL, HFILL }
         },
-        { &hf_1722_sid,
-            { "Source ID", "ieee1722.sid",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722_SID_MASK, NULL, HFILL }
+        { &hf_1722_61883_cip_qi1,
+            { "CIP Quadlet Indicator 1", "61883.qi1",
+              FT_UINT8, BASE_HEX, NULL, IEEE_1722_QI1_MASK, NULL, HFILL }
         },
-        { &hf_1722_dbs,
-            { "Data Block Size", "ieee1722.dbs",
+        { &hf_1722_61883_cip_sid,
+            { "CIP Source ID", "61883.sid",
+              FT_UINT8, BASE_DEC, NULL, IEEE_1722_SID_MASK, NULL, HFILL }
+        },
+        { &hf_1722_61883_cip_dbs,
+            { "CIP Data Block Size", "61883.dbs",
               FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_fn,
-            { "Fraction Number", "ieee1722.fn",
+        { &hf_1722_61883_cip_fn,
+            { "CIP Fraction Number", "61883.fn",
               FT_UINT8, BASE_HEX, NULL, IEEE_1722_FN_MASK, NULL, HFILL }
         },
-        { &hf_1722_qpc,
-            { "Quadlet Padding Count", "ieee1722.qpc",
+        { &hf_1722_61883_cip_qpc,
+            { "CIP Quadlet Padding Count", "61883.qpc",
               FT_UINT8, BASE_HEX, NULL, IEEE_1722_QPC_MASK, NULL, HFILL }
         },
-        { &hf_1722_sph,
-            { "Source Packet Header", "ieee1722.sph",
+        { &hf_1722_61883_cip_sph,
+            { "CIP Source Packet Header", "61883.sph",
               FT_BOOLEAN, 8, NULL, IEEE_1722_SPH_MASK, NULL, HFILL }
         },
-        { &hf_1722_dbc,
-            { "Data Block Continuity", "ieee1722.dbc",
+        { &hf_1722_61883_cip_dbc,
+            { "CIP Data Block Continuity", "61883.dbc",
               FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_fmt,
-            { "Format ID", "ieee1722.fmt",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722_FMT_MASK, NULL, HFILL }
+        { &hf_1722_61883_cip_qi2,
+            { "CIP Quadlet Indicator 2", "61883.qi2",
+              FT_UINT8, BASE_HEX, NULL, IEEE_1722_QI2_MASK, NULL, HFILL }
+        },
+        { &hf_1722_61883_cip_fmt,
+            { "CIP Format ID", "61883.fmt",
+              FT_UINT8, BASE_HEX, VALS(format_vals), IEEE_1722_FMT_MASK, NULL, HFILL }
         },
-        { &hf_1722_fdf,
-            { "Format Dependent Field", "ieee1722.fdf",
+        { &hf_1722_61883_cip_fdf,
+            { "CIP Format Dependent Field", "61883.fdf",
               FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_syt,
-            { "SYT", "ieee1722.syt",
+        { &hf_1722_61883_cip_syt,
+            { "CIP SYT", "61883.syt",
               FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_data,
-            { "Audio Data", "ieee1722.data",
+        { &hf_1722_61883_audio_data,
+            { "Audio Data", "61883.audiodata",
               FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_label,
-            { "Label", "ieee1722.data.sample.label",
+        { &hf_1722_61883_label,
+            { "Label", "61883.audiodata.sample.label",
               FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
         },
-        { &hf_1722_sample,
-            { "Sample", "ieee1722.data.sample.sampledata",
+        { &hf_1722_61883_sample,
+            { "Sample", "61883.audiodata.sample.sampledata",
+              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+        },
+        { &hf_1722_61883_video_data,
+            { "Video Data", "61883.videodata",
               FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
         },
+        { &hf_1722_61883_source_packet_header_timestamp,
+            { "Source Packet Header Timestamp", "61883.spht",
+              FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+        }
     };
 
     static gint *ett[] = {
-        &ett_1722,
-        &ett_1722_audio,
-        &ett_1722_sample
+        &ett_1722_61883,
+        &ett_1722_61883_audio,
+        &ett_1722_61883_sample
     };
 
     static ei_register_info ei[] = {
-        { &ei_1722_incorrect_dbs, { "ieee1722.incorrect_dbs", PI_PROTOCOL, PI_WARN, "Incorrect DBS", EXPFILL }},
+        { &ei_1722_61883_incorrect_tag, { "61883.incorrect_tag", PI_PROTOCOL, PI_WARN, "Incorrect tag field, only 0x00 and 0x01 supported for AVTP", EXPFILL }},
+        { &ei_1722_61883_incorrect_tcode, { "61883.incorrect_tcode", PI_PROTOCOL, PI_WARN, "Incorrect tcode, talker shall set this field to 0x0A", EXPFILL }},
+        { &ei_1722_61883_incorrect_qi1, { "61883.incorrect_qi1", PI_PROTOCOL, PI_WARN, "Incorrect quadlet indicator 1 field, talker shall set this field to 0x00", EXPFILL }},
+        { &ei_1722_61883_incorrect_qpc, { "61883.incorrect_qpc", PI_PROTOCOL, PI_WARN, "Incorrect quadlet padding count field, shall be set to 0", EXPFILL }},
+        { &ei_1722_61883_incorrect_qi2, { "61883.incorrect_qi2", PI_PROTOCOL, PI_WARN, "Incorrect quadlet indicator 2 field, talker shall set this field to 0x02", EXPFILL }},
+        { &ei_1722_61883_unknown_format, { "61883.unknown_format", PI_PROTOCOL, PI_NOTE, "IEC 61883 format not dissected yet", EXPFILL }}
     };
 
-    expert_module_t* expert_1722;
+    expert_module_t* expert_1722_61883;
+
+    /* Register the protocol name and description */
+    proto_1722_61883 = proto_register_protocol(
+                "IEC 61883 Protocol",   /* name */
+                "IEC 61883",            /* short name */
+                "61883");               /* abbrev */
+
+    /* Required function calls to register the header fields and subtrees used */
+    proto_register_field_array(proto_1722_61883, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_1722_61883 = expert_register_protocol(proto_1722_61883);
+    expert_register_field_array(expert_1722_61883, ei, array_length(ei));
+}
+
+void proto_reg_handoff_1722_61883(void)
+{
+    dissector_handle_t avb1722_61883_handle;
+
+    avb1722_61883_handle = create_dissector_handle(dissect_1722_61883, proto_1722_61883);
+    dissector_add_uint("ieee1722.subtype", IEEE_1722_SUBTYPE_61883, avb1722_61883_handle);
+}
+
+/* Register the protocol with Wireshark */
+void proto_register_1722(void)
+{
+    static hf_register_info hf[] = {
+        { &hf_1722_subtype,
+            { "AVBTP Subtype", "ieee1722.subtype",
+              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(ieee1722_subtype_range_vals), IEEE_1722_SUBTYPE_MASK, NULL, HFILL }
+        },
+        { &hf_1722_svfield,
+            { "AVTP Stream ID Valid", "ieee1722.svfield",
+              FT_BOOLEAN, 8, NULL, IEEE_1722_SV_MASK, NULL, HFILL }
+        },
+        { &hf_1722_verfield,
+            { "AVTP Version", "ieee1722.verfield",
+              FT_UINT8, BASE_HEX, NULL, IEEE_1722_VER_MASK, NULL, HFILL }
+        }
+    };
+
+    static gint *ett[] = {
+        &ett_1722
+    };
 
     /* Register the protocol name and description */
     proto_1722 = proto_register_protocol("IEEE 1722 Protocol", "IEEE1722", "ieee1722");
@@ -417,10 +1092,8 @@ void proto_register_1722(void)
     /* Required function calls to register the header fields and subtrees used */
     proto_register_field_array(proto_1722, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
-    expert_1722 = expert_register_protocol(proto_1722);
-    expert_register_field_array(expert_1722, ei, array_length(ei));
 
-    /* Sub-dissector for 1772.1 */
+    /* Sub-dissector for 1772.1, 1722 AAF, 1722 CRF, 1722 61883 */
     avb_dissector_table = register_dissector_table("ieee1722.subtype",
                           "IEEE1722 AVBTP Subtype", proto_1722, FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
 }
diff --git a/epan/dissectors/packet-ieee1722a.c b/epan/dissectors/packet-ieee1722a.c
deleted file mode 100644
index 510d0f7739..0000000000
--- a/epan/dissectors/packet-ieee1722a.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/* packet-ieee1722a.c
- * Routines for AVB-TP (Audio Video Bridging - Transport Protocol) dissection
- * Copyright 2014, Andreas Leibold <andreas.leibold@harman.com>,
- *                 Patrick Martin <patrick.martin@harman.com>
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * The 1722a Protocol specification can be found here:
- * http://grouper.ieee.org/groups/1722/
- *
- * Dissector based on specification version: 1722a Draft 7
- *
- * Only 1722a "Audio" and "Clock Reference Stream Audio Timestamps"
- * are dissected.
- */
-
-#include "config.h"
-#include <epan/packet.h>
-#include <epan/expert.h>
-
-void proto_register_1722a(void);
-void proto_reg_handoff_1722a(void);
-
-/* 1722a Offsets */
-/* 1722a audio */
-#define IEEE_1722A_CD_OFFSET                             0
-#define IEEE_1722A_VERSION_OFFSET                        1
-#define IEEE_1722A_SEQ_NUM_OFFSET                        2
-#define IEEE_1722A_TU_FIELD_OFFSET                       3
-#define IEEE_1722A_STREAM_ID_OFFSET                      4
-#define IEEE_1722A_TIMESTAMP_OFFSET                     12
-#define IEEE_1722A_FORMAT_INFO_OFFSET                   16
-#define IEEE_1722A_NOM_SAMPLE_RATE_OFFSET               17
-#define IEEE_1722A_CHANNELS_PER_FRAME_OFFSET            17
-#define IEEE_1722A_BIT_DEPTH_OFFSET                     19
-#define IEEE_1722A_STREAM_DATA_LENGTH_OFFSET            20
-#define IEEE_1722A_SPARSE_TIMESTAMP_OFFSET              22
-#define IEEE_1722A_EVT_OFFSET                           22
-#define IEEE_1722A_DATA_OFFSET                          24
-/* CRF */
-#define IEEE_1722A_CRF_TYPE_OFFSET                      22
-#define IEEE_1722A_CRF_CLOCK_FREQUENCY_OFFSET           24
-#define IEEE_1722A_CRF_CLOCK_MULTIPLIER_OFFSET          25
-#define IEEE_1722A_CRF_TIMESTAMP_INTERVAL_OFFSET        26
-#define IEEE_1722A_CRF_AUDIO_TIMESTAMP_OFFSET           28
-
-
-/* Bit Field Masks */
-/* 1722a audio */
-#define IEEE_1722A_SUBTYPE_MASK                         0x7f
-#define IEEE_1722A_MR_MASK                              0x08
-#define IEEE_1722A_TV_MASK                              0x01
-#define IEEE_1722A_TU_MASK                              0x01
-#define IEEE_1722A_NOM_SAMPLE_RATE_MASK                 0xf0
-#define IEEE_1722A_CHANNEL_PER_FRAME_MASK               0x03ff
-#define IEEE_1722A_SP_MASK                              0x10
-#define IEEE_1722A_EVT_MASK                             0x0f
-
-#define IEEE_1722A_CRF_AUDIO_SAMPLE_TIMESTAMP           1
-#define IEEE_1722A_CRF_TIMESTAMP_SIZE                   8 /* size of the CRF timestamp in bytes */
-
-
-#define IEEE_1722A_SUBTYPE_AVTP_AUDIO                   0x02
-#define IEEE_1722A_SUBTYPE_CRF                          0x05
-
-#define FORMAT_INFO_USER_SPECIFIED       0
-#define FORMAT_INFO_32FLOAT              1
-#define FORMAT_INFO_32INTEGER            2
-#define FORMAT_INFO_24INTEGER            3
-#define FORMAT_INFO_16INTEGER            4
-
-static const value_string format_info_vals [] = {
-    {FORMAT_INFO_USER_SPECIFIED,        "User specified"},
-    {FORMAT_INFO_32FLOAT,               "[32bit floating]"},
-    {FORMAT_INFO_32INTEGER,             "[32bit integer]"},
-    {FORMAT_INFO_24INTEGER,             "[24bit integer]"},
-    {FORMAT_INFO_16INTEGER,             "[16bit integer]"},
-    {0,                                 NULL}
-};
-
-#define SAMPLE_RATE_USER_SPECIFIED       0
-#define SAMPLE_RATE_8K                   1
-#define SAMPLE_RATE_16K                  2
-#define SAMPLE_RATE_32K                  3
-#define SAMPLE_RATE_44K1                 4
-#define SAMPLE_RATE_48K                  5
-#define SAMPLE_RATE_88K2                 6
-#define SAMPLE_RATE_96K                  7
-#define SAMPLE_RATE_176K4                8
-#define SAMPLE_RATE_192K                 9
-#define SAMPLE_RATE_16RPM               10
-#define SAMPLE_RATE_33RPM3              11
-#define SAMPLE_RATE_33RPM3_REV          12
-#define SAMPLE_RATE_45RPM               13
-#define SAMPLE_RATE_78RPM               14
-#define SAMPLE_RATE_RESERVED            15
-
-static const value_string sample_rate_type_vals [] = {
-    {SAMPLE_RATE_USER_SPECIFIED,        "User specified"},
-    {SAMPLE_RATE_8K,                    "[8kHz]"},
-    {SAMPLE_RATE_16K,                   "[16kHz]"},
-    {SAMPLE_RATE_32K,                   "[32kHz]"},
-    {SAMPLE_RATE_44K1,                  "[44.1kHz]"},
-    {SAMPLE_RATE_48K,                   "[48kHz]"},
-    {SAMPLE_RATE_88K2,                  "[88.2kHz]"},
-    {SAMPLE_RATE_96K,                   "[96kHz]"},
-    {SAMPLE_RATE_176K4,                 "[176.4kHz]"},
-    {SAMPLE_RATE_192K,                  "[192kHz]"},
-    {SAMPLE_RATE_16RPM,                 "[16 RPM]"},
-    {SAMPLE_RATE_33RPM3,                "[33 1/3 RPM]"},
-    {SAMPLE_RATE_33RPM3_REV,            "[33 1/3 RPM In Reverse]"},
-    {SAMPLE_RATE_45RPM,                 "[45RPM]"},
-    {SAMPLE_RATE_78RPM,                 "[78RPM]"},
-    {SAMPLE_RATE_RESERVED,              "Reserved"},
-    {0,                                 NULL}
-};
-
-#define CLOCK_FREQUENCY_OTHER  0
-#define CLOCK_FREQUENCY_8K     1
-#define CLOCK_FREQUENCY_16K    2
-#define CLOCK_FREQUENCY_32K    3
-#define CLOCK_FREQUENCY_44K1   4
-#define CLOCK_FREQUENCY_88K2   5
-#define CLOCK_FREQUENCY_176K4  6
-#define CLOCK_FREQUENCY_48K    7
-#define CLOCK_FREQUENCY_96K    8
-#define CLOCK_FREQUENCY_192K   9
-
-static const value_string clock_frequency_type_vals [] = {
-    {CLOCK_FREQUENCY_OTHER,    "Other Nominal Frequency"},
-    {CLOCK_FREQUENCY_8K,       "[8kHz]"},
-    {CLOCK_FREQUENCY_16K,      "[16kHz]"},
-    {CLOCK_FREQUENCY_32K,      "[32kHz]"},
-    {CLOCK_FREQUENCY_44K1,     "[44.1kHz]"},
-    {CLOCK_FREQUENCY_88K2,     "[88.2kHz]"},
-    {CLOCK_FREQUENCY_176K4,    "[176.4kHz]"},
-    {CLOCK_FREQUENCY_48K,      "[48kHz]"},
-    {CLOCK_FREQUENCY_96K,      "[96kHz]"},
-    {CLOCK_FREQUENCY_192K,     "[192kHz]"},
-    {0,                          NULL}
-};
-
-#define CLOCK_MULTIPLIER_0     0
-#define CLOCK_MULTIPLIER_1     1
-#define CLOCK_MULTIPLIER_2     2
-#define CLOCK_MULTIPLIER_3     3
-#define CLOCK_MULTIPLIER_4     4
-
-static const value_string clock_multiplier_type_vals [] = {
-    {CLOCK_MULTIPLIER_0,       "[1.0]"},
-    {CLOCK_MULTIPLIER_1,       "[1/1.001]"},
-    {CLOCK_MULTIPLIER_2,       "[1.001]"},
-    {CLOCK_MULTIPLIER_3,       "[24/25]"},
-    {CLOCK_MULTIPLIER_4,       "[25/24]"},
-    {0,                          NULL}
-};
-
-#define CRF_TYPE_OTHER             0
-#define CRF_TYPE_AUDIO             1
-#define CRF_TYPE_VIDEO_FRAME_SYNC  2
-#define CRF_TYPE_VIDEO_LINE_SYNC   3
-#define CRF_TYPE_EXPERIMENTAL      0xffff
-
-static const value_string clock_reference_format_type_vals [] = {
-    {CRF_TYPE_OTHER,                 "Other"},
-    {CRF_TYPE_AUDIO,                 "Audio Sample Timestamp"},
-    {CRF_TYPE_VIDEO_FRAME_SYNC,      "Video Frame Sync Timestamp"},
-    {CRF_TYPE_VIDEO_LINE_SYNC,       "Video Line Sync Timestamp"},
-    {CRF_TYPE_EXPERIMENTAL,          "Experimental"},
-    {0,                              NULL}
-};
-
-/**********************************************************/
-/* Initialize the protocol and registered fields          */
-/**********************************************************/
-/* 1722a audio */
-static int proto_1722a = -1;
-static int hf_1722a_mrfield = -1;
-static int hf_1722a_tvfield = -1;
-static int hf_1722a_seqnum = -1;
-static int hf_1722a_tufield = -1;
-static int hf_1722a_stream_id = -1;
-static int hf_1722a_avbtp_timestamp = -1;
-static int hf_1722a_format_info = -1;
-static int hf_1722a_nominal_sample_rate = -1;
-static int hf_1722a_bit_depth = -1;
-static int hf_1722a_stream_data_length = -1;
-static int hf_1722a_sparse_timestamp = -1;
-static int hf_1722a_evtfield = -1;
-static int hf_1722a_channels_per_frame = -1;
-static int hf_1722a_data = -1;
-static int hf_1722a_sample = -1;
-
-/* CRF */
-static int hf_1722a_crf_type = -1;
-static int hf_1722a_clock_frequency = -1;
-static int hf_1722a_clock_multiplier = -1;
-static int hf_1722a_timestamp_interval = -1;
-static int hf_1722a_crf_timestamp = -1;
-static int hf_1722a_crf_timestamp_data = -1;
-
-/* Initialize the subtree pointers */
-static int ett_1722a = -1;
-static int ett_1722a_audio = -1;
-static int ett_1722a_sample = -1;
-static int ett_1722a_crf_timestamp = -1;
-
-static expert_field ei_sample_width         = EI_INIT;
-static expert_field ei_channels_per_frame   = EI_INIT;
-/* static expert_field ei_unknown_parameter    = EI_INIT; */
-static expert_field ei_format_info          = EI_INIT;
-static expert_field ei_clock_reference_type = EI_INIT;
-
-
-static int dissect_1722a (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
-{
-    proto_item *ti                 = NULL;
-    proto_tree *ieee1722a_tree     = NULL;
-    proto_tree *audio_tree         = NULL;
-    proto_tree *sample_tree        = NULL;
-    proto_tree *timestamp_tree     = NULL;
-    gint        offset             = 0;
-    guint16     datalen            = 0;
-    guint16     channels_per_frame = 0;
-    guint8      subtype            = 0;
-    gint        sample_width       = 0;
-    int         i, j;
-
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE1722a");
-
-    col_set_str(pinfo->cinfo, COL_INFO, "AVB Transportation Protocol");
-
-    if (tree)
-    {
-        ti = proto_tree_add_item(tree, proto_1722a, tvb, 0, -1, ENC_NA);
-        ieee1722a_tree = proto_item_add_subtree(ti, ett_1722a);
-    }
-
-    /* Version field ends the common AVTPDU. Now parse the specific packet type */
-    subtype = tvb_get_guint8(tvb, IEEE_1722A_CD_OFFSET);
-    subtype &= IEEE_1722A_SUBTYPE_MASK;
-
-    switch (subtype)
-    {
-    case IEEE_1722A_SUBTYPE_AVTP_AUDIO:
-        if (tree)
-        {
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_mrfield,         tvb, IEEE_1722A_VERSION_OFFSET,     1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_tvfield,         tvb, IEEE_1722A_VERSION_OFFSET,     1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_seqnum,          tvb, IEEE_1722A_SEQ_NUM_OFFSET,     1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_tufield,         tvb, IEEE_1722A_TU_FIELD_OFFSET,    1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_stream_id,       tvb, IEEE_1722A_STREAM_ID_OFFSET,   8, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_avbtp_timestamp, tvb, IEEE_1722A_TIMESTAMP_OFFSET,   4, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_format_info,     tvb, IEEE_1722A_FORMAT_INFO_OFFSET, 1, ENC_BIG_ENDIAN);
-
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_nominal_sample_rate, tvb, IEEE_1722A_NOM_SAMPLE_RATE_OFFSET,        1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_channels_per_frame,  tvb, IEEE_1722A_CHANNELS_PER_FRAME_OFFSET,     2, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_bit_depth,           tvb, IEEE_1722A_BIT_DEPTH_OFFSET,              1, ENC_BIG_ENDIAN);
-            ti = proto_tree_add_item(ieee1722a_tree, hf_1722a_stream_data_length, tvb, IEEE_1722A_STREAM_DATA_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN);
-            proto_item_append_text(ti, " bytes");
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_sparse_timestamp, tvb, IEEE_1722A_SPARSE_TIMESTAMP_OFFSET, 1, ENC_BIG_ENDIAN);
-            proto_tree_add_item(ieee1722a_tree, hf_1722a_evtfield,         tvb, IEEE_1722A_EVT_OFFSET,              1, ENC_BIG_ENDIAN);
-        }
-        /* Make the Audio sample tree. */
-        datalen    = tvb_get_ntohs(tvb, IEEE_1722A_STREAM_DATA_LENGTH_OFFSET); /* Length of audio data in bytes */
-        ti         = proto_tree_add_item(ieee1722a_tree, hf_1722a_data, tvb, IEEE_1722A_DATA_OFFSET, datalen, ENC_NA);
-        audio_tree = proto_item_add_subtree(ti, ett_1722a_audio);
-
-        /* Need to get the offset of where the audio data starts */
-        offset              = IEEE_1722A_DATA_OFFSET;
-        channels_per_frame  = tvb_get_ntohs(tvb, IEEE_1722A_CHANNELS_PER_FRAME_OFFSET);
-        channels_per_frame &= IEEE_1722A_CHANNEL_PER_FRAME_MASK;
-
-        switch (tvb_get_guint8(tvb, IEEE_1722A_FORMAT_INFO_OFFSET))
-        {
-        case 0:
-            break;
-        case 1:
-            sample_width = 32;
-            break;
-        case 2:
-            sample_width = 32;
-            break;
-        case 3:
-            sample_width = 24;
-            break;
-        case 4:
-            sample_width = 16;
-            break;
-        default:
-            expert_add_info(pinfo, ti, &ei_format_info);
-            break;
-        }
-
-        if (sample_width == 0)
-        {
-            expert_add_info(pinfo, ti, &ei_sample_width);
-        }
-        else
-        {
-            if (channels_per_frame == 0)
-            {
-                expert_add_info(pinfo, ti, &ei_channels_per_frame);
-            }
-            else
-            {
-                if (tree)
-                {
-                    /* Loop through all samples and add them to the audio tree. */
-                    for (j = 0; j < ((datalen * 8) / (channels_per_frame * sample_width)); j++)
-                    {
-                        sample_tree = proto_tree_add_subtree_format(audio_tree, tvb, offset, 1,
-                                                        ett_1722a_sample, &ti, "Sample Chunk %d", j);
-                        for (i = 0; i < channels_per_frame; i++)
-                        {
-                            ti = proto_tree_add_item(sample_tree, hf_1722a_sample, tvb, offset, sample_width / 8, ENC_NA);
-                            proto_item_prepend_text(ti, "Channel: %d ", i);
-                            offset += (sample_width / 8);
-                        }
-                    }
-                }
-            }
-        }
-        break;
-    case IEEE_1722A_SUBTYPE_CRF:
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_mrfield,   tvb, IEEE_1722A_VERSION_OFFSET,   1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_tvfield,   tvb, IEEE_1722A_VERSION_OFFSET,   1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_seqnum,    tvb, IEEE_1722A_SEQ_NUM_OFFSET,   1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_tufield,   tvb, IEEE_1722A_TU_FIELD_OFFSET,  1, ENC_BIG_ENDIAN);
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_stream_id, tvb, IEEE_1722A_STREAM_ID_OFFSET, 8, ENC_BIG_ENDIAN);
-        ti = proto_tree_add_item(ieee1722a_tree, hf_1722a_stream_data_length, tvb, IEEE_1722A_STREAM_DATA_LENGTH_OFFSET, 2, ENC_BIG_ENDIAN);
-        proto_item_append_text(ti, " bytes");
-        proto_tree_add_item(ieee1722a_tree, hf_1722a_crf_type,  tvb, IEEE_1722A_CRF_TYPE_OFFSET,  2, ENC_BIG_ENDIAN);
-
-        switch (tvb_get_ntohs(tvb, IEEE_1722A_CRF_TYPE_OFFSET))
-        {
-        /* Audio Timestamp Case */
-        case IEEE_1722A_CRF_AUDIO_SAMPLE_TIMESTAMP:
-            if (tree)
-            {
-                proto_tree_add_item(ieee1722a_tree, hf_1722a_clock_frequency,    tvb, IEEE_1722A_CRF_CLOCK_FREQUENCY_OFFSET,    1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(ieee1722a_tree, hf_1722a_clock_multiplier,   tvb, IEEE_1722A_CRF_CLOCK_MULTIPLIER_OFFSET,   1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(ieee1722a_tree, hf_1722a_timestamp_interval, tvb, IEEE_1722A_CRF_TIMESTAMP_INTERVAL_OFFSET, 2, ENC_BIG_ENDIAN);
-                /* Make the Timestamp tree. */
-                datalen = tvb_get_ntohs(tvb, IEEE_1722A_STREAM_DATA_LENGTH_OFFSET);
-                datalen = datalen - 6; /* remove type field and type header */
-                ti = proto_tree_add_item(ieee1722a_tree, hf_1722a_crf_timestamp, tvb, IEEE_1722A_CRF_AUDIO_TIMESTAMP_OFFSET, datalen, ENC_NA);
-                timestamp_tree = proto_item_add_subtree(ti, ett_1722a_crf_timestamp);
-                offset = IEEE_1722A_CRF_AUDIO_TIMESTAMP_OFFSET;
-                /* Loop through all timestamps and add them to the timestamp tree. */
-                for (j = 0; j < (datalen / IEEE_1722A_CRF_TIMESTAMP_SIZE); j++)
-                {
-                    proto_tree_add_item(timestamp_tree, hf_1722a_crf_timestamp_data, tvb, offset, IEEE_1722A_CRF_TIMESTAMP_SIZE, ENC_BIG_ENDIAN);
-                    offset += IEEE_1722A_CRF_TIMESTAMP_SIZE;
-                }
-            }
-            break;
-        default:
-            expert_add_info(pinfo, ti, &ei_clock_reference_type);
-            break;
-        }
-        break;
-    default:
-        /* This dissector only registers for subtype 0x02 (AVTP Audio Format) and 0x05 (Clock Reference Format)
-           which will be handled above. So we won`t enter the default path. */
-        DISSECTOR_ASSERT_NOT_REACHED();
-        break;
-    }
-    return tvb_captured_length(tvb);
-}
-
-/* Register the protocol with Wireshark */
-void proto_register_1722a (void)
-{
-    expert_module_t *expert_1722a;
-
-    static hf_register_info hf[] =
-    {
-        { &hf_1722a_mrfield,
-            { "AVBTP Media Clock Restart", "ieee1722a.mrfield",
-              FT_BOOLEAN, 8, NULL, IEEE_1722A_MR_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_tvfield,
-            { "Source Timestamp Valid", "ieee1722a.tvfield",
-              FT_BOOLEAN, 8, NULL, IEEE_1722A_TV_MASK, NULL, HFILL }
-            },
-        { &hf_1722a_seqnum,
-            { "Sequence Number", "ieee1722a.seqnum",
-              FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_tufield,
-            { "AVBTP Timestamp Uncertain", "ieee1722a.tufield",
-              FT_BOOLEAN, 8, NULL, IEEE_1722A_TU_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_stream_id,
-            { "Stream ID", "ieee1722a.stream_id",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_avbtp_timestamp,
-            { "AVBTP Timestamp", "ieee1722a.avbtp_timestamp",
-              FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_format_info,
-            { "Format Info", "ieee1722a.format_info",
-              FT_UINT8, BASE_HEX, VALS(format_info_vals), 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_nominal_sample_rate,
-            { "Nominal Sample Rate", "ieee1722a.nominal_sample_rate",
-              FT_UINT8, BASE_HEX, VALS(sample_rate_type_vals), IEEE_1722A_NOM_SAMPLE_RATE_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_bit_depth,
-            { "Bit Depth", "ieee1722a.bit_depth",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_stream_data_length,
-            { "Stream Data Length", "ieee1722a.stream_data_len",
-              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_sparse_timestamp,
-            { "Sparse Timestamp Mode", "ieee1722a.sparse_timestamp",
-              FT_BOOLEAN, 8, NULL, IEEE_1722A_SP_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_evtfield,
-            { "EVT", "ieee1722a.evtfield",
-              FT_UINT8, BASE_HEX, NULL, IEEE_1722A_EVT_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_channels_per_frame,
-            { "Channels per Frame", "ieee1722a.channels_per_frame",
-              FT_UINT16, BASE_DEC, NULL, IEEE_1722A_CHANNEL_PER_FRAME_MASK, NULL, HFILL }
-        },
-        { &hf_1722a_data,
-            { "Audio Data", "ieee1722a.data",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_sample,
-            { "Sample Data", "ieee1722a.data.sample.sampledata",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_crf_type,
-            { "Type", "ieee1722a.type",
-              FT_UINT16, BASE_HEX, VALS(clock_reference_format_type_vals), 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_clock_frequency,
-            { "Clock Frequency", "ieee1722a.clock_frequency",
-              FT_UINT8, BASE_HEX, VALS(clock_frequency_type_vals), 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_clock_multiplier,
-            { "Clock Multiplier", "ieee1722a.clock_multiplier",
-              FT_UINT8, BASE_HEX, VALS(clock_multiplier_type_vals), 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_timestamp_interval,
-            { "Timestamp Interval", "ieee1722a.timestamp_interval",
-              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_crf_timestamp,
-            { "Timestamps", "ieee1722a.crf_timestamps",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
-        },
-        { &hf_1722a_crf_timestamp_data,
-            { "Timestamp Data", "ieee1722a.crf_timestamp_data",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
-        }
-    };
-
-    static ei_register_info ei[] = {
-        { &ei_sample_width,                 { "1722a.expert.sample_width_zero", PI_PROTOCOL, PI_WARN, "Wrong value for Sample Width", EXPFILL }},
-        { &ei_channels_per_frame,           { "1722a.expert.channels_per_frame_zero", PI_PROTOCOL, PI_WARN, "Wrong value for parameter Channels per Frame", EXPFILL }},
-#if 0
-        { &ei_unknown_parameter,            { "1722a.expert.unknown_parameter", PI_PROTOCOL, PI_WARN, "Unknown parameter", EXPFILL }},
-#endif
-        { &ei_format_info,                  { "1722a.expert.format_info", PI_PROTOCOL, PI_WARN, "Format Info Value Reserved", EXPFILL }},
-        { &ei_clock_reference_type,         { "1722a.expert.clock_reference_format_type", PI_PROTOCOL, PI_WARN, "The CRF type is not supported", EXPFILL }}
-    };
-
-    static gint *ett[] =
-    {
-        &ett_1722a,
-        &ett_1722a_audio,
-        &ett_1722a_sample,
-        &ett_1722a_crf_timestamp
-    };
-
-    /* Register the protocol name and description */
-    proto_1722a = proto_register_protocol(
-        "IEEE 1722a Protocol", /* name */
-        "1722A",               /* short name */
-        "1722a"                /* abbrev */
-        );
-
-    /* Required function calls to register the header fields and subtrees used */
-    proto_register_field_array(proto_1722a, hf, array_length(hf));
-    proto_register_subtree_array(ett, array_length(ett));
-
-    expert_1722a = expert_register_protocol(proto_1722a);
-    expert_register_field_array(expert_1722a, ei, array_length(ei));
-}
-
-void proto_reg_handoff_1722a(void)
-{
-    dissector_handle_t avb1722a_handle;
-
-    avb1722a_handle = create_dissector_handle(dissect_1722a, proto_1722a);
-    dissector_add_uint("ieee1722.subtype", IEEE_1722A_SUBTYPE_AVTP_AUDIO, avb1722a_handle);
-    dissector_add_uint("ieee1722.subtype", IEEE_1722A_SUBTYPE_CRF,        avb1722a_handle);
-}
-
-/*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
- *
- * Local variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * vi: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */