Add some additional payload types, put in a URL for the IANA page with

[obnox/wireshark/wip.git] / packet-rtp.c

diff --git a/packet-rtp.c b/packet-rtp.c
index c57713fd5ef4c99cd08aed8c45747a398f0c6a38..b95fd6258d100a7daece798252d8553cb5c682c4 100644 (file)
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -6,7 +6,7 @@
  * Copyright 2000, Philips Electronics N.V.
  * Written by Andreas Sikkema <andreas.sikkema@philips.com>
  *
- * $Id: packet-rtp.c,v 1.36 2002/08/28 21:00:30 jmayer Exp $
+ * $Id: packet-rtp.c,v 1.37 2003/02/28 22:03:08 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -137,30 +137,36 @@ static const value_string rtp_version_vals[] =
 /*
  * RTP Payload types
  * Table B.2 / H.225.0
- * Also RFC 1890
+ * Also RFC 1890, and
+ *
+ *     http://www.iana.org/assignments/rtp-parameters
  */
-#define PT_PCMU                0
-#define PT_1016                1
-#define PT_G721                2
-#define PT_GSM         3
-#define PT_G723                4
-#define PT_DVI4_8000   5
-#define PT_DVI4_16000  6
-#define PT_LPC         7
-#define PT_PCMA                8
-#define PT_G722                9
-#define PT_L16_STEREO  10
-#define PT_L16_MONO    11
-#define PT_MPA         14
-#define PT_G728                15
+#define PT_PCMU                0       /* RFC 1890 */
+#define PT_1016                1       /* RFC 1890 */
+#define PT_G721                2       /* RFC 1890 */
+#define PT_GSM         3       /* RFC 1890 */
+#define PT_G723                4       /* From Vineet Kumar of Intel; see the Web page */
+#define PT_DVI4_8000   5       /* RFC 1890 */
+#define PT_DVI4_16000  6       /* RFC 1890 */
+#define PT_LPC         7       /* RFC 1890 */
+#define PT_PCMA                8       /* RFC 1890 */
+#define PT_G722                9       /* RFC 1890 */
+#define PT_L16_STEREO  10      /* RFC 1890 */
+#define PT_L16_MONO    11      /* RFC 1890 */
+#define PT_QCELP       12      /* Qualcomm Code Excited Linear Predictive coding? */
+#define PT_CN          13      /* RFC 3389 */
+#define PT_MPA         14      /* RFC 1890, RFC 2250 */
+#define PT_G728                15      /* RFC 1890 */
+#define PT_DVI4_11025  16      /* from Joseph Di Pol of Sun; see the Web page */
+#define PT_DVI4_22050  17      /* from Joseph Di Pol of Sun; see the Web page */
 #define PT_G729                18
-#define PT_CELB                25
-#define PT_JPEG                26
-#define PT_NV          28
-#define PT_H261                31
-#define PT_MPV         32
-#define PT_MP2T                33
-#define PT_H263                34
+#define PT_CELB                25      /* RFC 2029 */
+#define PT_JPEG                26      /* RFC 2435 */
+#define PT_NV          28      /* RFC 1890 */
+#define PT_H261                31      /* RFC 2032 */
+#define PT_MPV         32      /* RFC 2250 */
+#define PT_MP2T                33      /* RFC 2250 */
+#define PT_H263                34      /* from Chunrong Zhu of Intel; see the Web page */
 
 static const value_string rtp_payload_type_vals[] =
 {
@@ -171,16 +177,20 @@ static const value_string rtp_payload_type_vals[] =
        { PT_G723,      "ITU-T G.723" },
        { PT_DVI4_8000, "DVI4 8000 samples/s" },
        { PT_DVI4_16000, "DVI4 16000 samples/s" },
-       { PT_LPC,       "LPC" },
+       { PT_LPC,       "Experimental linear predictive encoding from Xerox PARC" },
        { PT_PCMA,      "ITU-T G.711 PCMA" },
        { PT_G722,      "ITU-T G.722" },
        { PT_L16_STEREO, "16-bit uncompressed audio, stereo" },
        { PT_L16_MONO,  "16-bit uncompressed audio, monaural" },
-       { PT_MPA,       "MPEG-I/II Audeo"},
+       { PT_QCELP,     "Qualcomm Code Excited Linear Predictive coding" },
+       { PT_CN,        "Comfort noise" },
+       { PT_MPA,       "MPEG-I/II Audio"},
        { PT_G728,      "ITU-T G.728" },
+       { PT_DVI4_11025, "DVI4 11025 samples/s" },
+       { PT_DVI4_22050, "DVI4 22050 samples/s" },
        { PT_G729,      "ITU-T G.729" },
-       { PT_CELB,      "Sun CELL-B" },
-       { PT_JPEG,      "JPEG" },
+       { PT_CELB,      "Sun CellB video encoding" },
+       { PT_JPEG,      "JPEG-compressed video" },
        { PT_NV,        "'nv' program" },
        { PT_H261,      "ITU-T H.261" },
        { PT_MPV,       "MPEG-I/II Video"},