aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2016-07-12 20:25:33 +0200
committerDaniel Willmann <daniel@totalueberwachung.de>2016-07-12 20:25:33 +0200
commit0ac2c285e965d7ae104f857c829c3978cdd7b83c (patch)
treebbeefc92389223412152a0cc525cdb87e06f934f
parentf4ab3f492f5b2dfef55a65900ec256655c110e23 (diff)
Add AMR codec support
-rw-r--r--Makefile.am5
-rw-r--r--codecs/Makefile.am7
-rw-r--r--codecs/amr/amrdecode.c97
-rw-r--r--codecs/amr/amrdecode.h48
-rw-r--r--codecs/codecs.c9
-rw-r--r--configure.ac10
6 files changed, 175 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index ed3aafd..4d925e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -483,6 +483,11 @@ wireshark_LDADD = \
if HAVE_SPEEXDSP
wireshark_LDADD += $(SPEEXDSP_LIBS)
endif
+
+if HAVE_AMRNB
+wireshark_LDADD += $(AMRNB_LIBS)
+endif
+
endif # HAVE_Qt
if HAVE_GTK
diff --git a/codecs/Makefile.am b/codecs/Makefile.am
index da74a8d..5276841 100644
--- a/codecs/Makefile.am
+++ b/codecs/Makefile.am
@@ -42,6 +42,10 @@ if !HAVE_SPEEXDSP
libwscodecs_la_SOURCES += speex/resample.c
endif
+if HAVE_AMRNB
+libwscodecs_la_SOURCES += amr/amrdecode.c
+endif
+
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
@@ -60,7 +64,8 @@ noinst_HEADERS = \
sbc/sbc_private.h \
speex/arch.h \
speex/speex_resampler.h \
- speex/stack_alloc.h
+ speex/stack_alloc.h \
+ amr/amrdecode.h
EXTRA_DIST = \
CMakeLists.txt \
diff --git a/codecs/amr/amrdecode.c b/codecs/amr/amrdecode.c
new file mode 100644
index 0000000..4c9d43e
--- /dev/null
+++ b/codecs/amr/amrdecode.c
@@ -0,0 +1,97 @@
+/* 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 <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 0000000..5cd5552
--- /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 7f628a7..a1649ce 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -32,6 +32,10 @@
#include "sbc/sbc_private.h"
#endif
+#ifdef HAVE_AMRNB
+#include "amr/amrdecode.h"
+#endif
+
#ifdef HAVE_PLUGINS
#include <gmodule.h>
@@ -115,6 +119,11 @@ register_all_codecs(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
+
g_slist_foreach(codec_plugins, register_codec_plugin, NULL);
}
#endif /* HAVE_PLUGINS */
diff --git a/configure.ac b/configure.ac
index caa29a3..2915dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2402,6 +2402,15 @@ AS_IF([test "x$have_speexdsp" = xyes],
[AC_DEFINE(HAVE_SPEEXDSP, 1, [Define to 1 if you have SpeexDSP])])
AM_CONDITIONAL(HAVE_SPEEXDSP, [test "x$have_speexdsp" = "xyes"])
+#
+# Check for AMR NB
+#
+AS_IF([test "x$have_qt_multimedia_lib" = xyes],
+ [PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [have_amrnb=yes], [have_amrnb=no])])
+AS_IF([test "x$have_amrnb" = xyes],
+ [AC_DEFINE(HAVE_AMRNB, 1, [Define to 1 if you have AMRNB])])
+AM_CONDITIONAL(HAVE_AMRNB, [test "x$have_amrnb" = "xyes"])
+
# Check Bluetooth SBC codec for RTP Player
# git://git.kernel.org/pub/scm/bluetooth/sbc.git
AC_ARG_WITH([sbc],
@@ -3000,4 +3009,5 @@ echo " Use libssh library : $libssh_message"
echo " Have ssh_userauth_agent : $ssh_userauth_agent_message"
echo " Use nl library : $libnl_message"
echo " Use SBC codec library : $have_sbc"
+echo " Use AMRNB codec library : $have_amrnb"
#echo " Use GDK-Pixbuf with GResource: $have_gresource_pixbuf"