4 files changed, 160 insertions, 0 deletions
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 2f446f6648..ce6ca048fb 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -49,6 +49,11 @@ if(HAVE_BCG729)
   list(APPEND wscodecs_LIBS ${BCG729_LIBRARIES})
 endif()
 
+if(AMRNB_FOUND)
+  list(APPEND WSCODECS_FILES amr/amrdecode.c)
+  list(APPEND wscodecs_LIBS ${AMRNB_LIBRARIES})
+endif()
+
 add_library(wscodecs
   ${WSCODECS_FILES}
   ${CMAKE_BINARY_DIR}/image/libwscodecs.rc
diff --git a/codecs/amr/amrdecode.c b/codecs/amr/amrdecode.c
new file mode 100644
index 0000000000..22b3f584b8
--- /dev/null
+++ b/codecs/amr/amrdecode.c
@@ -0,0 +1,98 @@
+/* amrdecode.c
+ * AMR codec
+ *
+ * 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 "config.h"
+
+#include <glib.h>
+#include <string.h>
+#include "amrdecode.h"
+#include "ws_attributes.h"
+
+#include <opencore-amrnb/interf_dec.h>
+
+void *
+codec_amr_init(void)
+{
+    void *state;
+    state = Decoder_Interface_init();
+
+    return state;
+}
+
+void
+codec_amr_release(void *state)
+{
+    Decoder_Interface_exit(state);
+}
+
+unsigned
+codec_amr_get_channels(void *ctx _U_)
+{
+    return 1;
+}
+
+unsigned
+codec_amr_get_frequency(void *ctx _U_)
+{
+    return 8000;
+}
+
+size_t
+codec_amr_decode(void *state, const void *input, size_t inputSizeBytes, void *output,
+        size_t *outputSizeBytes)
+{
+    int mode;
+    unsigned packet_size;
+    static const uint8_t block_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
+
+    /* First byte is CMR, second is the Payload TOC */
+    mode = (((uint8_t *)input)[1] >> 3) & 0x0F;
+    packet_size = block_size[mode] + 2;
+
+    if (!output || !outputSizeBytes)
+	    return 160*2;
+
+    *outputSizeBytes = 160 * 2; /* 160 frames, two byte per frame, 20ms */
+
+    /* If the size is screwed up, insert silence */
+    if (packet_size > inputSizeBytes) {
+	    memset(output, 0, *outputSizeBytes);
+	    return *outputSizeBytes;
+    }
+
+    Decoder_Interface_Decode(state, (const unsigned char *)input+1, (short *)output, 0);
+    return *outputSizeBytes;
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
+
diff --git a/codecs/amr/amrdecode.h b/codecs/amr/amrdecode.h
new file mode 100644
index 0000000000..5cd5552abb
--- /dev/null
+++ b/codecs/amr/amrdecode.h
@@ -0,0 +1,48 @@
+/* G726decode.h
+ * Definitions for A-law G.722 codec
+ *
+ * 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_AMRDECODE_H__
+#define __CODECS_AMRDECODE_H__
+
+#include <stdint.h>
+
+void *codec_amr_init(void);
+void  codec_amr_release(void *ctx);
+unsigned codec_amr_get_channels(void *ctx);
+unsigned codec_amr_get_frequency(void *ctx);
+size_t   codec_amr_decode(void *ctx, const void *input, size_t inputSizeBytes, void *output,
+        size_t *outputSizeBytes);
+
+#endif /* AMRdecode.h */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/codecs/codecs.c b/codecs/codecs.c
index 4e5f542116..abbd55146f 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -29,6 +29,10 @@
 #include "G729/G729decode.h"
 #endif
 
+#ifdef HAVE_AMRNB
+#include "amr/amrdecode.h"
+#endif
+
 #ifdef HAVE_PLUGINS
 
 
@@ -92,6 +96,11 @@ codecs_init(void)
             codec_sbc_get_channels, codec_sbc_get_frequency, codec_sbc_decode);
 #endif
 
+#ifdef HAVE_AMRNB
+    register_codec("AMR", codec_amr_init, codec_amr_release,
+	    codec_amr_get_channels, codec_amr_get_frequency, codec_amr_decode);
+#endif
+
 #ifdef HAVE_PLUGINS
     libwscodecs_plugins = plugins_init(WS_PLUGIN_CODEC);
     g_slist_foreach(codecs_plugins, call_plugin_register_codec_module, NULL);