aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt18
-rw-r--r--CMakeOptions.txt1
-rw-r--r--cmake/modules/FindAMRNB.cmake57
-rw-r--r--cmakeconfig.h.in3
-rw-r--r--codecs/CMakeLists.txt5
-rw-r--r--codecs/amr/amrdecode.c98
-rw-r--r--codecs/amr/amrdecode.h48
-rw-r--r--codecs/codecs.c9
8 files changed, 239 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a5895b..5138c53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1015,6 +1015,10 @@ if(ENABLE_BCG729)
set(PACKAGELIST ${PACKAGELIST} BCG729)
endif()
+if(ENABLE_AMRNB)
+ set(PACKAGELIST ${PACKAGELIST} AMRNB)
+endif()
+
if(ENABLE_LIBXML2)
set(PACKAGELIST ${PACKAGELIST} LibXml2)
endif()
@@ -1145,6 +1149,9 @@ endif()
if(BCG729_FOUND)
set(HAVE_BCG729 1)
endif()
+if(AMRNB_FOUND)
+ set(HAVE_AMRNB 1)
+endif()
if(LIBXML2_FOUND)
set(HAVE_LIBXML2 1)
else()
@@ -1455,6 +1462,11 @@ set_package_properties(BCG729 PROPERTIES
URL "https://www.linphone.org/technical-corner/bcg729/overview"
PURPOSE "Support for G.729 codec in RTP player"
)
+set_package_properties(AMRNB PROPERTIES
+ DESCRIPTION "AMRNB decoder"
+ URL "https://sourceforge.net/p/opencore-amr"
+ PURPOSE "Support for AMRNB codec in RTP player"
+)
set_package_properties(LIBXML2 PROPERTIES
DESCRIPTION "XML parsing library"
URL "http://xmlsoft.org/"
@@ -1713,6 +1725,9 @@ if(WIN32)
if (BCG729_FOUND)
list (APPEND OPTIONAL_DLLS "${BCG729_DLL_DIR}/${BCG729_DLL}")
endif(BCG729_FOUND)
+ if (AMRNB_FOUND)
+ list (APPEND OPTIONAL_DLLS "${AMRNB_DLL_DIR}/${AMRNB_DLL}")
+ endif(AMRNB_FOUND)
if (LIBXML2_FOUND)
list (APPEND OPTIONAL_DLLS "${LIBXML2_DLL_DIR}/${LIBXML2_DLL}")
endif(LIBXML2_FOUND)
@@ -2901,6 +2916,9 @@ if(RPMBUILD_EXECUTABLE)
if (BCG729_FOUND)
list(APPEND _rpmbuild_with_args --with bcg729)
endif()
+ if (AMRNB_FOUND)
+ list(APPEND _rpmbuild_with_args --with amrnb)
+ endif()
if (LIBXML2_FOUND)
list(APPEND _rpmbuild_with_args --with libxml2)
endif()
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index 53d68fa..eb6f7f9 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -80,6 +80,7 @@ option(ENABLE_KERBEROS "Build with Kerberos support" ON)
option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON)
option(ENABLE_SPANDSP "Build with G.722/G.726 codecs support in RTP Player" ON)
option(ENABLE_BCG729 "Build with G.729 codec support in RTP Player" ON)
+option(ENABLE_AMRNB "Build with AMRNB codec support in RTP Player" ON)
option(ENABLE_LIBXML2 "Build with libxml2 support" ON)
# How to install
set(DUMPCAP_INSTALL_OPTION "normal" CACHE STRING "Permissions to install")
diff --git a/cmake/modules/FindAMRNB.cmake b/cmake/modules/FindAMRNB.cmake
new file mode 100644
index 0000000..21f152b
--- /dev/null
+++ b/cmake/modules/FindAMRNB.cmake
@@ -0,0 +1,57 @@
+# Find the system's opencore-amrnb includes and library
+#
+# AMRNB_INCLUDE_DIRS - where to find amrnb/decoder.h
+# AMRNB_LIBRARIES - List of libraries when using amrnb
+# AMRNB_FOUND - True if amrnb found
+# AMRNB_DLL_DIR - (Windows) Path to the amrnb DLL
+# AMRNB_DLL - (Windows) Name of the amrnb DLL
+
+include( FindWSWinLibs )
+FindWSWinLibs( "opencore-amrnb-.*" "AMRNB_HINTS" )
+
+if (NOT WIN32)
+ find_package(PkgConfig)
+ pkg_search_module(AMRNB opencore-amrnb)
+endif()
+
+find_path( AMRNB_INCLUDE_DIR
+ NAMES opencore-amrnb/interf_dec.h
+ HINTS
+ "${AMRNB_INCLUDE_DIR}"
+ "${AMRNB_HINTS}/include"
+ PATHS /usr/local/include /usr/include
+)
+
+find_library( AMRNB_LIBRARY
+ NAMES opencore-amrnb
+ HINTS
+ "${AMRNB_LIBDIR}"
+ "${AMRNB_HINTS}/lib"
+ PATHS /usr/local/lib /usr/lib
+)
+
+include( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( amrnb DEFAULT_MSG AMRNB_INCLUDE_DIR AMRNB_LIBRARY )
+
+if( AMRNB_FOUND )
+ set( AMRNB_INCLUDE_DIRS ${AMRNB_INCLUDE_DIR} )
+ set( AMRNB_LIBRARIES ${AMRNB_LIBRARY} )
+ if (WIN32)
+ set ( AMRNB_DLL_DIR "${AMRNB_HINTS}/bin"
+ CACHE PATH "Path to amrnb DLL"
+ )
+ file( GLOB _amrnb_dll RELATIVE "${AMRNB_DLL_DIR}"
+ "${AMRNB_DLL_DIR}/libamrnb.dll"
+ )
+ set ( AMRNB_DLL ${_amrnb_dll}
+ # We're storing filenames only. Should we use STRING instead?
+ CACHE FILEPATH "amrnb DLL file name"
+ )
+ mark_as_advanced( AMRNB_DLL_DIR AMRNB_DLL )
+ endif()
+else()
+ set( AMRNB_INCLUDE_DIRS )
+ set( AMRNB_LIBRARIES )
+endif()
+
+mark_as_advanced( AMRNB_LIBRARIES AMRNB_INCLUDE_DIRS )
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 57d7d59..b6262d8 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -276,6 +276,9 @@
/* Define to 1 if you have the bcg729 library. */
#cmakedefine HAVE_BCG729 1
+/* Define to 1 if you have the opencore-amrnb library. */
+#cmakedefine HAVE_AMRNB 1
+
/* Define to 1 if you have the lixbml2 library. */
#cmakedefine HAVE_LIBXML2 1
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index 2f446f6..ce6ca04 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 0000000..22b3f58
--- /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 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 4e5f542..abbd551 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);