Commit 3426ac87 authored by Simon Morlat's avatar Simon Morlat

initial commit of g726 support (untested)

parent 1b8cb290
......@@ -541,7 +541,31 @@ fi
fi
dnl check for spandsp support to bring up g726 codec
AC_ARG_ENABLE(spandsp,
[ --disable-spandsp Disable spandsp support],
[case "${enableval}" in
yes) spandsp=true ;;
no) spandsp=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-spandsp) ;;
esac],[spandsp=true])
if test x$spandsp = xtrue; then
dnl check for installed version of speex
PKG_CHECK_MODULES(SPANDSP, spandsp >= 0.0.6,
[ AC_DEFINE(HAVE_SPANDSP,1,[tells whether spandsp can be used])
have_spandsp=true ],
[have_spandsp=false]
)
AC_SUBST(SPANDSP_CFLAGS)
AC_SUBST(SPANDSP_LIBS)
fi
AM_CONDITIONAL(BUILD_GSM, test x$build_gsm = xyes )
AM_CONDITIONAL(BUILD_G726, test "$have_spandsp" = "true" )
MS_CHECK_VIDEO
AM_CONDITIONAL(BUILD_VIDEO, test "$video" = "true")
......
......@@ -109,7 +109,23 @@ typedef enum MSFilterId{
MS_ANDROID_VIDEO_WRITE_ID,
MS_TONE_DETECTOR_ID,
MS_VP8_ENC_ID,
MS_VP8_DEC_ID
MS_VP8_DEC_ID,
MS_G726_40_ENC_ID,
MS_G726_32_ENC_ID,
MS_G726_24_ENC_ID,
MS_G726_16_ENC_ID,
MS_AAL2_G726_40_ENC_ID,
MS_AAL2_G726_32_ENC_ID,
MS_AAL2_G726_24_ENC_ID,
MS_AAL2_G726_16_ENC_ID,
MS_G726_40_DEC_ID,
MS_G726_32_DEC_ID,
MS_G726_24_DEC_ID,
MS_G726_16_DEC_ID,
MS_AAL2_G726_40_DEC_ID,
MS_AAL2_G726_32_DEC_ID,
MS_AAL2_G726_24_DEC_ID,
MS_AAL2_G726_16_DEC_ID
} MSFilterId;
......
......@@ -66,6 +66,10 @@ if BUILD_GSM
libmediastreamer_la_SOURCES+=gsm.c
endif
if BUILD_G726
libmediastreamer_la_SOURCES+=g726.c
endif
if BUILD_WIN32
libmediastreamer_la_SOURCES+= winsnd3.c \
msfileplayer_win.c msfilerec_win.c
......@@ -185,7 +189,8 @@ libmediastreamer_la_LIBADD= $(ORTP_LIBS) \
$(SPEEX_LIBS) \
$(GSM_LIBS) \
$(LIBV4L1_LIBS) \
$(LIBV4L2_LIBS)
$(LIBV4L2_LIBS) \
$(SPANDSP_LIBS)
libmediastreamer_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
......@@ -215,7 +220,8 @@ AM_CFLAGS= $(ORTP_CFLAGS) \
$(SPEEX_CFLAGS) \
$(GSM_CFLAGS) \
$(STRICT_OPTIONS) \
$(LIBPULSE_CFLAGS)
$(LIBPULSE_CFLAGS) \
$(SPANDSP_CFLAGS)
AM_CXXFLAGS= $(ORTP_CFLAGS) \
......
This diff is collapsed.
/*
mediastreamer2 library - modular sound and video processing and streaming
Copyright (C) 2011 Belledonne Communications SARL
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.
*/
#ifdef __APPLE__
#include "mediastreamer-config.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment