From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7007 :
This patch adds support for the DVB Bouquet Association Table (BAT) from ETSI EN 300 468. With this last patch, the support for the DVB SI table is quite complete. svn path=/trunk/; revision=41836
This commit is contained in:
Jeff Morriss
parent
be562947a6
commit
786c604ad0
1
AUTHORS
1
AUTHORS
|
|
@ -3414,6 +3414,7 @@ Guy Martin <gmsoft [AT] tuxicoman.be> {
|
|||
DVB Service Description Table (SDT) dissector
|
||||
DVB Time and Date Table (TDT) dissector
|
||||
DVB Time Offset Table (TOT) dissector
|
||||
DVB Bouquet Association Table (BAT) dissector
|
||||
MPEG2 Conditional Access Table (CA) dissector
|
||||
MPEG2 descriptors dissector
|
||||
MPEG2 Program Associate Table (PAT) dissector
|
||||
|
|
|
|||
|
|
@ -532,6 +532,7 @@ set(DISSECTOR_SRC
|
|||
dissectors/packet-dtpt.c
|
||||
dissectors/packet-dua.c
|
||||
dissectors/packet-dvb-data-mpe.c
|
||||
dissectors/packet-dvb-bat.c
|
||||
dissectors/packet-dvb-eit.c
|
||||
dissectors/packet-dvb-ipdc.c
|
||||
dissectors/packet-dvb-nit.c
|
||||
|
|
|
|||
|
|
@ -450,6 +450,7 @@ DISSECTOR_SRC = \
|
|||
packet-dtpt.c \
|
||||
packet-dua.c \
|
||||
packet-dvb-data-mpe.c \
|
||||
packet-dvb-bat.c \
|
||||
packet-dvb-eit.c \
|
||||
packet-dvb-ipdc.c \
|
||||
packet-dvb-nit.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,277 @@
|
|||
/* packet-dvb-bat.c
|
||||
* Routines for DVB (ETSI EN 300 468) Bouquet Association Table (BAT) dissection
|
||||
* Copyright 2012, Guy Martin <gmsoft@tuxicoman.be>
|
||||
*
|
||||
* $Id$
|
||||
*
|
||||
* 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; bather 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.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include <epan/dissectors/packet-mpeg-sect.h>
|
||||
|
||||
#include "packet-mpeg-descriptor.h"
|
||||
|
||||
static int proto_dvb_bat = -1;
|
||||
static int hf_dvb_bat_bouquet_id = -1;
|
||||
static int hf_dvb_bat_reserved1 = -1;
|
||||
static int hf_dvb_bat_version_number = -1;
|
||||
static int hf_dvb_bat_current_next_indicator = -1;
|
||||
static int hf_dvb_bat_section_number = -1;
|
||||
static int hf_dvb_bat_last_section_number = -1;
|
||||
|
||||
static int hf_dvb_bat_reserved2 = -1;
|
||||
static int hf_dvb_bat_bouquet_descriptors_length = -1;
|
||||
|
||||
static int hf_dvb_bat_reserved3 = -1;
|
||||
static int hf_dvb_bat_transport_stream_loop_length = -1;
|
||||
|
||||
static int hf_dvb_bat_transport_stream_id = -1;
|
||||
static int hf_dvb_bat_original_network_id = -1;
|
||||
static int hf_dvb_bat_reserved4 = -1;
|
||||
static int hf_dvb_bat_transport_descriptors_length = -1;
|
||||
|
||||
static gint ett_dvb_bat = -1;
|
||||
static gint ett_dvb_bat_transport_stream = -1;
|
||||
|
||||
|
||||
#define DVB_BAT_TID 0x4A
|
||||
|
||||
#define DVB_BAT_RESERVED1_MASK 0xC0
|
||||
#define DVB_BAT_VERSION_NUMBER_MASK 0x3E
|
||||
#define DVB_BAT_CURRENT_NEXT_INDICATOR_MASK 0x01
|
||||
|
||||
#define DVB_BAT_RESERVED2_MASK 0xF000
|
||||
#define DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK 0x0FFF
|
||||
|
||||
#define DVB_BAT_RESERVED3_MASK 0xF000
|
||||
#define DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK 0x0FFF
|
||||
|
||||
#define DVB_BAT_RESERVED4_MASK 0xF000
|
||||
#define DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK 0x0FFF
|
||||
|
||||
static const value_string dvb_bat_cur_next_vals[] = {
|
||||
{ 0, "Not yet applicable" },
|
||||
{ 1, "Currently applicable" },
|
||||
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string dvb_bat_running_status_vals[] = {
|
||||
{ 0, "Undefined" },
|
||||
{ 1, "Not Running" },
|
||||
{ 2, "Starts in a few seconds" },
|
||||
{ 3, "Pausing" },
|
||||
{ 4, "Running" },
|
||||
{ 5, "Service off-air" },
|
||||
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const value_string dvb_bat_free_ca_mode_vals[] = {
|
||||
{ 0, "Not Scrambled" },
|
||||
{ 1, "One or more component scrambled" },
|
||||
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static void
|
||||
dissect_dvb_bat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
|
||||
guint offset = 0, length = 0, descriptor_end = 0, ts_loop_end = 0;
|
||||
guint16 ts_id = 0, descriptor_len = 0, ts_loop_len = 0;
|
||||
|
||||
proto_item *ti = NULL;
|
||||
proto_tree *dvb_bat_tree = NULL;
|
||||
proto_item *tsi = NULL;
|
||||
proto_tree *transport_stream_tree = NULL;
|
||||
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Bouquet Association Table (BAT)");
|
||||
|
||||
if (!tree)
|
||||
return;
|
||||
|
||||
ti = proto_tree_add_item(tree, proto_dvb_bat, tvb, offset, -1, ENC_NA);
|
||||
dvb_bat_tree = proto_item_add_subtree(ti, ett_dvb_bat);
|
||||
|
||||
offset += packet_mpeg_sect_header(tvb, offset, dvb_bat_tree, &length, NULL);
|
||||
length -= 4;
|
||||
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_version_number, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_current_next_indicator, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_last_section_number, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
descriptor_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK;
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_bouquet_descriptors_length, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
descriptor_end = offset + descriptor_len;
|
||||
while (offset < descriptor_end)
|
||||
offset += proto_mpeg_descriptor_dissect(tvb, offset, dvb_bat_tree);
|
||||
|
||||
ts_loop_len = tvb_get_ntohs(tvb, offset) & DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK;
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_reserved3, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(dvb_bat_tree, hf_dvb_bat_transport_stream_loop_length, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
ts_loop_end = offset + ts_loop_len;
|
||||
while (offset < ts_loop_end) {
|
||||
ts_id = tvb_get_ntohs(tvb, offset);
|
||||
descriptor_len = tvb_get_ntohs(tvb, offset + 4) & DVB_BAT_TRANSPORT_DESCRIPTORS_LENGTH_MASK;
|
||||
|
||||
tsi = proto_tree_add_text(dvb_bat_tree, tvb, offset, 6 + descriptor_len, "Transport Stream 0x%04x", ts_id);
|
||||
transport_stream_tree = proto_item_add_subtree(tsi, ett_dvb_bat_transport_stream);
|
||||
|
||||
proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(transport_stream_tree, hf_dvb_bat_original_network_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(transport_stream_tree, hf_dvb_bat_reserved4, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(transport_stream_tree, hf_dvb_bat_transport_descriptors_length, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
descriptor_end = offset + descriptor_len;
|
||||
while (offset < descriptor_end)
|
||||
offset += proto_mpeg_descriptor_dissect(tvb, offset, transport_stream_tree);
|
||||
}
|
||||
|
||||
packet_mpeg_sect_crc(tvb, pinfo, dvb_bat_tree, 0, offset);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
proto_register_dvb_bat(void)
|
||||
{
|
||||
|
||||
static hf_register_info hf[] = {
|
||||
|
||||
{ &hf_dvb_bat_bouquet_id, {
|
||||
"Service ID", "dvb_bat.sid",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_reserved1, {
|
||||
"Reserved", "dvb_bat.reserved1",
|
||||
FT_UINT8, BASE_HEX, NULL, DVB_BAT_RESERVED1_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_version_number, {
|
||||
"Version Number", "dvb_bat.version",
|
||||
FT_UINT8, BASE_HEX, NULL, DVB_BAT_VERSION_NUMBER_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_current_next_indicator, {
|
||||
"Current/Next Indicator", "dvb_bat.cur_next_ind",
|
||||
FT_UINT8, BASE_DEC, VALS(dvb_bat_cur_next_vals), DVB_BAT_CURRENT_NEXT_INDICATOR_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_section_number, {
|
||||
"Section Number", "dvb_bat.sect_num",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_last_section_number, {
|
||||
"Last Section Number", "dvb_bat.last_sect_num",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_reserved2, {
|
||||
"Reserved", "dvb_bat.reserved2",
|
||||
FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED2_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_bouquet_descriptors_length, {
|
||||
"Bouquet Descriptors Length", "dvb_bat.bouquet_desc_len",
|
||||
FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_reserved3, {
|
||||
"Reserved", "dvb_bat.reserved3",
|
||||
FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED3_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_transport_stream_loop_length, {
|
||||
"Transport Stream Loop Length", "dvb_bat.ts_loop_len",
|
||||
FT_UINT16, BASE_DEC, NULL, DVB_BAT_TRANSPORT_STREAM_LOOP_LENGTH_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_transport_stream_id, {
|
||||
"Transport Stream ID", "dvb_bat.ts.id",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_original_network_id, {
|
||||
"Original Network ID", "dvb_bat.ts.original_nid",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_reserved4, {
|
||||
"Reserved", "dvb_bat.ts.reserved",
|
||||
FT_UINT16, BASE_HEX, NULL, DVB_BAT_RESERVED4_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_dvb_bat_transport_descriptors_length, {
|
||||
"Bouquet Descriptors Length", "dvb_bat.ts.desc_len",
|
||||
FT_UINT16, BASE_DEC, NULL, DVB_BAT_BOUQUET_DESCRIPTORS_LENGTH_MASK, NULL, HFILL
|
||||
} },
|
||||
|
||||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
&ett_dvb_bat,
|
||||
&ett_dvb_bat_transport_stream
|
||||
};
|
||||
|
||||
proto_dvb_bat = proto_register_protocol("DVB Bouquet Association Table", "DVB BAT", "dvb_bat");
|
||||
|
||||
proto_register_field_array(proto_dvb_bat, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
}
|
||||
|
||||
|
||||
void proto_reg_handoff_dvb_bat(void)
|
||||
{
|
||||
dissector_handle_t dvb_bat_handle;
|
||||
|
||||
dvb_bat_handle = create_dissector_handle(dissect_dvb_bat, proto_dvb_bat);
|
||||
|
||||
dissector_add_uint("mpeg_sect.tid", DVB_BAT_TID, dvb_bat_handle);
|
||||
}
|
||||
|
|
@ -922,6 +922,15 @@ proto_mpeg_descriptor_dissect_vbi_data(tvbuff_t *tvb, guint offset, guint8 len,
|
|||
}
|
||||
}
|
||||
|
||||
/* 0x47 Bouquet Name Descriptor */
|
||||
static int hf_mpeg_descr_bouquet_name = -1;
|
||||
|
||||
static void
|
||||
proto_mpeg_descriptor_dissect_bouquet_name(tvbuff_t *tvb, guint offset, guint8 len, proto_tree *tree)
|
||||
{
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_bouquet_name, tvb, offset, len, ENC_ASCII|ENC_NA);
|
||||
}
|
||||
|
||||
/* 0x48 Service Descriptor */
|
||||
static int hf_mpeg_descr_service_type = -1;
|
||||
static int hf_mpeg_descr_service_provider_name_length = -1;
|
||||
|
|
@ -999,8 +1008,16 @@ static int hf_mpeg_descr_linkage_target_listed = -1;
|
|||
static int hf_mpeg_descr_linkage_event_simulcast = -1;
|
||||
static int hf_mpeg_descr_linkage_reserved2 = -1;
|
||||
|
||||
static int hf_mpeg_descr_linkage_interactive_network_id = -1;
|
||||
static int hf_mpeg_descr_linkage_population_id_loop_count = -1;
|
||||
static int hf_mpeg_descr_linkage_population_id = -1;
|
||||
static int hf_mpeg_descr_linkage_population_id_base = -1;
|
||||
static int hf_mpeg_descr_linkage_population_id_mask = -1;
|
||||
|
||||
static int hf_mpeg_descr_linkage_private_data_byte = -1;
|
||||
|
||||
static gint ett_mpeg_descriptor_linkage_population_id = -1;
|
||||
|
||||
#define MPEG_DESCR_LINKAGE_HAND_OVER_TYPE_MASK 0xF0
|
||||
#define MPEG_DESCR_LINKAGE_HAND_OVER_TYPE_SHIFT 0x04
|
||||
#define MPEG_DESCR_LINKAGE_RESERVED1_MASK 0x0E
|
||||
|
|
@ -1024,6 +1041,7 @@ static const value_string mpeg_descr_linkage_linkage_type_vals[] = {
|
|||
{ 0x0B, "IP/MAC Notification Service" },
|
||||
{ 0x0C, "TS containing INT BAT or NIT" },
|
||||
{ 0x0D, "Event linkage" },
|
||||
{ 0x81, "RCS FLS" },
|
||||
|
||||
{ 0x00, NULL }
|
||||
};
|
||||
|
|
@ -1063,6 +1081,10 @@ proto_mpeg_descriptor_dissect_linkage(tvbuff_t *tvb, guint offset, guint8 len, p
|
|||
|
||||
guint8 linkage_type, hand_over_type, origin_type;
|
||||
guint end = offset + len;
|
||||
guint population_id_loop_count = 0;
|
||||
guint16 population_id_base = 0, population_id_mask = 0;
|
||||
proto_item *pi = NULL;
|
||||
proto_tree *population_tree = NULL;
|
||||
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_transport_stream_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
|
@ -1095,15 +1117,36 @@ proto_mpeg_descriptor_dissect_linkage(tvbuff_t *tvb, guint offset, guint8 len, p
|
|||
offset += 2;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (linkage_type == 0x0D) {
|
||||
} else if (linkage_type == 0x0D) {
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_target_event_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_target_listed, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_event_simulcast, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_reserved2, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
} else if (linkage_type == 0x81) {
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_interactive_network_id, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
population_id_loop_count = tvb_get_guint8(tvb, offset) + 1;
|
||||
proto_tree_add_item(tree, hf_mpeg_descr_linkage_population_id_loop_count, tvb, offset, 1, ENC_BIG_ENDIAN);
|
||||
offset++;
|
||||
|
||||
while (population_id_loop_count--) {
|
||||
|
||||
population_id_base = tvb_get_ntohs(tvb, offset);
|
||||
population_id_mask = tvb_get_ntohs(tvb, offset + 2);
|
||||
pi = proto_tree_add_string_format_value(tree, hf_mpeg_descr_linkage_population_id, tvb, offset, 4, "Population ID", "0x%04x/0x%04x",
|
||||
population_id_base, population_id_mask);
|
||||
population_tree = proto_item_add_subtree(pi, ett_mpeg_descriptor_linkage_population_id);
|
||||
|
||||
proto_tree_add_item(population_tree, hf_mpeg_descr_linkage_population_id_base, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_item(population_tree, hf_mpeg_descr_linkage_population_id_mask, tvb, offset, 2, ENC_BIG_ENDIAN);
|
||||
offset += 2;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (end - offset > 0)
|
||||
|
|
@ -2416,6 +2459,9 @@ proto_mpeg_descriptor_dissect(tvbuff_t *tvb, guint offset, proto_tree *tree)
|
|||
case 0x45: /* VBI Data Descriptor */
|
||||
proto_mpeg_descriptor_dissect_vbi_data(tvb, offset, len, descriptor_tree);
|
||||
break;
|
||||
case 0x47: /* Bouquet Name Descriptor */
|
||||
proto_mpeg_descriptor_dissect_bouquet_name(tvb, offset, len, descriptor_tree);
|
||||
break;
|
||||
case 0x48: /* Service Descriptor */
|
||||
proto_mpeg_descriptor_dissect_service(tvb, offset, descriptor_tree);
|
||||
break;
|
||||
|
|
@ -2981,6 +3027,12 @@ proto_register_mpeg_descriptor(void)
|
|||
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
/* 0x47 Bouquet Name Descriptor */
|
||||
{ &hf_mpeg_descr_bouquet_name, {
|
||||
"Bouquet Name Descriptor", "mpeg_descr.bouquet_name.name",
|
||||
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
/* 0x48 Service Descriptor */
|
||||
{ &hf_mpeg_descr_service_type, {
|
||||
"Service Type", "mpeg_descr.svc.type",
|
||||
|
|
@ -3080,6 +3132,31 @@ proto_register_mpeg_descriptor(void)
|
|||
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_mpeg_descr_linkage_interactive_network_id, {
|
||||
"Interactive Network ID", "mpeg_descr.interactive_network_id",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_mpeg_descr_linkage_population_id_loop_count, {
|
||||
"Population ID loop count", "mpeg_descr.population_id_loop_count",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_mpeg_descr_linkage_population_id, {
|
||||
"Population ID", "mpeg_descr.population_id",
|
||||
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_mpeg_descr_linkage_population_id_base, {
|
||||
"Population ID Base", "mpeg_descr.population_id_base",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
{ &hf_mpeg_descr_linkage_population_id_mask, {
|
||||
"Population ID Mask", "mpeg_descr.population_id_mask",
|
||||
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
|
||||
} },
|
||||
|
||||
/* 0x4D Short Event Descriptor */
|
||||
{ &hf_mpeg_descr_short_event_lang_code, {
|
||||
"Language Code", "mpeg_descr.short_evt.lang_code",
|
||||
|
|
@ -3740,7 +3817,8 @@ proto_register_mpeg_descriptor(void)
|
|||
&ett_mpeg_descriptor_vbi_data_service,
|
||||
&ett_mpeg_descriptor_content_identifier_crid,
|
||||
&ett_mpeg_descriptor_service_list,
|
||||
&ett_mpeg_descriptor_ac3_component_type
|
||||
&ett_mpeg_descriptor_ac3_component_type,
|
||||
&ett_mpeg_descriptor_linkage_population_id
|
||||
};
|
||||
|
||||
proto_mpeg_descriptor = proto_register_protocol("MPEG2 Descriptors", "MPEG Descriptor", "mpeg_descr");
|
||||
|
|
|
|||
Loading…
Reference in New Issue