Move the codecs into a top-level "codecs" subdirectory; there's no

guarantee that all programs using the codecs will necessarily be using
GTK+.

svn path=/trunk/; revision=19117

8 files changed, 205 insertions, 0 deletions

diff --git a/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
new file mode 100644
index 0000000000..b427250a64
--- /dev/null
+++ b/codecs/G711a/G711adecode.c
@@ -0,0 +1,19 @@
+#include <glib.h>
+#include "G711adecode.h"
+#include "G711atable.h"
+
+int
+decodeG711a(void *input, int inputSizeBytes, void *output, int *outputSizeBytes)
+{
+  guint8 *dataIn = (guint8 *)input;
+  gint16 *dataOut = (gint16 *)output;
+  int i;
+
+  for (i=0; i<inputSizeBytes; i++)
+  {
+    dataOut[i] = alaw_exp_table[dataIn[i]];
+  }
+  *outputSizeBytes = inputSizeBytes * 2;
+  return 0;
+}
+
diff --git a/codecs/G711a/G711adecode.h b/codecs/G711a/G711adecode.h
new file mode 100644
index 0000000000..779203a212
--- /dev/null
+++ b/codecs/G711a/G711adecode.h
@@ -0,0 +1,3 @@
+
+decodeG711a(void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
+
diff --git a/codecs/G711a/G711atable.h b/codecs/G711a/G711atable.h
new file mode 100644
index 0000000000..a8d8999d3f
--- /dev/null
+++ b/codecs/G711a/G711atable.h
@@ -0,0 +1,38 @@
+
+
+gint16 alaw_exp_table[256] = {
+	  -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
+	  -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784,
+	  -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368,
+	  -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392,
+	 -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944,
+	 -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136,
+	 -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472,
+	 -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568,
+	   -344,  -328,  -376,  -360,  -280,  -264,  -312,  -296,
+	   -472,  -456,  -504,  -488,  -408,  -392,  -440,  -424,
+	    -88,   -72,  -120,  -104,   -24,    -8,   -56,   -40,
+	   -216,  -200,  -248,  -232,  -152,  -136,  -184,  -168,
+	  -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184,
+	  -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696,
+	   -688,  -656,  -752,  -720,  -560,  -528,  -624,  -592,
+	   -944,  -912, -1008,  -976,  -816,  -784,  -880,  -848,
+	   5504,  5248,  6016,  5760,  4480,  4224,  4992,  4736,
+	   7552,  7296,  8064,  7808,  6528,  6272,  7040,  6784,
+	   2752,  2624,  3008,  2880,  2240,  2112,  2496,  2368,
+	   3776,  3648,  4032,  3904,  3264,  3136,  3520,  3392,
+	  22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
+	  30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136,
+	  11008, 10496, 12032, 11520,  8960,  8448,  9984,  9472,
+	  15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568,
+	    344,   328,   376,   360,   280,   264,   312,   296,
+	    472,   456,   504,   488,   408,   392,   440,   424,
+	     88,    72,   120,   104,    24,     8,    56,    40,
+	    216,   200,   248,   232,   152,   136,   184,   168,
+	   1376,  1312,  1504,  1440,  1120,  1056,  1248,  1184,
+	   1888,  1824,  2016,  1952,  1632,  1568,  1760,  1696,
+	    688,   656,   752,   720,   560,   528,   624,   592,
+	    944,   912,  1008,   976,   816,   784,   880,   848};
+
+
+
diff --git a/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
new file mode 100644
index 0000000000..2ac3c8fd85
--- /dev/null
+++ b/codecs/G711u/G711udecode.c
@@ -0,0 +1,19 @@
+#include <glib.h>
+#include "G711udecode.h"
+#include "G711utable.h"
+
+int
+decodeG711u(void *input, int inputSizeBytes, void *output, int *outputSizeBytes)
+{
+  guint8 *dataIn = (guint8 *)input;
+  gint16 *dataOut = (gint16 *)output;
+  int i;
+
+  for (i=0; i<inputSizeBytes; i++)
+  {
+    dataOut[i] = ulaw_exp_table[dataIn[i]];
+  }
+  *outputSizeBytes = inputSizeBytes * 2;
+  return 0;
+}
+
diff --git a/codecs/G711u/G711udecode.h b/codecs/G711u/G711udecode.h
new file mode 100644
index 0000000000..8c808c500a
--- /dev/null
+++ b/codecs/G711u/G711udecode.h
@@ -0,0 +1,5 @@
+
+decodeG711u(void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
+
+
+
diff --git a/codecs/G711u/G711utable.h b/codecs/G711u/G711utable.h
new file mode 100644
index 0000000000..5a75a29c8b
--- /dev/null
+++ b/codecs/G711u/G711utable.h
@@ -0,0 +1,38 @@
+
+
+gint16 ulaw_exp_table[256] = {
+   -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
+   -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
+   -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
+   -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316,
+    -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140,
+    -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092,
+    -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004,
+    -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980,
+    -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436,
+    -1372, -1308, -1244, -1180, -1116, -1052,  -988,  -924,
+     -876,  -844,  -812,  -780,  -748,  -716,  -684,  -652,
+     -620,  -588,  -556,  -524,  -492,  -460,  -428,  -396,
+     -372,  -356,  -340,  -324,  -308,  -292,  -276,  -260,
+     -244,  -228,  -212,  -196,  -180,  -164,  -148,  -132,
+     -120,  -112,  -104,   -96,   -88,   -80,   -72,   -64,
+      -56,   -48,   -40,   -32,   -24,   -16,    -8,     0,
+    32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956,
+    23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764,
+    15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
+    11900, 11388, 10876, 10364,  9852,  9340,  8828,  8316,
+     7932,  7676,  7420,  7164,  6908,  6652,  6396,  6140,
+     5884,  5628,  5372,  5116,  4860,  4604,  4348,  4092,
+     3900,  3772,  3644,  3516,  3388,  3260,  3132,  3004,
+     2876,  2748,  2620,  2492,  2364,  2236,  2108,  1980,
+     1884,  1820,  1756,  1692,  1628,  1564,  1500,  1436,
+     1372,  1308,  1244,  1180,  1116,  1052,   988,   924,
+      876,   844,   812,   780,   748,   716,   684,   652,
+      620,   588,   556,   524,   492,   460,   428,   396,
+      372,   356,   340,   324,   308,   292,   276,   260,
+      244,   228,   212,   196,   180,   164,   148,   132,
+      120,   112,   104,    96,    88,    80,    72,    64,
+       56,    48,    40,    32,    24,    16,     8,     0};
+
+
+
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
new file mode 100644
index 0000000000..6eb1a4c056
--- /dev/null
+++ b/codecs/Makefile.am
@@ -0,0 +1,42 @@
+# Makefile.am
+# Automake file for the codecs for Wireshark
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@xxxxxxxxxxxxx>
+# 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.
+
+
+noinst_LIBRARIES = libcodec.a
+
+CLEANFILES = \
+       libcodec.a	\
+       *~
+
+MAINTAINERCLEANFILES =	\
+       Makefile.in
+
+libcodec_a_SOURCES = \
+       G711a/G711adecode.c G711a/G711adecode.h G711a/G711atable.h	\
+       G711u/G711udecode.c G711u/G711udecode.h G711u/G711utable.h 
+
+libcodec_a_DEPENDENCIES = 
+
+EXTRA_DIST = \
+       Makefile.nmake 
+
diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake
new file mode 100644
index 0000000000..a7822d63ac
--- /dev/null
+++ b/codecs/Makefile.nmake
@@ -0,0 +1,41 @@
+## Makefile for building codecs.lib with Microsoft C and nmake
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+#
+# $Id$
+
+include ..\..\config.nmake
+
+############### no need to modify below this line #########
+
+CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GLIB_CFLAGS) \
+	/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
+	/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
+	/I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \
+	/I$(NET_SNMP_DIR)\win32 /Zm800 -D_U_="" -D_NEED_VAR_IMPORT_ $(LOCAL_CFLAGS) \
+
+.c.obj::
+	$(CC) $(CFLAGS)  -Fd.\ -c $<
+
+CODEC_OBJECTS= \
+        G711udecode.obj \
+	G711adecode.obj
+
+
+codecs.lib	:  $(CODEC_OBJECTS) 
+	link /lib /out:codecs.lib $(CODEC_OBJECTS) 
+
+
+G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h
+        $(CC) $(CFLAGS) -c /Zi /W1 /Od G711a\G711adecode.c -o $@
+
+G711udecode.obj: G711u\G711udecode.c G711u\G711udecode.h G711u\G711utable.h
+        $(CC) $(CFLAGS) -c /Zi /W1 /Od G711u\G711udecode.c -o $@
+
+clean:
+        rm -f $(CODEC_OBJECTS) codecs.lib *.pdb
+
+distclean: clean
+
+maintainer-clean: distclean
+
+