merge_all_tap_menus() has been moved to menus.c.

[obnox/wireshark/wip.git] / gtk / rtp_analysis.h

diff --git a/gtk/rtp_analysis.h b/gtk/rtp_analysis.h
index dc88c8dc49160236a4a5879024fc323d7df102ae..28972b1e9934ff3b8f4bbb8dcff12c9bac91a1fa 100644 (file)
--- a/gtk/rtp_analysis.h
+++ b/gtk/rtp_analysis.h
@@ -1,5 +1,5 @@
 /* rtp_analysis.h
- * RTP analysis addition for ethereal
+ * RTP analysis addition for Wireshark
  *
  * $Id$
  *
@@ -10,8 +10,8 @@
  * Copyright 2003, Iskratel, Ltd, Kranj
  * By Miha Jemec <m.jemec@iskratel.si>
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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
@@ -29,8 +29,8 @@
  * Foundation,  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef RTP_ANALYSIS_H_INCLUDED
-#define RTP_ANALYSIS_H_INCLUDED
+#ifndef __RTP_ANALYSIS_H__
+#define __RTP_ANALYSIS_H__
 
 #include <glib.h>
 #include <epan/address.h>
@@ -67,23 +67,33 @@ typedef struct _tap_rtp_stat_t {
        gboolean first_packet;     /* do not use in code that is called after rtp_packet_analyse */
                                   /* use (flags & STAT_FLAG_FIRST) instead */
        /* all of the following fields will be initialized after
-        rtp_packet_analyse has been called */
+        * rtp_packet_analyse has been called
+        */
        guint32 flags;             /* see STAT_FLAG-defines below */
        guint16 seq_num;
        guint32 timestamp;
+       guint32 first_timestamp;
        guint32 delta_timestamp;
        double bandwidth;
        bw_history_item bw_history[BUFF_BW];
        guint16 bw_start_index;
        guint16 bw_index;
        guint32 total_bytes;
+       guint32 clock_rate;
        double delta;
        double jitter;
        double diff;
-       double time;
+       double skew;
+       double sumt;
+       double sumTS;
+       double sumt2;
+       double sumtTS;
+       double time;           /* Unit is ms */
        double start_time;
+       double lastnominaltime;
        double max_delta;
        double max_jitter;
+       double max_skew;
        double mean_jitter;
        guint32 max_nr;
        guint16 start_seq_nr;
@@ -99,14 +109,15 @@ typedef struct _tap_rtp_stat_t {
 #define PT_UNDEFINED -1
 
 /* status flags for the flags parameter in tap_rtp_stat_t */
-#define STAT_FLAG_FIRST       0x01
-#define STAT_FLAG_MARKER      0x02
-#define STAT_FLAG_WRONG_SEQ   0x04
-#define STAT_FLAG_PT_CHANGE   0x08
-#define STAT_FLAG_PT_CN       0x10
-#define STAT_FLAG_FOLLOW_PT_CN  0x20
-#define STAT_FLAG_REG_PT_CHANGE  0x40
-#define STAT_FLAG_WRONG_TIMESTAMP  0x80
+#define STAT_FLAG_FIRST                                0x001
+#define STAT_FLAG_MARKER                       0x002
+#define STAT_FLAG_WRONG_SEQ                    0x004
+#define STAT_FLAG_PT_CHANGE                    0x008
+#define STAT_FLAG_PT_CN                                0x010
+#define STAT_FLAG_FOLLOW_PT_CN         0x020
+#define STAT_FLAG_REG_PT_CHANGE                0x040
+#define STAT_FLAG_WRONG_TIMESTAMP      0x080
+#define STAT_FLAG_PT_T_EVENT           0x100
 
 /* forward */
 struct _rtp_info;
@@ -117,4 +128,4 @@ extern int rtp_packet_analyse(tap_rtp_stat_t *statinfo,
         const struct _rtp_info *rtpinfo);
 
 
-#endif /*RTP_ANALYSIS_H_INCLUDED*/
+#endif /* __RTP_ANALYSIS_H__ */