diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-09-30 16:59:17 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-09-30 21:06:37 +0000 |
commit | 9b181b97c62542625a5ea6573e68c85202dd1f38 (patch) | |
tree | c210a0e51e6165a98bbe3eee64cf2e9a566cde49 /epan/dissectors/packet-rfc2190.c | |
parent | 6896c2648cbdd13a1a00d429ee43be6a2680f094 (diff) |
Add editor modelines; Adjust whitespace; Remove boilerplate comments
Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a
Reviewed-on: https://code.wireshark.org/review/4392
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-rfc2190.c')
-rw-r--r-- | epan/dissectors/packet-rfc2190.c | 618 |
1 files changed, 314 insertions, 304 deletions
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index 1a6816621d..bc5a9c6be6 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -46,7 +46,7 @@ void proto_register_rfc2190(void); void proto_reg_handoff_rfc2190(void); /* H.263 header fields */ -static int proto_rfc2190 = -1; +static int proto_rfc2190 = -1; /* Mode A header */ static int hf_rfc2190_ftype = -1; @@ -72,44 +72,44 @@ static int hf_rfc2190_vmv1 = -1; static int hf_rfc2190_hmv2 = -1; static int hf_rfc2190_vmv2 = -1; -static gint ett_rfc2190 = -1; +static gint ett_rfc2190 = -1; static dissector_handle_t h263_handle; static void dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { - proto_item *ti = NULL; - proto_tree *rfc2190_tree = NULL; - int offset = 0; - unsigned int rfc2190_version = 0; - tvbuff_t *next_tvb; - int hdr_len = 0; + proto_item *ti = NULL; + proto_tree *rfc2190_tree = NULL; + int offset = 0; + unsigned int rfc2190_version = 0; + tvbuff_t *next_tvb; + int hdr_len = 0; rfc2190_version = (tvb_get_guint8( tvb, offset ) & 0xc0 ) >> 6; col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 "); - /* Three formats (mode A, mode B and mode C) are defined for H.263 - * payload header. In mode A, an H.263 payload header of four bytes is - * present before actual compressed H.263 video bitstream in a packet. - * It allows fragmentation at GOB boundaries. In mode B, an eight byte - * H.263 payload header is used and each packet starts at MB boundaries - * without the PB-frames option. Finally, a twelve byte H.263 payload - * header is defined in mode C to support fragmentation at MB boundaries - * for frames that are coded with the PB-frames option. - */ + /* Three formats (mode A, mode B and mode C) are defined for H.263 + * payload header. In mode A, an H.263 payload header of four bytes is + * present before actual compressed H.263 video bitstream in a packet. + * It allows fragmentation at GOB boundaries. In mode B, an eight byte + * H.263 payload header is used and each packet starts at MB boundaries + * without the PB-frames option. Finally, a twelve byte H.263 payload + * header is defined in mode C to support fragmentation at MB boundaries + * for frames that are coded with the PB-frames option. + */ if( rfc2190_version == 0x00) { col_append_str( pinfo->cinfo, COL_INFO, "MODE A "); - hdr_len = 4; + hdr_len = 4; } else if( rfc2190_version == 0x02) { col_append_str( pinfo->cinfo, COL_INFO, "MODE B "); - hdr_len = 8; + hdr_len = 8; } else if( rfc2190_version == 0x03) { col_append_str( pinfo->cinfo, COL_INFO, "MODE C "); - hdr_len = 12; + hdr_len = 12; } if ( tree ) { @@ -117,27 +117,27 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) rfc2190_tree = proto_item_add_subtree( ti, ett_rfc2190 ); /* FBIT 1st octet, 1 bit */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_ftype, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_ftype, tvb, offset, 1, ENC_BIG_ENDIAN ); /* PBIT 1st octet, 1 bit */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_pbframes, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_pbframes, tvb, offset, 1, ENC_BIG_ENDIAN ); /* SBIT 1st octet, 3 bits */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_sbit, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_sbit, tvb, offset, 1, ENC_BIG_ENDIAN ); /* EBIT 1st octet, 3 bits */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_ebit, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_ebit, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* SRC 2nd octet, 3 bits */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_srcformat, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_srcformat, tvb, offset, 1, ENC_BIG_ENDIAN ); if(rfc2190_version == 0x00) { /* MODE A */ /* I flag, 1 bit */ - proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_picture_coding_type, tvb, (offset<<3)+3, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_picture_coding_type, tvb, (offset<<3)+3, 1, ENC_BIG_ENDIAN); /* U flag, 1 bit */ - proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_unrestricted_motion_vector, tvb, (offset<<3)+4, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_unrestricted_motion_vector, tvb, (offset<<3)+4, 1, ENC_BIG_ENDIAN); /* S flag, 1 bit */ - proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_syntax_based_arithmetic, tvb, (offset<<3)+5, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_syntax_based_arithmetic, tvb, (offset<<3)+5, 1, ENC_BIG_ENDIAN); /* A flag, 1 bit */ - proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, (offset<<3)+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, (offset<<3)+6, 1, ENC_BIG_ENDIAN); /* Reserved 2nd octect, 1 bit + 3rd octect 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_r, tvb, offset, 2, ( ( tvb_get_guint8( tvb, offset ) & 0x1 ) << 3 ) + ( ( tvb_get_guint8( tvb, offset + 1 ) & 0xe0 ) >> 5 ) ); @@ -145,9 +145,9 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) offset++; /* DBQ 3 octect, 2 bits */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ENC_BIG_ENDIAN ); /* TRB 3 octect, 3 bits */ - proto_tree_add_item( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, ENC_BIG_ENDIAN ); + proto_tree_add_item( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; /* TR 4 octect, 8 bits */ @@ -244,286 +244,296 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) void proto_reg_handoff_rfc2190(void) { - dissector_handle_t rfc2190_handle; + dissector_handle_t rfc2190_handle; - rfc2190_handle = find_dissector("rfc2190"); - dissector_add_uint("rtp.pt", PT_H263, rfc2190_handle); - dissector_add_uint("iax2.codec", AST_FORMAT_H263, rfc2190_handle); + rfc2190_handle = find_dissector("rfc2190"); + dissector_add_uint("rtp.pt", PT_H263, rfc2190_handle); + dissector_add_uint("iax2.codec", AST_FORMAT_H263, rfc2190_handle); - h263_handle = find_dissector("h263data"); + h263_handle = find_dissector("h263data"); } void proto_register_rfc2190(void) { - static hf_register_info hf[] = - { - { - &hf_rfc2190_ftype, - { - "F", - "rfc2190.ftype", - FT_BOOLEAN, - 8, - NULL, - 0x80, - "Indicates the mode of the payload header (MODE A or B/C)", HFILL - } - }, - { - &hf_rfc2190_pbframes, - { - "p/b frame", - "rfc2190.pbframes", - FT_BOOLEAN, - 8, - NULL, - 0x40, - "Optional PB-frames mode as defined by H.263 (MODE C)", HFILL - } - }, - { - &hf_rfc2190_sbit, - { - "Start bit position", - "rfc2190.sbit", - FT_UINT8, - BASE_DEC, - NULL, - 0x38, - "Start bit position specifies number of most significant bits that shall be ignored in the first data byte.", HFILL - } - }, - { - &hf_rfc2190_ebit, - { - "End bit position", - "rfc2190.ebit", - FT_UINT8, - BASE_DEC, - NULL, - 0x7, - "End bit position specifies number of least significant bits that shall be ignored in the last data byte.", HFILL - } - }, - { - &hf_rfc2190_srcformat, - { - "SRC format", - "rfc2190.srcformat", - FT_UINT8, - BASE_DEC, - VALS(h263_srcformat_vals), - 0xe0, - "Source format specifies the resolution of the current picture.", HFILL - } - }, - { - &hf_rfc2190_picture_coding_type, - { - "Inter-coded frame", - "rfc2190.picture_coding_type", - FT_BOOLEAN, - 8, - NULL, - 0x0, - "Picture coding type, intra-coded (false) or inter-coded (true)", HFILL - } - }, - { - &hf_rfc2190_unrestricted_motion_vector, - { - "Motion vector", - "rfc2190.unrestricted_motion_vector", - FT_BOOLEAN, - 8, - NULL, - 0x0, - "Unrestricted Motion Vector option for current picture", HFILL - } - }, - { - &hf_rfc2190_syntax_based_arithmetic, - { - "Syntax-based arithmetic coding", - "rfc2190.syntax_based_arithmetic", - FT_BOOLEAN, - 8, - NULL, - 0x0, - "Syntax-based Arithmetic Coding option for current picture", HFILL - } - }, - { - &hf_rfc2190_advanced_prediction, - { - "Advanced prediction option", - "rfc2190.advanced_prediction", - FT_BOOLEAN, - 8, - NULL, - 0x0, - "Advanced Prediction option for current picture", HFILL - } - }, - { - &hf_rfc2190_dbq, - { - "Differential quantization parameter", - "rfc2190.dbq", - FT_UINT8, - BASE_DEC, - NULL, - 0x18, - "Differential quantization parameter used to calculate quantizer for the B frame based on quantizer for the P frame, when PB-frames option is used.", HFILL - } - }, - { - &hf_rfc2190_trb, - { - "Temporal Reference for B frames", - "rfc2190.trb", - FT_UINT8, - BASE_DEC, - NULL, - 0x07, - "Temporal Reference for the B frame as defined by H.263", HFILL - } - }, - { - &hf_rfc2190_tr, - { - "Temporal Reference for P frames", - "rfc2190.tr", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Temporal Reference for the P frame as defined by H.263", HFILL - } - }, - { - &hf_rfc2190_quant, - { - "Quantizer", - "rfc2190.quant", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Quantization value for the first MB coded at the starting of the packet.", HFILL - } - }, - { - &hf_rfc2190_gobn, - { - "GOB Number", - "rfc2190.gobn", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "GOB number in effect at the start of the packet.", HFILL - } - }, - { - &hf_rfc2190_mba, - { - "Macroblock address", - "rfc2190.mba", - FT_UINT16, - BASE_DEC, - NULL, - 0x0, - "The address within the GOB of the first MB in the packet, counting from zero in scan order.", HFILL - } - }, - { - &hf_rfc2190_hmv1, - { - "Horizontal motion vector 1", - "rfc2190.hmv1", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Horizontal motion vector predictor for the first MB in this packet", HFILL - } - }, - { - &hf_rfc2190_vmv1, - { - "Vertical motion vector 1", - "rfc2190.vmv1", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Vertical motion vector predictor for the first MB in this packet", HFILL - } - }, - { - &hf_rfc2190_hmv2, - { - "Horizontal motion vector 2", - "rfc2190.hmv2", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Horizontal motion vector predictor for block number 3 in the first MB in this packet when four motion vectors are used with the advanced prediction option.", HFILL - } - }, - { - &hf_rfc2190_vmv2, - { - "Vertical motion vector 2", - "rfc2190.vmv2", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Vertical motion vector predictor for block number 3 in the first MB in this packet when four motion vectors are used with the advanced prediction option.", HFILL - } - }, - { - &hf_rfc2190_r, - { - "Reserved field", - "rfc2190.r", - FT_UINT8, - BASE_DEC, - NULL, - 0x0, - "Reserved field that should contain zeroes", HFILL - } - }, - { - &hf_rfc2190_rr, - { - "Reserved field 2", - "rfc2190.rr", - FT_UINT16, - BASE_DEC, - NULL, - 0x0, - "Reserved field that should contain zeroes", HFILL - } - }, - }; - - static gint *ett[] = - { - &ett_rfc2190, - }; - - proto_register_subtree_array(ett, array_length(ett)); - - proto_rfc2190 = proto_register_protocol("H.263 RTP Payload header (RFC2190)", - "RFC2190", "rfc2190"); - - proto_register_field_array(proto_rfc2190, hf, array_length(hf)); - register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190); + static hf_register_info hf[] = { + { + &hf_rfc2190_ftype, + { + "F", + "rfc2190.ftype", + FT_BOOLEAN, + 8, + NULL, + 0x80, + "Indicates the mode of the payload header (MODE A or B/C)", HFILL + } + }, + { + &hf_rfc2190_pbframes, + { + "p/b frame", + "rfc2190.pbframes", + FT_BOOLEAN, + 8, + NULL, + 0x40, + "Optional PB-frames mode as defined by H.263 (MODE C)", HFILL + } + }, + { + &hf_rfc2190_sbit, + { + "Start bit position", + "rfc2190.sbit", + FT_UINT8, + BASE_DEC, + NULL, + 0x38, + "Start bit position specifies number of most significant bits that shall be ignored in the first data byte.", HFILL + } + }, + { + &hf_rfc2190_ebit, + { + "End bit position", + "rfc2190.ebit", + FT_UINT8, + BASE_DEC, + NULL, + 0x7, + "End bit position specifies number of least significant bits that shall be ignored in the last data byte.", HFILL + } + }, + { + &hf_rfc2190_srcformat, + { + "SRC format", + "rfc2190.srcformat", + FT_UINT8, + BASE_DEC, + VALS(h263_srcformat_vals), + 0xe0, + "Source format specifies the resolution of the current picture.", HFILL + } + }, + { + &hf_rfc2190_picture_coding_type, + { + "Inter-coded frame", + "rfc2190.picture_coding_type", + FT_BOOLEAN, + 8, + NULL, + 0x0, + "Picture coding type, intra-coded (false) or inter-coded (true)", HFILL + } + }, + { + &hf_rfc2190_unrestricted_motion_vector, + { + "Motion vector", + "rfc2190.unrestricted_motion_vector", + FT_BOOLEAN, + 8, + NULL, + 0x0, + "Unrestricted Motion Vector option for current picture", HFILL + } + }, + { + &hf_rfc2190_syntax_based_arithmetic, + { + "Syntax-based arithmetic coding", + "rfc2190.syntax_based_arithmetic", + FT_BOOLEAN, + 8, + NULL, + 0x0, + "Syntax-based Arithmetic Coding option for current picture", HFILL + } + }, + { + &hf_rfc2190_advanced_prediction, + { + "Advanced prediction option", + "rfc2190.advanced_prediction", + FT_BOOLEAN, + 8, + NULL, + 0x0, + "Advanced Prediction option for current picture", HFILL + } + }, + { + &hf_rfc2190_dbq, + { + "Differential quantization parameter", + "rfc2190.dbq", + FT_UINT8, + BASE_DEC, + NULL, + 0x18, + "Differential quantization parameter used to calculate quantizer for the B frame based on quantizer for the P frame, when PB-frames option is used.", HFILL + } + }, + { + &hf_rfc2190_trb, + { + "Temporal Reference for B frames", + "rfc2190.trb", + FT_UINT8, + BASE_DEC, + NULL, + 0x07, + "Temporal Reference for the B frame as defined by H.263", HFILL + } + }, + { + &hf_rfc2190_tr, + { + "Temporal Reference for P frames", + "rfc2190.tr", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Temporal Reference for the P frame as defined by H.263", HFILL + } + }, + { + &hf_rfc2190_quant, + { + "Quantizer", + "rfc2190.quant", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Quantization value for the first MB coded at the starting of the packet.", HFILL + } + }, + { + &hf_rfc2190_gobn, + { + "GOB Number", + "rfc2190.gobn", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "GOB number in effect at the start of the packet.", HFILL + } + }, + { + &hf_rfc2190_mba, + { + "Macroblock address", + "rfc2190.mba", + FT_UINT16, + BASE_DEC, + NULL, + 0x0, + "The address within the GOB of the first MB in the packet, counting from zero in scan order.", HFILL + } + }, + { + &hf_rfc2190_hmv1, + { + "Horizontal motion vector 1", + "rfc2190.hmv1", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Horizontal motion vector predictor for the first MB in this packet", HFILL + } + }, + { + &hf_rfc2190_vmv1, + { + "Vertical motion vector 1", + "rfc2190.vmv1", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Vertical motion vector predictor for the first MB in this packet", HFILL + } + }, + { + &hf_rfc2190_hmv2, + { + "Horizontal motion vector 2", + "rfc2190.hmv2", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Horizontal motion vector predictor for block number 3 in the first MB in this packet when four motion vectors are used with the advanced prediction option.", HFILL + } + }, + { + &hf_rfc2190_vmv2, + { + "Vertical motion vector 2", + "rfc2190.vmv2", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Vertical motion vector predictor for block number 3 in the first MB in this packet when four motion vectors are used with the advanced prediction option.", HFILL + } + }, + { + &hf_rfc2190_r, + { + "Reserved field", + "rfc2190.r", + FT_UINT8, + BASE_DEC, + NULL, + 0x0, + "Reserved field that should contain zeroes", HFILL + } + }, + { + &hf_rfc2190_rr, + { + "Reserved field 2", + "rfc2190.rr", + FT_UINT16, + BASE_DEC, + NULL, + 0x0, + "Reserved field that should contain zeroes", HFILL + } + }, + }; + + static gint *ett[] = { + &ett_rfc2190, + }; + + proto_register_subtree_array(ett, array_length(ett)); + + proto_rfc2190 = proto_register_protocol("H.263 RTP Payload header (RFC2190)", + "RFC2190", "rfc2190"); + + proto_register_field_array(proto_rfc2190, hf, array_length(hf)); + register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190); } +/* + * 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: + */ |