Move codecs.[ch] out of epan and into codecs directory.

This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs.  See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)

svn path=/trunk/; revision=53686

5 files changed, 137 insertions, 0 deletions

diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 723d891510..8af9897dfa 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -22,6 +22,7 @@
 #
 
 set(CODECS_FILES
+  codecs.c
   G711a/G711adecode.c
   G711u/G711udecode.c
   G722/G722decode.c
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index 9d036e982e..96cdf18676 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -35,6 +35,7 @@ MAINTAINERCLEANFILES =	\
        Makefile.in
 
 libcodec_a_SOURCES = \
+       codecs.c codecs.h	\
        G711a/G711adecode.c G711a/G711adecode.h G711a/G711atable.h	\
        G711u/G711udecode.c G711u/G711udecode.h G711u/G711utable.h	\
        G722/G722decode.c G722/G722decode.h							\
@@ -49,6 +50,7 @@ EXTRA_DIST = \
 
 checkapi: 
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
+	codecs.c \
 	G711a/G711adecode.c \
 	G711u/G711udecode.c \
 	G722/G722decode.c \
diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake
index f335a48e5c..fd1e638d4e 100644
--- a/codecs/Makefile.nmake
+++ b/codecs/Makefile.nmake
@@ -14,6 +14,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
 	$(CC) $(CFLAGS)  -Fd.\ -c $<
 
 CODEC_OBJECTS= \
+    codecs.obj \
 	G711udecode.obj \
 	G711adecode.obj \
 	G722decode.obj \
@@ -25,6 +26,9 @@ codecs.lib	:  $(CODEC_OBJECTS)
 	link /lib /out:codecs.lib $(CODEC_OBJECTS)
 
 
+codecs.obj: codecs.c codecs.h
+	$(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj
+
 G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h
 	$(CC) $(CFLAGS) -Fd.\ -c G711a\G711adecode.c /Fo%|fF.obj
 
@@ -49,6 +53,7 @@ maintainer-clean: distclean
 
 checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
+	codecs.c \
 	G711a/G711adecode.c \
 	G711u/G711udecode.c \
 	G722/G722decode.c \
diff --git a/codecs/codecs.c b/codecs/codecs.c
new file mode 100644
index 0000000000..0cb397f99b
--- /dev/null
+++ b/codecs/codecs.c
@@ -0,0 +1,88 @@
+/* codecs.c
+ * codecs interface   2007 Tomas Kukosa
+ *
+ * $Id$
+ *
+ * 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
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <glib.h>
+#include "codecs.h"
+
+struct codec_handle {
+	const char *name;
+	codec_init_fn init_fn;
+	codec_release_fn release_fn;
+	codec_decode_fn decode_fn;
+};
+
+/*
+ * List of registered codecs.
+ */
+static GHashTable *registered_codecs = NULL;
+
+
+/* Find a registered codec by name. */
+codec_handle_t
+find_codec(const char *name)
+{
+	return (registered_codecs) ? (codec_handle_t)g_hash_table_lookup(registered_codecs, name) : NULL;
+}
+
+/* Register a codec by name. */
+void
+register_codec(const char *name, codec_init_fn init_fn, codec_release_fn release_fn, codec_decode_fn decode_fn)
+{
+	struct codec_handle *handle;
+
+	/* Create our hash table if it doesn't already exist */
+	if (registered_codecs == NULL) {
+		registered_codecs = g_hash_table_new(g_str_hash, g_str_equal);
+		g_assert(registered_codecs != NULL);
+	}
+
+	/* Make sure the registration is unique */
+	g_assert(g_hash_table_lookup(registered_codecs, name) == NULL);
+
+	handle = (struct codec_handle *)g_malloc(sizeof (struct codec_handle));
+	handle->name = name;
+	handle->init_fn = init_fn;
+	handle->release_fn = release_fn;
+	handle->decode_fn = decode_fn;
+
+	g_hash_table_insert(registered_codecs, (gpointer)name, (gpointer) handle);
+}
+
+void *codec_init(codec_handle_t codec)
+{
+	if (!codec) return NULL;
+	return (codec->init_fn)();
+}
+
+void codec_release(codec_handle_t codec, void *context)
+{
+	if (!codec) return;
+	(codec->release_fn)(context);
+}
+
+int codec_decode(codec_handle_t codec, void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes)
+{
+	if (!codec) return 0;
+	return (codec->decode_fn)(context, input, inputSizeBytes, output, outputSizeBytes);
+}
diff --git a/codecs/codecs.h b/codecs/codecs.h
new file mode 100644
index 0000000000..9231fe8455
--- /dev/null
+++ b/codecs/codecs.h
@@ -0,0 +1,41 @@
+/* codecs.h
+ * codecs interface   2007 Tomas Kukosa
+ *
+ * $Id$
+ *
+ * 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
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef _CODECS_H_
+#define _CODECS_H_
+
+struct codec_handle;
+typedef struct codec_handle *codec_handle_t;
+
+typedef void *(*codec_init_fn)(void);
+typedef void (*codec_release_fn)(void *context);
+typedef int (*codec_decode_fn)(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
+
+extern void register_codec(const char *name, codec_init_fn init_fn, codec_release_fn release_fn, codec_decode_fn decode_fn);
+extern codec_handle_t find_codec(const char *name);
+extern void *codec_init(codec_handle_t codec);
+extern void codec_release(codec_handle_t codec, void *context);
+extern int codec_decode(codec_handle_t codec, void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes);
+
+#endif