diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-06-02 20:29:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-06-02 20:29:05 +0000 |
| commit | b590de7ce0d6d8a9e801006a96243def4aa59191 (patch) | |
| tree | 41cc0de855d22dfb06e63e345d8cbc17cd8e5a39 /epan/dissectors/packet-h263.c | |
| parent | 3b815838f3fabe2d2798900cd9646b89a14eaaf8 (diff) | |
From Richard van der Hoff:
Q.931:I
mprovesthe dissection of Q.931 Channel
Identification information elements, by using proper (filterable) header
fields rather than text tree items.
H253:
make the h.263 dissector dissect the group-of-block
number which comes after a GOB start code.
svn path=/trunk/; revision=18323
Diffstat (limited to 'epan/dissectors/packet-h263.c')
| -rw-r--r-- | epan/dissectors/packet-h263.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index 3553b845a3..94f3dd9144 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -91,6 +91,7 @@ static int hf_h263_optional_advanced_prediction_mode = -1; static int hf_h263_PB_frames_mode = -1; static int hf_h263_data = -1; static int hf_h263_payload = -1; +static int hf_h263_GN = -1; /* Source format types */ #define SRCFORMAT_FORB 0 /* forbidden */ @@ -301,7 +302,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr data = tvb_get_ntohl(tvb, offset); if (( data & 0xffff8000) == 0x00008000 ) { /* PSC or Group of Block Start Code (GBSC) found */ - if (( data & 0xfffffc00) == 0x00008000 ) { /* PSC found */ + if (( data & 0x00007c00) == 0 ) { /* PSC found */ if ( check_col( pinfo->cinfo, COL_INFO) ) col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); if( tree ) { @@ -339,7 +340,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr proto_tree_add_item( h263_payload_tree, hf_h263_PB_frames_mode, tvb, offset, 1, FALSE ); } } - }else if ((data & 0x00007c00)!= 0) { /* GBSC found */ + } else { /* GBSC found */ if ( check_col( pinfo->cinfo, COL_INFO) ) col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); if( tree ) { @@ -350,6 +351,11 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr * */ proto_tree_add_uint(h263_payload_tree, hf_h263_gbsc,tvb, offset,3,data); + proto_tree_add_uint(h263_payload_tree, hf_h263_GN, tvb, offset,3,data); + /* GN is followed by (optionally) GBSI, then + * GFID and GQUANT, but decoding them requires + * knowing the value of CPM in the picture + * header */ offset = offset + 2; } } @@ -782,7 +788,18 @@ proto_register_h263(void) "Optional PB-frames mode", HFILL } }, - + { + &hf_h263_GN, + { + "H.263 Group Number", + "h263.gn", + FT_UINT32, + BASE_DEC, + NULL, + 0x00007c00, + "Group Number, GN", HFILL + } + }, }; static gint *ett[] = |