diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/ethereal.pod | 3 | ||||
| -rw-r--r-- | packet-iax2.c | 14 | ||||
| -rw-r--r-- | packet-iax2.h | 12 |
4 files changed, 22 insertions, 8 deletions
@@ -2177,6 +2177,7 @@ And assorted fixes and enhancements by the people listed above and by: Clinton Work <clinton [AT] scripty.com> Joe Marcus Clarke <marcus [AT] marcuscom.com> Kendy Kutzner <kutzner[AT]tm.uka.de> + James H. Cloos Jr. <cloos [AT] jhcloos.com> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod b/doc/ethereal.pod index 9ce59dfb9b..67fd86b875 100644 --- a/doc/ethereal.pod +++ b/doc/ethereal.pod @@ -2244,6 +2244,7 @@ B<http://www.ethereal.com>. Lukas Pokorny <maskis [AT] seznam.cz> Thomas Anders <thomas.anders [AT] blue-cable.de> Rich Coe <Richard.Coe [AT] med.ge.com> + Dominic Béchaz <bdo [AT] zhwin.ch> Pavel Roskin <proski [AT] gnu.org> Georgi Guninski <guninski [AT] guninski.com> Jason Copenhaver <jcopenha [AT] typedef.org> @@ -2291,7 +2292,7 @@ B<http://www.ethereal.com>. Joe Marcus Clarke <marcus [AT] marcuscom.com> Carlos M. Pignataro <cpignata [AT] cisco.com> Kendy Kutzner <kutzner [AT] tm.uka.de> - Dominic Béchaz <bdo [AT] zhwin.ch> + James H. Cloos Jr. <cloos [AT] jhcloos.com> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-iax2.c b/packet-iax2.c index 7cc67aeb18..189df6b675 100644 --- a/packet-iax2.c +++ b/packet-iax2.c @@ -8,7 +8,7 @@ * IAX2 is a VoIP protocol for the open source PBX Asterisk. Please see * http://www.asterisk.org for more information. * - * $Id: packet-iax2.c,v 1.5 2004/02/18 14:30:45 jmayer Exp $ + * $Id: packet-iax2.c,v 1.6 2004/05/15 21:26:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -192,11 +192,17 @@ static const value_string codec_types[] = { {AST_FORMAT_GSM, "GSM compression"}, {AST_FORMAT_ULAW, "Raw mu-law data (G.711)"}, {AST_FORMAT_ALAW, "Raw A-law data (G.711)"}, - {AST_FORMAT_MP3, "MPEG-2 layer 3"}, - {AST_FORMAT_ADPCM, "ADPCM (whose?)"}, + {AST_FORMAT_G726, "ADPCM (G.726, 32kbps)"}, + {AST_FORMAT_ADPCM, "ADPCM (IMA)"}, {AST_FORMAT_SLINEAR, "Raw 16-bit Signed Linear (8000 Hz) PCM"}, {AST_FORMAT_LPC10, "LPC10, 180 samples/frame"}, - {AST_FORMAT_G729A, "G.729a Audio"} + {AST_FORMAT_G729A, "G.729a Audio"}, + {AST_FORMAT_SPEEX, "SpeeX Free Compression"}, + {AST_FORMAT_ILBC, "iLBC Free Compression"}, + {AST_FORMAT_JPEG, "JPEG Images"}, + {AST_FORMAT_PNG, "PNG Images"}, + {AST_FORMAT_H261, "H.261 Video"}, + {AST_FORMAT_H263, "H.263 Video"} }; static void diff --git a/packet-iax2.h b/packet-iax2.h index 93180714af..be2dd878e8 100644 --- a/packet-iax2.h +++ b/packet-iax2.h @@ -7,7 +7,7 @@ * * Mark Spencer <markster@linux-support.net> * - * $Id: packet-iax2.h,v 1.1 2004/01/27 01:35:25 guy Exp $ + * $Id: packet-iax2.h,v 1.2 2004/05/15 21:26:09 guy Exp $ * * This program is free software, distributed under the terms of * the GNU General Public License @@ -130,10 +130,16 @@ #define AST_FORMAT_GSM (1 << 1) /* GSM compression */ #define AST_FORMAT_ULAW (1 << 2) /* Raw mu-law data (G.711) */ #define AST_FORMAT_ALAW (1 << 3) /* Raw A-law data (G.711) */ -#define AST_FORMAT_MP3 (1 << 4) /* MPEG-2 layer 3 */ -#define AST_FORMAT_ADPCM (1 << 5) /* ADPCM (whose?) */ +#define AST_FORMAT_G726 (1 << 4) /* ADPCM (G.726, 32kbps) */ +#define AST_FORMAT_ADPCM (1 << 5) /* ADPCM (IMA) */ #define AST_FORMAT_SLINEAR (1 << 6) /* Raw 16-bit Signed Linear (8000 Hz) PCM */ #define AST_FORMAT_LPC10 (1 << 7) /* LPC10, 180 samples/frame */ #define AST_FORMAT_G729A (1 << 8) /* G.729a Audio */ +#define AST_FORMAT_SPEEX (1 << 9) /* SpeeX Free Compression */ +#define AST_FORMAT_ILBC (1 << 10) /* iLBC Free Compression */ +#define AST_FORMAT_JPEG (1 << 16) /* JPEG Images */ +#define AST_FORMAT_PNG (1 << 17) /* PNG Images */ +#define AST_FORMAT_H261 (1 << 18) /* H.261 Video */ +#define AST_FORMAT_H263 (1 << 19) /* H.263 Video */ #endif |