Add AMR wideband codec option.

builders/CMakeLists.txt

@@ -63,9 +63,15 @@ list(APPEND LINPHONE_BUILDER_BUILDERS
 	ms2
 )
 
-if(${ENABLE_AMR})
-	list(APPEND LINPHONE_BUILDER_BUILDERS opencoreamr msamr)
-endif(${ENABLE_AMR})
+if(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
+	list(APPEND LINPHONE_BUILDER_BUILDERS opencoreamr)
+endif(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
+if(${ENABLE_AMRWB})
+	list(APPEND LINPHONE_BUILDER_BUILDERS voamrwbenc)
+endif(${ENABLE_AMRWB})
+if(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
+	list(APPEND LINPHONE_BUILDER_BUILDERS msamr)
+endif(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
 if(${ENABLE_G729})
 	list(APPEND LINPHONE_BUILDER_BUILDERS bcg729)
 endif(${ENABLE_G729})

builders/linphone.cmake

@@ -43,9 +43,9 @@ else(WIN32)
 	set(EP_linphone_LINKING_TYPE "--disable-static" "--enable-shared")
 	set(EP_linphone_DEPENDENCIES EP_bellesip EP_ortp EP_ms2 EP_xml2)
 
-	if(${ENABLE_AMR})
+	if(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
 		list(APPEND EP_linphone_DEPENDENCIES EP_msamr)
-	endif(${ENABLE_AMR})
+	endif(${ENABLE_AMRNB} OR ${ENABLE_AMRWB})
 	if(${ENABLE_G729})
 		list(APPEND EP_linphone_DEPENDENCIES EP_bcg729)
 	endif(${ENABLE_G729})

builders/msamr.cmake

@@ -24,9 +24,22 @@ set(EP_msamr_GIT_REPOSITORY "git://git.linphone.org/msamr.git")
 set(EP_msamr_GIT_TAG "d09a19cb27076c45f093e8abc9a00d07258779e9") # Branch 'master'
 set(EP_msamr_USE_AUTOTOOLS "yes")
 set(EP_msamr_USE_AUTOGEN "yes")
+set(EP_msamr_CONFIGURE_OPTIONS )
 set(EP_msamr_CROSS_COMPILATION_OPTIONS
 	"--prefix=${CMAKE_INSTALL_PREFIX}"
 	"--host=${LINPHONE_BUILDER_TOOLCHAIN_HOST}"
 )
 set(EP_msamr_LINKING_TYPE "--disable-static" "--enable-shared")
 set(EP_msamr_DEPENDENCIES EP_ms2 EP_opencoreamr)
+
+if(${ENABLE_AMRNB})
+	list(APPEND EP_msamr_CONFIGURE_OPTIONS "--enable-narrowband")
+else(${ENABLE_AMRNB})
+	list(APPEND EP_msamr_CONFIGURE_OPTIONS "--disable-narrowband")
+endif(${ENABLE_AMRNB})
+if(${ENABLE_AMRWB})
+	list(APPEND EP_msamr_CONFIGURE_OPTIONS "--enable-wideband")
+	list(APPEND EP_msamr_DEPENDENCIES EP_voamrwbenc)
+else(${ENABLE_AMRWB})
+	list(APPEND EP_msamr_CONFIGURE_OPTIONS "--disable-wideband")
+endif(${ENABLE_AMRWB})

builders/opencoreamr.cmake

@@ -24,8 +24,19 @@ set(EP_opencoreamr_GIT_REPOSITORY "git://git.code.sf.net/p/opencore-amr/code")
 set(EP_opencoreamr_GIT_TAG "cf4409e03ec56b1cd85a2f9532f58bc1fa9db274")
 set(EP_opencoreamr_USE_AUTOTOOLS "yes")
 set(EP_opencoreamr_USE_AUTOGEN "yes")
+set(EP_opencoreamr_CONFIGURE_OPTIONS )
 set(EP_opencoreamr_CROSS_COMPILATION_OPTIONS
 	"--prefix=${CMAKE_INSTALL_PREFIX}"
 	"--host=${LINPHONE_BUILDER_TOOLCHAIN_HOST}"
 )
 set(EP_opencoreamr_LINKING_TYPE "--disable-static" "--enable-shared")
+
+if(${ENABLE_AMRNB})
+	list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS
+		"--enable-amrnb-decoder" "--enable-amrnb-encoder"
+	)
+else(${ENABLE_AMRNB})
+	list(APPEND EP_opencoreamr_CONFIGURE_OPTIONS
+		"--disable-amrnb-decoder" "--disable-amrnb-encoder"
+	)
+endif(${ENABLE_AMRNB})

builders/voamrwbenc.cmake

+############################################################################
+# voamrwbenc.cmake
+# Copyright (C) 2014  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# 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.
+#
+############################################################################
+
+set(EP_voamrwbenc_GIT_REPOSITORY "git://git.code.sf.net/p/opencore-amr/vo-amrwbenc")
+set(EP_voamrwbenc_GIT_TAG "e96f4b5d3fe38b3bee5d71fefdaa1af8b842dde9")
+set(EP_voamrwbenc_USE_AUTOTOOLS "yes")
+set(EP_voamrwbenc_USE_AUTOGEN "yes")
+set(EP_voamrwbenc_CROSS_COMPILATION_OPTIONS
+	"--prefix=${CMAKE_INSTALL_PREFIX}"
+	"--host=${LINPHONE_BUILDER_TOOLCHAIN_HOST}"
+)
+set(EP_voamrwbenc_LINKING_TYPE "--disable-static" "--enable-shared")
+set(EP_voamrwbenc_PATCH_COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${CMAKE_CURRENT_SOURCE_DIR}/builders/voamrwbenc/autogen.sh" "<SOURCE_DIR>")
+set(EP_voamrwbenc_DEPENDENCIES EP_opencoreamr)

builders/voamrwbenc/autogen.sh

+#!/bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+THEDIR=`pwd`
+cd $srcdir
+
+#AM_VERSION="1.10"
+if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then
+	# automake-1.10 (recommended) is not available on Fedora 8
+	AUTOMAKE=automake
+	ACLOCAL=aclocal
+else
+	ACLOCAL=aclocal-${AM_VERSION}
+	AUTOMAKE=automake-${AM_VERSION}
+fi
+
+if test -f /opt/local/bin/glibtoolize ; then
+	# darwin
+	LIBTOOLIZE=/opt/local/bin/glibtoolize
+else
+	LIBTOOLIZE=libtoolize
+fi
+if test -d /opt/local/share/aclocal ; then
+	ACLOCAL_ARGS="-I /opt/local/share/aclocal"
+fi
+
+
+if test -d /share/aclocal ; then
+        ACLOCAL_ARGS="-I /share/aclocal"
+fi
+
+echo "Generating build scripts in vo-amrwbenc..."
+set -x
+$LIBTOOLIZE --copy --force
+$ACLOCAL  $ACLOCAL_ARGS
+autoheader
+$AUTOMAKE --force-missing --add-missing --copy
+autoconf
+
+cd $THEDIR
+

cmake/LinphoneBuilderOptions.cmake

@@ -41,8 +41,10 @@ linphone_builder_add_feature_info("SRTP" ENABLE_SRTP "SRTP media encryption supp
 cmake_dependent_option(ENABLE_ZRTP "Enable ZRTP support." ${DEFAULT_VALUE_ENABLE_ZRTP} "ENABLE_GPL_THIRD_PARTIES" OFF)
 linphone_builder_add_feature_info("ZRTP" ENABLE_ZRTP "ZRTP media encryption support.")
 
-option(ENABLE_AMR "Enable AMR audio codec support." ${DEFAULT_VALUE_ENABLE_AMR})
-linphone_builder_add_feature_info("AMR" ENABLE_AMR "AMR audio encoding/decoding support.")
+option(ENABLE_AMRNB "Enable AMR narrow-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRNB})
+linphone_builder_add_feature_info("AMR-NB" ENABLE_AMRNB "AMR narrow-band audio encoding/decoding support.")
+option(ENABLE_AMRWB "Enable AMR wide-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRWB})
+linphone_builder_add_feature_info("AMR-WB" ENABLE_AMRWB "AMR wide-band audio encoding/decoding support.")
 option(ENABLE_G729 "Enable G.729 audio codec support." ${DEFAULT_VALUE_ENABLE_G729})
 linphone_builder_add_feature_info("G.729" ENABLE_G729 "G.729 audio encoding/decoding support.")
 option(ENABLE_GSM "Enable GSM audio codec support." ${DEFAULT_VALUE_ENABLE_GSM})

configs/config-bb10.cmake

@@ -26,7 +26,8 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_AMR OFF)
+set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
+set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC OFF)

configs/config-desktop.cmake

@@ -26,7 +26,8 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_AMR ON)
+set(DEFAULT_VALUE_ENABLE_AMRNB ON)
+set(DEFAULT_VALUE_ENABLE_AMRWB ON)
 set(DEFAULT_VALUE_ENABLE_G729 ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC ON)

configs/config-ios.cmake

@@ -26,7 +26,8 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_AMR ON)
+set(DEFAULT_VALUE_ENABLE_AMRNB ON)
+set(DEFAULT_VALUE_ENABLE_AMRWB ON)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC OFF)

configs/config-webplugin.cmake

@@ -26,7 +26,8 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
-set(DEFAULT_VALUE_ENABLE_AMR OFF)
+set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
+set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
 set(DEFAULT_VALUE_ENABLE_G729 OFF)
 set(DEFAULT_VALUE_ENABLE_GSM OFF)
 set(DEFAULT_VALUE_ENABLE_ILBC OFF)