Commit faf200fe authored by Ghislain MARY's avatar Ghislain MARY

Add option to enable build of non-mobile WebRTC echo canceller.

parent 18335381
...@@ -29,7 +29,7 @@ endif() ...@@ -29,7 +29,7 @@ endif()
if(ENABLE_CODEC2) if(ENABLE_CODEC2)
lcb_dependencies("mscodec2") lcb_dependencies("mscodec2")
endif() endif()
if(ENABLE_ISAC OR ENABLE_ILBC OR ENABLE_WEBRTC_AEC) if(ENABLE_ISAC OR ENABLE_ILBC OR ENABLE_WEBRTC_AEC OR ENABLE_WEBRTC_AECM)
lcb_dependencies("mswebrtc") lcb_dependencies("mswebrtc")
endif() endif()
if(ENABLE_SILK) if(ENABLE_SILK)
......
...@@ -32,5 +32,6 @@ lcb_dependencies("ms2") ...@@ -32,5 +32,6 @@ lcb_dependencies("ms2")
lcb_cmake_options( lcb_cmake_options(
"-DENABLE_ISAC=${ENABLE_ISAC}" "-DENABLE_ISAC=${ENABLE_ISAC}"
"-DENABLE_ILBC=${ENABLE_ILBC}" "-DENABLE_ILBC=${ENABLE_ILBC}"
"-DENABLE_AECM=${ENABLE_WEBRTC_AEC}" "-DENABLE_AEC=${ENABLE_WEBRTC_AEC}"
"-DENABLE_AECM=${ENABLE_WEBRTC_AECM}"
) )
...@@ -43,7 +43,7 @@ set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON) ...@@ -43,7 +43,7 @@ set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_ENABLE_VCARD ON) set(DEFAULT_VALUE_ENABLE_VCARD ON)
set(DEFAULT_VALUE_ENABLE_VIDEO ON) set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON) set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON) set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON)
set(DEFAULT_VALUE_ENABLE_ZRTP ON) set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_LIME ON) set(DEFAULT_VALUE_ENABLE_LIME ON)
set(DEFAULT_VALUE_ENABLE_TOOLS OFF) set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
......
############################################################################ ############################################################################
# config-windowsphone.cmake # config-win10.cmake
# Copyright (C) 2015 Belledonne Communications, Grenoble France # Copyright (C) 2015 Belledonne Communications, Grenoble France
# #
############################################################################ ############################################################################
...@@ -38,6 +38,7 @@ set(DEFAULT_VALUE_ENABLE_VCARD ON) ...@@ -38,6 +38,7 @@ set(DEFAULT_VALUE_ENABLE_VCARD ON)
set(DEFAULT_VALUE_ENABLE_VIDEO ON) set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON) set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON) set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON)
set(DEFAULT_VALUE_ENABLE_ZRTP ON) set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_LIME ON) set(DEFAULT_VALUE_ENABLE_LIME ON)
set(DEFAULT_VALUE_ENABLE_TOOLS OFF) set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
......
...@@ -29,7 +29,7 @@ set(DEFAULT_VALUE_ENABLE_G729 ${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES}) ...@@ -29,7 +29,7 @@ set(DEFAULT_VALUE_ENABLE_G729 ${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES})
set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF) set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
set(DEFAULT_VALUE_ENABLE_POLARSSL ON) set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
set(DEFAULT_VALUE_ENABLE_SPEEX ON) set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON) set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON)
set(DEFAULT_VALUE_ENABLE_TOOLS OFF) set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO") set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
......
...@@ -31,6 +31,7 @@ lcb_add_dependent_option("ZRTP" "ZRTP media encryption support." "${DEFAULT_VALU ...@@ -31,6 +31,7 @@ lcb_add_dependent_option("ZRTP" "ZRTP media encryption support." "${DEFAULT_VALU
#audio options and codecs #audio options and codecs
lcb_add_option("WebRTC AEC" "WebRTC echo canceller support." "${DEFAULT_VALUE_ENABLE_WEBRTC_AEC}") lcb_add_option("WebRTC AEC" "WebRTC echo canceller support." "${DEFAULT_VALUE_ENABLE_WEBRTC_AEC}")
lcb_add_option("WebRTC AECM" "WebRTC echo canceller for mobile support." "${DEFAULT_VALUE_ENABLE_WEBRTC_AECM}")
lcb_add_strict_dependent_option("AMRNB" "AMR narrow-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).") lcb_add_strict_dependent_option("AMRNB" "AMR narrow-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
lcb_add_strict_dependent_option("AMRWB" "AMR wide-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).") lcb_add_strict_dependent_option("AMRWB" "AMR wide-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
lcb_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}") lcb_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}")
......
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