Commit 841ba533 authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch '1.1.x'

parents 4c51d889 0aed416c
......@@ -21,7 +21,7 @@
############################################################################
cmake_minimum_required(VERSION 3.0)
project(mswebrtc VERSION 1.0.0 LANGUAGES C)
project(mswebrtc VERSION 1.1.0 LANGUAGES C)
set(PACKAGE "${PROJECT_NAME}")
......
......@@ -2,17 +2,19 @@ EXTRA_DIST=autogen.sh mswebrtc.iss.in CMakeLists.txt config.h.cmake
webrtc_VERSION = 1.0.0
webrtc_DIR=$(top_srcdir)/webrtc
ISAC_FLAVOUR ?= fix # use 'main' or 'fix'
ISAC_SRC_DIR = $(top_srcdir)/webrtc/webrtc/modules/audio_coding/codecs/isac/$(ISAC_FLAVOUR)
AEC_SRC_DIR = $(top_srcdir)/webrtc/webrtc/modules/audio_processing/aecm
WEBRTC_COMMON_DIR = $(top_srcdir)/webrtc/webrtc/common_audio
WEBRTC_COMMON_SP_DIR = $(WEBRTC_COMMON_DIR)/signal_processing
# use 'main' or 'fix'
ISAC_FLAVOUR = fix
ISAC_SRC_DIR = webrtc/webrtc/modules/audio_coding/codecs/isac/$(ISAC_FLAVOUR)
ILBC_SRC_DIR = webrtc/webrtc/modules/audio_coding/codecs/ilbc
AEC_SRC_DIR = webrtc/webrtc/modules/audio_processing/aecm
WEBRTC_COMMON_DIR = webrtc/webrtc/common_audio
WEBRTC_COMMON_SP_DIR = webrtc/webrtc/common_audio/signal_processing
pluginsdir = $(libdir)/mediastreamer/plugins
plugins_LTLIBRARIES=libmswebrtc.la
WEBRTC_COMMON_SRCS = \
WEBRTC_COMMON_SRCS = \
$(WEBRTC_COMMON_SP_DIR)/auto_correlation.c $(WEBRTC_COMMON_SP_DIR)/levinson_durbin.c \
$(WEBRTC_COMMON_SP_DIR)/auto_corr_to_refl_coef.c $(WEBRTC_COMMON_SP_DIR)/lpc_to_refl_coef.c \
$(WEBRTC_COMMON_SP_DIR)/complex_bit_reverse.c $(WEBRTC_COMMON_SP_DIR)/min_max_operations.c \
......@@ -64,19 +66,22 @@ ISAC_BASE_SRCS = $(ISAC_SRC_DIR)/source/fft.c \
# some files are implementation specific
if ISAC_FLAVOUR_MAIN
# floating point implementation
ISAC_BASE_SRCS += $(ISAC_SRC_DIR)/source/initialize.c \
$(ISAC_SRC_DIR)/source/crc.c \
$(ISAC_SRC_DIR)/source/encode_lpc_swb.c \
$(ISAC_SRC_DIR)/source/filter_functions.c \
$(ISAC_SRC_DIR)/source/isac.c \
$(ISAC_SRC_DIR)/source/lpc_analysis.c \
$(ISAC_SRC_DIR)/source/lpc_gain_swb_tables.c \
$(ISAC_SRC_DIR)/source/lpc_shape_swb12_tables.c \
$(ISAC_SRC_DIR)/source/lpc_shape_swb16_tables.c \
$(ISAC_SRC_DIR)/util/utility.c
#
## floating point implementation
# August 16th, 2016 : disabling support of floating point
# because of compilation issues
#TODO: Fix floating point build
#ISAC_BASE_SRCS += $(ISAC_SRC_DIR)/source/initialize.c \
# $(ISAC_SRC_DIR)/source/crc.c \
# $(ISAC_SRC_DIR)/source/encode_lpc_swb.c \
# $(ISAC_SRC_DIR)/source/filter_functions.c \
# $(ISAC_SRC_DIR)/source/isac.c \
# $(ISAC_SRC_DIR)/source/lpc_analysis.c \
# $(ISAC_SRC_DIR)/source/lpc_gain_swb_tables.c \
# $(ISAC_SRC_DIR)/source/lpc_shape_swb12_tables.c \
# $(ISAC_SRC_DIR)/source/lpc_shape_swb16_tables.c \
# $(ISAC_SRC_DIR)/util/utility.c
#
else
# fixed point implementation
......@@ -105,12 +110,95 @@ AEC_BASE_SRCS = \
AEC_BASE_SRCS += $(AEC_SRC_DIR)/aecm_core_c.c
libmswebrtc_la_SOURCES= mswebrtc.c $(WEBRTC_COMMON_SRCS)
ILBC_BASE_SRCS = \
$(ILBC_SRC_DIR)/abs_quant.c \
$(ILBC_SRC_DIR)/abs_quant_loop.c \
$(ILBC_SRC_DIR)/augmented_cb_corr.c \
$(ILBC_SRC_DIR)/bw_expand.c \
$(ILBC_SRC_DIR)/cb_construct.c \
$(ILBC_SRC_DIR)/cb_mem_energy_augmentation.c \
$(ILBC_SRC_DIR)/cb_mem_energy.c \
$(ILBC_SRC_DIR)/cb_mem_energy_calc.c \
$(ILBC_SRC_DIR)/cb_search.c \
$(ILBC_SRC_DIR)/cb_search_core.c \
$(ILBC_SRC_DIR)/cb_update_best_index.c \
$(ILBC_SRC_DIR)/chebyshev.c \
$(ILBC_SRC_DIR)/comp_corr.c \
$(ILBC_SRC_DIR)/constants.c \
$(ILBC_SRC_DIR)/create_augmented_vec.c \
$(ILBC_SRC_DIR)/decode.c \
$(ILBC_SRC_DIR)/decode_residual.c \
$(ILBC_SRC_DIR)/decoder_interpolate_lsf.c \
$(ILBC_SRC_DIR)/do_plc.c \
$(ILBC_SRC_DIR)/encode.c \
$(ILBC_SRC_DIR)/energy_inverse.c \
$(ILBC_SRC_DIR)/enhancer.c \
$(ILBC_SRC_DIR)/enhancer_interface.c \
$(ILBC_SRC_DIR)/enh_upsample.c \
$(ILBC_SRC_DIR)/filtered_cb_vecs.c \
$(ILBC_SRC_DIR)/frame_classify.c \
$(ILBC_SRC_DIR)/gain_dequant.c \
$(ILBC_SRC_DIR)/gain_quant.c \
$(ILBC_SRC_DIR)/get_cd_vec.c \
$(ILBC_SRC_DIR)/get_lsp_poly.c \
$(ILBC_SRC_DIR)/get_sync_seq.c \
$(ILBC_SRC_DIR)/hp_input.c \
$(ILBC_SRC_DIR)/hp_output.c \
$(ILBC_SRC_DIR)/ilbc.c \
$(ILBC_SRC_DIR)/index_conv_dec.c \
$(ILBC_SRC_DIR)/index_conv_enc.c \
$(ILBC_SRC_DIR)/init_decode.c \
$(ILBC_SRC_DIR)/init_encode.c \
$(ILBC_SRC_DIR)/interpolate.c \
$(ILBC_SRC_DIR)/interpolate_samples.c \
$(ILBC_SRC_DIR)/lpc_encode.c \
$(ILBC_SRC_DIR)/lsf_check.c \
$(ILBC_SRC_DIR)/lsf_interpolate_to_poly_dec.c \
$(ILBC_SRC_DIR)/lsf_interpolate_to_poly_enc.c \
$(ILBC_SRC_DIR)/lsf_to_lsp.c \
$(ILBC_SRC_DIR)/lsf_to_poly.c \
$(ILBC_SRC_DIR)/lsp_to_lsf.c \
$(ILBC_SRC_DIR)/my_corr.c \
$(ILBC_SRC_DIR)/nearest_neighbor.c \
$(ILBC_SRC_DIR)/pack_bits.c \
$(ILBC_SRC_DIR)/poly_to_lsf.c \
$(ILBC_SRC_DIR)/poly_to_lsp.c \
$(ILBC_SRC_DIR)/refiner.c \
$(ILBC_SRC_DIR)/simple_interpolate_lsf.c \
$(ILBC_SRC_DIR)/simple_lpc_analysis.c \
$(ILBC_SRC_DIR)/simple_lsf_dequant.c \
$(ILBC_SRC_DIR)/simple_lsf_quant.c \
$(ILBC_SRC_DIR)/smooth.c \
$(ILBC_SRC_DIR)/smooth_out_data.c \
$(ILBC_SRC_DIR)/sort_sq.c \
$(ILBC_SRC_DIR)/split_vq.c \
$(ILBC_SRC_DIR)/state_construct.c \
$(ILBC_SRC_DIR)/state_search.c \
$(ILBC_SRC_DIR)/swap_bytes.c \
$(ILBC_SRC_DIR)/unpack_bits.c \
$(ILBC_SRC_DIR)/vq3.c \
$(ILBC_SRC_DIR)/vq4.c \
$(ILBC_SRC_DIR)/window32_w32.c \
$(ILBC_SRC_DIR)/xcorr_coef.c
libmswebrtc_la_SOURCES= mswebrtc.c $(top_srcdir)/$(WEBRTC_COMMON_SRCS)\
$(top_srcdir)/webrtc/webrtc/common_audio/signal_processing/include/signal_processing_library.h \
$(top_srcdir)/webrtc/webrtc/common_audio/signal_processing/include/spl_inl.h
if BUILD_ISAC
libmswebrtc_la_SOURCES+= $(ISAC_BASE_SRCS) isac_dec.c isac_enc.c
libmswebrtc_la_SOURCES+= $(top_srcdir)/$(ISAC_BASE_SRCS) isac_dec.c isac_enc.c \
$(top_srcdir)/isac_constants.h \
$(top_srcdir)/$(ISAC_SRC_DIR)/include/isacfix.h \
$(top_srcdir)/webrtc/webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h \
$(top_srcdir)/webrtc/webrtc/typedefs.h
#$(ISAC_SRC_DIR)/../bandwith_info.h
endif
if BUILD_AEC
libmswebrtc_la_SOURCES+= $(AEC_BASE_SRCS) aec.c
libmswebrtc_la_SOURCES+= $(top_srcdir)/$(AEC_BASE_SRCS) aec.c \
$(top_srcdir)/$(AEC_SRC_DIR)/include/echo_control_mobile.h
endif
if BUILD_ILBC
libmswebrtc_la_SOURCES+= ilbc.c $(top_srcdir)/$(ILBC_BASE_SRCS)\
$(top_srcdir)/$(ILBC_SRC_DIR)/include/ilbc.h
endif
......@@ -122,22 +210,27 @@ libmswebrtc_la_LDFLAGS=-module -no-undefined
webrtc_CFLAGS = \
-I$(webrtc_DIR) \
-I$(WEBRTC_COMMON_SP_DIR)/include
-I$(top_srcdir)/$(WEBRTC_COMMON_SP_DIR)/include
if BUILD_ISAC
webrtc_CFLAGS += \
-I$(ISAC_SRC_DIR)/source \
-I$(ISAC_SRC_DIR)/util \
-I$(ISAC_SRC_DIR)/interface \
-I$(ISAC_SRC_DIR)/include
-I$(top_srcdir)/$(ISAC_SRC_DIR)/source \
-I$(top_srcdir)/$(ISAC_SRC_DIR)/util \
-I$(top_srcdir)/$(ISAC_SRC_DIR)/interface \
-I$(top_srcdir)/$(ISAC_SRC_DIR)/include
endif
if BUILD_AEC
webrtc_CFLAGS += \
-I$(AEC_SRC_DIR)/include \
-I$(top_srcdir)/$(AEC_SRC_DIR)/include \
-I$(top_srcdir)/webrtc/common_audio/signal_processing/include \
-I$(top_srcdir)/webrtc/modules/audio_processing/utility \
-I$(top_srcdir)/webrtc/system_wrappers/interface
endif
if BUILD_ILBC
webrtc_CFLAGS += \
-I$(top_srcdir)/$(ILBC_SRC_DIR)/include
endif
webrtc_CFLAGS += -DWEBRTC_POSIX=1
AM_CFLAGS= \
......
mswebrtc-1.0.0 -- June xx, 2016
* iLBC codec
mswebrtc-1.0.0 -- August 17th, 2016
* Adding iLBC build support for autotools.
* iLBC codec.
* MSFactory - changing init to use MSFactory.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([mswebrtc],[1.0.0])
AC_INIT([mswebrtc],[1.1.0])
AC_PREREQ(2.63)
AC_CONFIG_AUX_DIR([build-aux])
......@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability])
AM_INIT_AUTOMAKE([tar-ustar --warnings=no-portability subdir-objects])
AC_CONFIG_HEADERS(config.h)
......@@ -99,10 +99,23 @@ if test x${build_aec} = xtrue; then
AC_DEFINE(BUILD_AEC, 1, [Defined AEC support is built])
fi
if test "${build_isac}${build_aec}" = "falsefalse"; then
AC_MSG_ERROR([You need to enable at least one feature of WebRTC.])
AC_ARG_ENABLE(ilbc,
[AS_HELP_STRING([--disable-ilbc], [Turn off WebRTC ILBC codec filter support (default=no)])],
[case "${enableval}" in
yes) build_ilbc=true ;;
no) build_ilbc=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-ilbc) ;;
esac],
[build_ilbc=true]
)
AM_CONDITIONAL(BUILD_ILBC, test x$build_ilbc = xtrue)
if test x${build_ilbc} = xtrue; then
AC_DEFINE(BUILD_ILBC, 1, [Defined ILBC support is built])
fi
if test "${build_isac}${build_aec}${build_ilbc}" = "falsefalsefalse"; then
AC_MSG_ERROR([You need to enable at least one feature of WebRTC.])
fi
AC_CONFIG_COMMANDS([libtool-hacking],[
if test "$mingw_found" = "yes" ; then
......@@ -126,3 +139,4 @@ AC_OUTPUT
echo "Summary of build options:"
printf "* %-30s %s\n" "iSAC" $build_isac
printf "* %-30s %s\n" "AEC" $build_aec
printf "* %-30s %s\n" "ILBC" $build_ilbc
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