osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Dissect RTP payload of H.264 and SDP profile-leve-id for H.264. 

svn path=/trunk/; revision=23709
This commit is contained in:
Anders Broman 2007-12-03 20:14:42 +00:00
parent 4efc9ba371
commit 20b383c1b1
4 changed files with 447 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/Makefile.common
View File

@ -422,6 +422,7 @@ CLEAN_DISSECTOR_SRC = \
packet-h248_q1950.c \
packet-h261.c \
packet-h263.c \
packet-h264.c \
packet-hci_h4.c \
packet-hclnfsd.c \
packet-homeplug.c \
@ -892,6 +893,7 @@ DISSECTOR_INCLUDES = \
packet-h235.h \
packet-h245.h \
packet-h248.h \
packet-h264.h \
packet-h323.h \
packet-h450-ros.h \
packet-hci_h4.h \

322
epan/dissectors/packet-h264.c Normal file
View File

@ -0,0 +1,322 @@
/* packet-h264.c
* Routines for H.264 dissection
* Copyright 2007, Anders Broman <anders.broman[at]ericsson.com>
*
* $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; 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.
*
* References:
* http://www.ietf.org/rfc/rfc3984.txt?number=3984
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include <epan/packet.h>
#include <epan/proto.h>
#include "prefs.h"
/* Initialize the protocol and registered fields */
static int proto_h264 = -1;
static int hf_h264_nal_unit_type = -1;
static int hf_h264_nal_f_bit = -1;
static int hf_h264_nal_nri = -1;
static int hf_h264_profile = -1;
static int hf_h264_profile_idc = -1;
static int hf_h264_constraint_set0_flag = -1;
static int hf_h264_constraint_set1_flag = -1;
static int hf_h264_constraint_set2_flag = -1;
static int hf_h264_constraint_set3_flag = -1;
static int hf_h264_reserved_zero_4bits = -1;
static int hf_h264_level_idc = -1;
/* Initialize the subtree pointers */
static int ett_h264 = -1;
static int ett_h264_profile = -1;
static int ett_h264_nal = -1;
/* The dynamic payload type which will be dissected as H.264 */
static guint dynamic_payload_type = 0;
static guint temp_dynamic_payload_type = 0;
static const true_false_string h264_f_bit_vals = {
"Bit errors or other syntax violations",
"No bit errors or other syntax violations"
};
static const value_string h264_nal_unit_type_values[] = {
{ 0, "Undefined" },
{ 1, "NAL unit" }, /* Single NAL unit packet per H.264 */
{ 2, "NAL unit" },
{ 3, "NAL unit" },
{ 4, "NAL unit" },
{ 5, "NAL unit" },
{ 6, "NAL unit" },
{ 7, "NAL unit" },
{ 8, "NAL unit" },
{ 9, "NAL unit" },
{ 10, "NAL unit" },
{ 11, "NAL unit" }, /* Single NAL unit packet per H.264 */
{ 12, "NAL unit" },
{ 13, "NAL unit" },
{ 14, "NAL unit" },
{ 15, "NAL unit" },
{ 16, "NAL unit" },
{ 17, "NAL unit" },
{ 18, "NAL unit" },
{ 19, "NAL unit" },
{ 20, "NAL unit" },
{ 21, "NAL unit" }, /* Single NAL unit packet per H.264 */
{ 22, "NAL unit" },
{ 23, "NAL unit" },
{ 24, "STAP-A" }, /* Single-time aggregation packet */
{ 25, "STAP-B" }, /* Single-time aggregation packet */
{ 26, "MTAP16" }, /* Multi-time aggregation packet */
{ 27, "MTAP24" }, /* Multi-time aggregation packet */
{ 28, "FU-A" }, /* Fragmentation unit */
{ 29, "FU-B" }, /* Fragmentation unit */
{ 30, "undefined" },
{ 31, "undefined" },
{ 0, NULL }
};
static const value_string h264_profile_idc_values[] = {
{ 66, "Baseline profile" },
{ 77, "Main profile" },
{ 88, "Extended profile" },
{ 100, "High profile" },
{ 110, "High 10 profile" },
{ 122, "High 4:2:2 profile" },
{ 144, "High 4:4:4 profile" },
{ 0, NULL }
};
void
dissect_h264_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *item;
proto_tree *h264_profile_tree;
gint offset = 0;
item = proto_tree_add_item(tree, hf_h264_profile, tvb, offset, -1, FALSE);
h264_profile_tree = proto_item_add_subtree(item, ett_h264_profile);
proto_tree_add_item(h264_profile_tree, hf_h264_profile_idc, tvb, offset, 1, FALSE);
offset++;
proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set0_flag, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set1_flag, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set2_flag, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_profile_tree, hf_h264_constraint_set3_flag, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_profile_tree, hf_h264_reserved_zero_4bits, tvb, offset, 1, FALSE);
offset++;
/* A level to which the bitstream conforms shall be indicated by the syntax element level_idc as follows.
* If level_idc is equal to 9, the indicated level is level 1b.
* Otherwise (level_idc is not equal to 9), level_idc shall be set equal to a value of ten times the level number
* specified in Table A-1.
*/
proto_tree_add_item(h264_profile_tree, hf_h264_level_idc, tvb, offset, 1, FALSE);
}
/* Code to actually dissect the packets */
static void
dissect_h264(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
int offset = 0;
proto_item *item, *ti;
proto_tree *h264_tree, *h264_nal_tree;
/* Make entries in Protocol column and Info column on summary display */
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "H264");
if (tree) {
item = proto_tree_add_item(tree, proto_h264, tvb, 0, -1, FALSE);
h264_tree = proto_item_add_subtree(item, ett_h264);
ti = proto_tree_add_text(h264_tree, tvb, offset, 1, "NAL unit header or first byte of the payload");
h264_nal_tree = proto_item_add_subtree(item, ett_h264_nal);
/* +---------------+
* |0|1|2|3|4|5|6|7|
* +-+-+-+-+-+-+-+-+
* |F|NRI| Type |
* +---------------+
*/
/* F: 1 bit
* forbidden_zero_bit. A value of 0 indicates that the NAL unit type
* octet and payload should not contain bit errors or other syntax
* violations. A value of 1 indicates that the NAL unit type octet
* and payload may contain bit errors or other syntax violations.
*/
proto_tree_add_item(h264_nal_tree, hf_h264_nal_f_bit, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_nal_tree, hf_h264_nal_nri, tvb, offset, 1, FALSE);
proto_tree_add_item(h264_nal_tree, hf_h264_nal_unit_type, tvb, offset, 1, FALSE);
offset++;
proto_tree_add_text(h264_tree, tvb, offset, -1, "H264 bitstream");
}/* if tree */
}
/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
create the code that calls these routines.
*/
void
proto_reg_handoff_h264(void)
{
dissector_handle_t h264_handle;
static int h264_prefs_initialized = FALSE;
h264_handle = create_dissector_handle(dissect_h264, proto_h264);
if (!h264_prefs_initialized) {
h264_prefs_initialized = TRUE;
}
else {
if ( dynamic_payload_type > 95 )
dissector_delete("rtp.pt", dynamic_payload_type, h264_handle);
}
dynamic_payload_type = temp_dynamic_payload_type;
if ( dynamic_payload_type > 95 ){
dissector_add("rtp.pt", dynamic_payload_type, h264_handle);
}
dissector_add_string("rtp_dyn_payload_type","H264", h264_handle);
}
/* this format is require because a script is used to build the C function
that calls all the protocol registration.
*/
void
proto_register_h264(void)
{
module_t *h264_module;
/* Setup list of header fields See Section 1.6.1 for details*/
static hf_register_info hf[] = {
{ &hf_h264_nal_f_bit,
{ "F bit", "h264.f",
FT_BOOLEAN, 8, TFS(&h264_f_bit_vals), 0x80,
"F bit", HFILL }
},
{ &hf_h264_nal_nri,
{ "Nal_ref_idc (NRI)", "h264.nal_nri",
FT_UINT8, BASE_DEC, NULL, 0x60,
"NRI", HFILL }
},
{ &hf_h264_nal_unit_type,
{ "NAL unit type", "h264.nal_unit_hdr",
FT_UINT8, BASE_DEC, VALS(h264_nal_unit_type_values), 0x1f,
"NAL unit type", HFILL }
},
{ &hf_h264_profile,
{ "Profile", "h264.profile",
FT_BYTES, BASE_NONE, NULL, 0x0,
"Profile", HFILL }
},
{ &hf_h264_profile_idc,
{ "Profile_idc", "h264.profile_idc",
FT_UINT8, BASE_DEC, VALS(h264_profile_idc_values), 0x0,
"Profile_idc", HFILL }
},
{ &hf_h264_constraint_set0_flag,
{ "Constraint_set0_flag", "h264.constraint_set0_flag",
FT_UINT8, BASE_DEC, NULL, 0x01,
"Constraint_set0_flag", HFILL }
},
{ &hf_h264_constraint_set1_flag,
{ "Constraint_set1_flag", "h264.constraint_set1_flag",
FT_UINT8, BASE_DEC, NULL, 0x02,
"Constraint_set1_flag", HFILL }
},
{ &hf_h264_constraint_set2_flag,
{ "Constraint_set1_flag", "h264.constraint_set2_flag",
FT_UINT8, BASE_DEC, NULL, 0x04,
"NRI", HFILL }
},
{ &hf_h264_constraint_set3_flag,
{ "Constraint_set3_flag", "h264.constraint_set3_flag",
FT_UINT8, BASE_DEC, NULL, 0x08,
"Constraint_set3_flag", HFILL }
},
{ &hf_h264_reserved_zero_4bits,
{ "Reserved_zero_4bits", "h264.reserved_zero_4bits",
FT_UINT8, BASE_DEC, NULL, 0xf0,
"Reserved_zero_4bits", HFILL }
},
{ &hf_h264_level_idc,
{ "Level_id", "h264.level_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Level_id", HFILL }
},
};
/* Setup protocol subtree array */
static gint *ett[] = {
&ett_h264,
&ett_h264_profile,
&ett_h264_nal,
};
/* Register the protocol name and description */
proto_h264 = proto_register_protocol("H.264","H264", "h264");
/* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_h264, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* Register a configuration option for port */
h264_module = prefs_register_protocol(proto_h264, proto_reg_handoff_h264);
prefs_register_uint_preference(h264_module, "dynamic.payload.type",
"H264 dynamic payload type",
"The dynamic payload type which will be interpreted as H264",
10,
&temp_dynamic_payload_type);
register_dissector("h264", dissect_h264, proto_h264);
}

33
epan/dissectors/packet-h264.h Normal file
View File

@ -0,0 +1,33 @@
/* packet-h264.h
* Routines for H.264 dissection
* Copyright 2007, Anders Broman <anders.broman[at]ericsson.com>
*
* $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; 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.
*
* References:
* http://www.ietf.org/rfc/rfc3984.txt?number=3984
*/
#ifndef __PACKET_H264_H__
#define __PACKET_H264_H__
void dissect_h264_profile(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
#endif /* __PACKET_H264_H__ */

102
epan/dissectors/packet-sdp.c
View File

@ -72,11 +72,13 @@
#include "packet-msrp.h"
#include "packet-per.h"
#include "packet-h245.h"
#include "packet-h264.h"
static dissector_handle_t rtp_handle=NULL;
static dissector_handle_t rtcp_handle=NULL;
static dissector_handle_t t38_handle=NULL;
static dissector_handle_t msrp_handle=NULL;
static dissector_handle_t h264_handle = NULL;
static int sdp_tap = -1;
@ -1152,6 +1154,79 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
}
tvbuff_t *ascii_bytes_to_tvb(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint offset, gint len, gchar *msg)
{
guint8 *buf = ep_alloc(10240);
/* arbitrary maximum length */
if(len<20480){
int i;
tvbuff_t *bytes_tvb;
/* first, skip to where the encoded pdu starts, this is
the first hex digit after the '=' char.
*/
while(1){
if((*msg==0)||(*msg=='\n')){
return NULL;
}
if(*msg=='='){
msg++;
break;
}
msg++;
}
while(1){
if((*msg==0)||(*msg=='\n')){
return NULL;
}
if( ((*msg>='0')&&(*msg<='9'))
|| ((*msg>='a')&&(*msg<='f'))
|| ((*msg>='A')&&(*msg<='F'))){
break;
}
msg++;
}
i=0;
while( ((*msg>='0')&&(*msg<='9'))
||((*msg>='a')&&(*msg<='f'))
||((*msg>='A')&&(*msg<='F')) ){
int val;
if((*msg>='0')&&(*msg<='9')){
val=(*msg)-'0';
} else if((*msg>='a')&&(*msg<='f')){
val=(*msg)-'a'+10;
} else if((*msg>='A')&&(*msg<='F')){
val=(*msg)-'A'+10;
} else {
return NULL;
}
val<<=4;
msg++;
if((*msg>='0')&&(*msg<='9')){
val|=(*msg)-'0';
} else if((*msg>='a')&&(*msg<='f')){
val|=(*msg)-'a'+10;
} else if((*msg>='A')&&(*msg<='F')){
val|=(*msg)-'A'+10;
} else {
return NULL;
}
msg++;
buf[i]=(guint8)val;
i++;
}
if(i==0){
return NULL;
}
bytes_tvb = tvb_new_real_data(buf,i,i);
tvb_set_child_real_data_tvbuff(tvb,bytes_tvb);
add_new_data_source(pinfo, bytes_tvb, "ASCII bytes to tvb");
return bytes_tvb;
}
return NULL;
}
/*
14496-2, Annex G, Table G-1.
Table G-1 FLC table for profile_and_level_indication Profile/Level Code
@ -1260,11 +1335,11 @@ static const value_string h263_profile_vals[] =
* TODO: Make this a more generic routine to dissect fmtp parameters depending on media types
*/
static void
decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, gint offset, gint tokenlen, guint8 *mime_type){
decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset, gint tokenlen, guint8 *mime_type){
gint next_offset;
gint end_offset;
guint8 *field_name;
guint8 *format_specific_parameter;
gchar *format_specific_parameter;
proto_item *item;
end_offset = offset + tokenlen;
@ -1308,20 +1383,22 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, gint offset, gint tokenlen, gui
}
}
#if 0
/* TODO: Add code to dissect H264 fmtp parameters wehen an example can be found */
/* Dissect the H264 profile-level-id parameter */
if (mime_type != NULL && strcmp(mime_type, "H264") == 0) {
if (strcmp(field_name, "profile-level-id") == 0) {
char **endptr;
offset++;
tvbuff_t *h264_profile_tvb;
/* Length includes "=" */
tokenlen = end_offset - offset;
format_specific_parameter = tvb_get_ephemeral_string(tvb, offset, tokenlen);
proto_tree_add_text(tree, tvb, offset, tokenlen,
"Test %u", strtoul(format_specific_parameter, endptr, 16));
h264_profile_tvb = ascii_bytes_to_tvb(tvb, tree, pinfo, offset, tokenlen, format_specific_parameter);
if(h264_handle && h264_profile_tvb){
dissect_h264_profile(h264_profile_tvb, pinfo, tree);
}
}
}
#endif
}
typedef struct {
@ -1510,7 +1587,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp);
decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen,
decode_sdp_fmtp(fmtp_tree, tvb, pinfo, offset, tokenlen,
(guint8 *)transport_info->encoding_name);
offset = next_offset + 1;
@ -1525,7 +1602,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp);
decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen,
decode_sdp_fmtp(fmtp_tree, tvb, pinfo, offset, tokenlen,
(guint8 *)transport_info->encoding_name);
return;
break;
@ -1948,6 +2025,7 @@ proto_reg_handoff_sdp(void)
rtcp_handle = find_dissector("rtcp");
msrp_handle = find_dissector("msrp");
t38_handle = find_dissector("t38");
h264_handle = find_dissector("h264");
sdp_handle = find_dissector("sdp");
dissector_add_string("media_type", "application/sdp", sdp_handle);