lcr: update to current master; re-introduce AMR support

Update to current master of lcr, which includes support for AMR
and RTP-bridge.  Master openbsc doesn't support RTP-bridge yet,
but it will work with a transcoding LCR getting all TCH frames
in all codecs (HR/FR/EFR/AMR) via MNCC.
This commit is contained in:
Harald Welte 2014-05-19 11:32:16 +02:00
parent ea7e6ec763
commit eff76c2d8c
2 changed files with 2 additions and 18 deletions

View File

@ -1,15 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 1911187..c395ee2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,8 +185,8 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" )
AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
# check for opencore-amrnb for AMR and EFR decoding
-found_opencore_amrnb=yes
-PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
+found_opencore_amrnb=no
+#PKG_CHECK_MODULES(OPENCORE_AMRNB, opencore-amrnb >= 0.1.0, , found_opencore_amrnb=no)
AM_CONDITIONAL(ENABLE_GSMAMR, test "$found_opencore_amrnb" = "yes")
if test "$found_opencore_amrnb" = yes; then
AC_DEFINE(HAVE_OPENCORE_AMRNB, 1, [Define to 1 if OpenCore AMR-NB library is available])

View File

@ -4,13 +4,12 @@ HOMEPAGE = "http://isdn.eversberg.eu/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996"
PV = "1.13+gitr${SRCPV}"
PV = "1.14+gitr${SRCPV}"
PR = "r2"
SRCREV = "f3b94bf3a9599359805eaf20f3b036272c7af522"
SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c"
SRC_URI = "git://git.misdn.eu/lcr.git \
file://lcr-disable-gsmfr.diff \
file://lcr-no_amr.diff \
file://lcr.init "
S = "${WORKDIR}/git"