Skip to content

GitLab

Commit 6c3e252d authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

ms2.cmake: remove DEFAULT_VALUE_ENABLE_XX for non free codecs - by default... 

ms2.cmake: remove DEFAULT_VALUE_ENABLE_XX for non free codecs - by default they are always turned off and user must explicitely activate both ENABLE_NON_FREE_CODECS and non free codecs to avoid any licence issue
parent 3c0a669d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 70 deletions
configs/config-bb10.cmake
View file @ 6c3e252d
......@@ -27,9 +27,6 @@ set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_SRTP ON)
set(DEFAULT_VALUE_ENABLE_DTLS 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)
set(DEFAULT_VALUE_ENABLE_ISAC OFF)
......@@ -38,11 +35,6 @@ set(DEFAULT_VALUE_ENABLE_SILK OFF)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
......
configs/config-desktop.cmake
View file @ 6c3e252d
......@@ -21,20 +21,13 @@
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_AMRNB ON)
set(DEFAULT_VALUE_ENABLE_AMRWB ON)
set(DEFAULT_VALUE_ENABLE_DTLS ON)
set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
set(DEFAULT_VALUE_ENABLE_G729 ON)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM ON)
set(DEFAULT_VALUE_ENABLE_H263 ON)
set(DEFAULT_VALUE_ENABLE_H263P ON)
set(DEFAULT_VALUE_ENABLE_ILBC ON)
set(DEFAULT_VALUE_ENABLE_ISAC ON)
set(DEFAULT_VALUE_ENABLE_MKV ON)
set(DEFAULT_VALUE_ENABLE_MPEG4 ON)
set(DEFAULT_VALUE_ENABLE_OPENH264 ON)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
if(WIN32 OR APPLE)
set(DEFAULT_VALUE_ENABLE_PACKAGING ON)
......@@ -50,7 +43,6 @@ set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
......@@ -162,11 +154,11 @@ if (ENABLE_PACKAGING)
CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DENABLE_ZRTP:BOOL=${ENABLE_ZRTP}
)
endif()
# Mediastreamer SDK packages
if(LINPHONE_BUILDER_TARGET STREQUAL ms2
OR LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins)
if(LINPHONE_BUILDER_TARGET STREQUAL ms2)
set(MS2_PACKAGE_DEPEND_TARGET TARGET_ms2)
else()
......
configs/config-flexisip.cmake
View file @ 6c3e252d
......@@ -33,20 +33,13 @@ set(DEFAULT_VALUE_ENABLE_PRESENCE OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
# ms2 default values
set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
set(DEFAULT_VALUE_ENABLE_DTLS OFF)
set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
set(DEFAULT_VALUE_ENABLE_G729 OFF)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES OFF)
set(DEFAULT_VALUE_ENABLE_GSM OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_ILBC OFF)
set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_MKV OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_OPUS OFF)
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
......@@ -58,7 +51,6 @@ set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
......
configs/config-ios.cmake
View file @ 6c3e252d
......@@ -21,20 +21,13 @@
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_AMRNB ON)
set(DEFAULT_VALUE_ENABLE_AMRWB ON)
set(DEFAULT_VALUE_ENABLE_DTLS ON)
set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
set(DEFAULT_VALUE_ENABLE_G729 ON)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM ON)
set(DEFAULT_VALUE_ENABLE_H263 ON)
set(DEFAULT_VALUE_ENABLE_H263P ON)
set(DEFAULT_VALUE_ENABLE_ILBC ON)
set(DEFAULT_VALUE_ENABLE_ISAC ON)
set(DEFAULT_VALUE_ENABLE_MKV OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 ON)
set(DEFAULT_VALUE_ENABLE_OPENH264 ON)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_SILK ON)
......@@ -46,7 +39,6 @@ set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI OFF)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
......
configs/config-python.cmake
View file @ 6c3e252d
......@@ -21,20 +21,13 @@
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
set(DEFAULT_VALUE_ENABLE_DTLS OFF)
set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
set(DEFAULT_VALUE_ENABLE_G729 OFF)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM ON)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_ILBC OFF)
set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_MKV ON)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
......@@ -46,7 +39,6 @@ set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
......
configs/config-webplugin.cmake
View file @ 6c3e252d
......@@ -21,20 +21,13 @@
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
set(DEFAULT_VALUE_ENABLE_DTLS OFF)
set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
set(DEFAULT_VALUE_ENABLE_G729 OFF)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_ILBC OFF)
set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_MKV OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
......@@ -46,7 +39,6 @@ set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
......
configs/config-windowsphone.cmake
View file @ 6c3e252d
......@@ -27,9 +27,6 @@ set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
set(DEFAULT_VALUE_ENABLE_SRTP ON)
set(DEFAULT_VALUE_ENABLE_DTLS 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)
set(DEFAULT_VALUE_ENABLE_ISAC OFF)
......@@ -38,12 +35,7 @@ set(DEFAULT_VALUE_ENABLE_SILK OFF)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
......
options/ms2.cmake
View file @ 6c3e252d
......@@ -38,10 +38,6 @@ function (ms2_add_option NAME DESCRIPTION DEFAULT_VALUE)
add_feature_info(${NAME} ENABLE_${UPPERCASE_NAME} ${DESCRIPTION})
endfunction()
#licence/patent fees options
if (NOT ENABLE_GPL_THIRD_PARTIES)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
endif()
ms2_add_option("GPL third parties" "Usage of GPL third-party code (FFmpeg and x264)." ${DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES})
ms2_add_option("Non free codecs" "Allow inclusion of non-free codecs in the build." OFF)
......@@ -53,12 +49,12 @@ ms2_add_option("DTLS" "DTLS media encryption support." ${DEFAULT_VALUE_ENABLE_DT
#audio options and codecs
ms2_add_option("WebRTC AEC" "WebRTC echo canceller support." ${DEFAULT_VALUE_ENABLE_WEBRTC_AEC})
ms2_add_option("WASAPI" "Windows Audio Session API (WASAPI) sound card support." ${DEFAULT_VALUE_ENABLE_WASAPI} "MSVC" OFF)
ms2_add_option("AMR-NB" "AMR narrow-band audio encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_AMRNB} "ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("AMR-WB" "AMR wide-band audio encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_AMRWB} "ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("AMR-NB" "AMR narrow-band audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("AMR-WB" "AMR wide-band audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
if(ENABLE_AMRNB OR ENABLE_AMRWB)
set(ENABLE_AMR ON CACHE BOOL "" FORCE)
endif()
ms2_add_option("G.729" "G.729 audio encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_G729} "ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("G.729" "G.729 audio encoding/decoding support (require license)." OFF "ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("GSM" "GSM audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_GSM})
ms2_add_option("iLBC" "iLBC audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_ILBC})
ms2_add_option("ISAC" "ISAC audio encoding/decoding support." ${DEFAULT_VALUE_ENABLE_ISAC})
......@@ -74,11 +70,11 @@ if (IOS)
set(FFMPEG_DEPENDENT_PRED "${FFMPEG_DEPENDENT_PRED};ENABLE_GPL_THIRD_PARTIES")
endif()
ms2_add_option("FFmpeg" "Some video processing features via FFmpeg: JPEG encoding/decoding, video scaling, H264 decoding..." ${DEFAULT_VALUE_ENABLE_FFMPEG} "${FFMPEG_DEPENDENT_PRED}" OFF)
ms2_add_option("H263" "H263 video encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_H263} "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("H263+" "H263+ video encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_H263P} "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("H263" "H263 video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("H263+" "H263+ video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("MKV" "MKV playing and recording support." ${DEFAULT_VALUE_ENABLE_MKV})
ms2_add_option("MPEG4" "MPEG4 video encoding/decoding support (require license)." ${DEFAULT_VALUE_ENABLE_MPEG4} "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("OpenH264" "H.264 video encoding/decoding support with the openh264 library (require license)." ${DEFAULT_VALUE_ENABLE_OPENH264} "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("MPEG4" "MPEG4 video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("OpenH264" "H.264 video encoding/decoding support with the openh264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("V4L" "V4L camera driver." ON "ENABLE_VIDEO; UNIX; NOT APPLE" OFF)
ms2_add_option("VPX" "VPX (VP8) video encoding/decoding support." ${DEFAULT_VALUE_ENABLE_VPX} "ENABLE_VIDEO" OFF)
ms2_add_option("X264" "H.264 video encoding support with the x264 library (require license)." ${DEFAULT_VALUE_ENABLE_X264} "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
ms2_add_option("X264" "H.264 video encoding support with the x264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_NON_FREE_CODECS" OFF)
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