diff options
Diffstat (limited to 'packet-mpeg1.c')
| -rw-r--r-- | packet-mpeg1.c | 290 |
1 files changed, 145 insertions, 145 deletions
diff --git a/packet-mpeg1.c b/packet-mpeg1.c index 1f3901592d..0c2d8800f0 100644 --- a/packet-mpeg1.c +++ b/packet-mpeg1.c @@ -2,25 +2,25 @@ * * Routines for RFC 2250 MPEG-1 dissection * - * $Id: packet-mpeg1.c,v 1.8 2002/08/02 23:35:54 jmayer Exp $ - * - * Copyright 2001, + * $Id: packet-mpeg1.c,v 1.9 2002/08/28 21:00:22 jmayer Exp $ + * + * Copyright 2001, * Francisco Javier Cabello Torres, <fjcabello@vtools.es> * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -87,7 +87,7 @@ static int hf_rtp_mpg_data = -1; /* MPEG-1 fields defining a sub tree */ static gint ett_mpg = -1; -static const value_string rtp_mpg_picture_types_vals[] = +static const value_string rtp_mpg_picture_types_vals[] = { { 0, "Forbidden" }, { 1, "I-Picture" }, @@ -109,40 +109,40 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint8 octet; guint16 word; - - + + guint16 mpg_mbz; guint16 mpg_T; - guint16 mpg_tr; + guint16 mpg_tr; guint16 mpg_an; guint16 mpg_n; - gboolean mpg_s; + gboolean mpg_s; gboolean mpg_b; gboolean mpg_e; - guint16 mpg_p; + guint16 mpg_p; guint16 mpg_fbv; guint16 mpg_bfc; guint16 mpg_ffv; - guint16 mpg_ffc; - - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) + guint16 mpg_ffc; + + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { col_set_str( pinfo->cinfo, COL_PROTOCOL, "MPEG-1" ); } - - if ( check_col( pinfo->cinfo, COL_INFO) ) + + if ( check_col( pinfo->cinfo, COL_INFO) ) { col_set_str( pinfo->cinfo, COL_INFO, "MPEG-1 message"); } - + /* Get MPEG-1 fields */ - + word = tvb_get_guint8( tvb, offset ); word = (word << 8) | tvb_get_guint8( tvb, offset +1 ); mpg_mbz = RTP_MPG_MBZ(word); mpg_T = RTP_MPG_T(word); mpg_tr = RTP_MPG_TR(word); - + octet = tvb_get_guint8( tvb, offset + 2 ); mpg_an = RTP_MPG_AN(octet); mpg_n = RTP_MPG_N(octet); @@ -150,20 +150,20 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) mpg_b = RTP_MPG_B(octet); mpg_e = RTP_MPG_E(octet); mpg_p = RTP_MPG_P(octet); - + octet = tvb_get_guint8( tvb, offset + 3 ); - + mpg_fbv = RTP_MPG_FBV(octet); mpg_bfc = RTP_MPG_BFC(octet); mpg_ffv = RTP_MPG_FFV(octet); - mpg_ffc = RTP_MPG_FFC(octet); + mpg_ffc = RTP_MPG_FFC(octet); - - if ( tree ) + + if ( tree ) { ti = proto_tree_add_item( tree, proto_mpg, tvb, offset, -1, FALSE ); mpg_tree = proto_item_add_subtree( ti, ett_mpg ); - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_mbz, tvb, offset, 1, mpg_mbz ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_T , tvb, offset, 1, mpg_T ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_tr , tvb, offset, 2, mpg_tr ); @@ -173,16 +173,16 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_s , tvb, offset, 1, mpg_s ); proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_b , tvb, offset, 1, mpg_b ); proto_tree_add_boolean( mpg_tree, hf_rtp_mpg_e , tvb, offset, 1, mpg_e ); - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_p, tvb , offset, 1, mpg_p ); offset += 1; - + proto_tree_add_uint( mpg_tree, hf_rtp_mpg_fbv, tvb, offset, 1, mpg_fbv ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_bfc, tvb, offset, 1, mpg_bfc ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_ffv, tvb, offset, 1, mpg_ffv ); proto_tree_add_uint( mpg_tree, hf_rtp_mpg_ffc, tvb, offset, 1, mpg_ffc ); offset += 1; - + /* The rest of the packet is the MPEG-1 stream */ proto_tree_add_item( mpg_tree, hf_rtp_mpg_data, tvb, offset, -1, FALSE ); @@ -192,188 +192,188 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_register_mpeg1(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { - { + { &hf_rtp_mpg_mbz, - { - "MBZ", - "rtp.payload_mpeg_mbz", - FT_UINT16, - BASE_DEC, - NULL, + { + "MBZ", + "rtp.payload_mpeg_mbz", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_T, - { - "T", - "rtp.payload_mpeg_T", - FT_UINT16, - BASE_DEC, - NULL, + { + "T", + "rtp.payload_mpeg_T", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_tr, - { - "Temporal Reference", - "rtp.payload_mpeg_tr", - FT_UINT16, - BASE_DEC, - NULL, + { + "Temporal Reference", + "rtp.payload_mpeg_tr", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_an, - { - "AN", - "rtp.payload_mpeg_an", - FT_UINT16, - BASE_DEC, - NULL, + { + "AN", + "rtp.payload_mpeg_an", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_n, - { - "New Picture Header", - "rtp.payload_mpeg_n", - FT_UINT16, - BASE_DEC, - NULL, + { + "New Picture Header", + "rtp.payload_mpeg_n", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_s, - { - "Sequence Header", - "rtp.payload_mpeg_s", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "Sequence Header", + "rtp.payload_mpeg_s", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_b, - { - "Beginning-of-slice", - "rtp.payload_mpeg_b", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "Beginning-of-slice", + "rtp.payload_mpeg_b", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_e, - { - "End-of-slice", - "rtp.payload_mpeg_an", - FT_BOOLEAN, - BASE_DEC, - NULL, + { + "End-of-slice", + "rtp.payload_mpeg_an", + FT_BOOLEAN, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_p, - { - "Picture type", - "rtp.payload_mpeg_p", - FT_UINT16, - BASE_DEC, - VALS(rtp_mpg_picture_types_vals), + { + "Picture type", + "rtp.payload_mpeg_p", + FT_UINT16, + BASE_DEC, + VALS(rtp_mpg_picture_types_vals), 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_fbv, - { - "FBV", - "rtp.payload_mpeg_fbv", - FT_UINT16, - BASE_DEC, - NULL, + { + "FBV", + "rtp.payload_mpeg_fbv", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_bfc, - { - "BFC", - "rtp.payload_mpeg_bfc", - FT_UINT16, - BASE_DEC, - NULL, + { + "BFC", + "rtp.payload_mpeg_bfc", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_ffv, - { - "FFV", - "rtp.payload_mpeg_ffv", - FT_UINT16, - BASE_DEC, - NULL, + { + "FFV", + "rtp.payload_mpeg_ffv", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - - { + + { &hf_rtp_mpg_ffc, - { - "FFC", - "rtp.payload_mpeg_ffc", - FT_UINT16, - BASE_DEC, - NULL, + { + "FFC", + "rtp.payload_mpeg_ffc", + FT_UINT16, + BASE_DEC, + NULL, 0x0, - "", HFILL + "", HFILL } }, - { + { &hf_rtp_mpg_data, - { - "MPEG-1 stream", - "mpeg1.stream", - FT_BYTES, - BASE_NONE, - NULL, + { + "MPEG-1 stream", + "mpeg1.stream", + FT_BYTES, + BASE_NONE, + NULL, 0x0, - "", HFILL + "", HFILL } }, }; - - static gint *ett[] = + + static gint *ett[] = { &ett_mpg, }; |