Ethereal-dev: [Ethereal-dev] [PATCH] update iax2 decoder

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: "James H. Cloos Jr." <cloos@xxxxxxxxxxx>
Date: Fri, 14 May 2004 16:54:49 -0400
This patch fixes the iax2 decoder to match what * currently uses for
audio and video codecs.

-JimC

diff -uNr a/packet-iax2.c b/packet-iax2.c
--- a/packet-iax2.c	2004-02-18 19:13:44.000000000 -0500
+++ b/packet-iax2.c	2004-05-14 16:48:25.000000000 -0400
@@ -192,11 +192,17 @@
   {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 -uNr a/packet-iax2.h b/packet-iax2.h
--- a/packet-iax2.h	2004-01-26 20:35:25.000000000 -0500
+++ b/packet-iax2.h	2004-05-14 16:44:42.000000000 -0400
@@ -131,9 +131,16 @@
 #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