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

ms2.cmake: ENABLE_NON_FREE_CODECS must change only default value for all...

ms2.cmake: ENABLE_NON_FREE_CODECS must change only default value for all codecs; it must be still overridable one by one using ENABLE_CODEC=YES for a specific codec

Revert "config-desktop.cmake: fix win32 build by declaring DEFAULT_VALUE_ENABLE_V4L to ON"

This reverts commit a66ab78b.
parent a66ab78b
......@@ -47,7 +47,6 @@ set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_V4L OFF)
# Global configuration
......@@ -91,7 +90,6 @@ list(APPEND EP_ms2_CMAKE_OPTIONS
"-DENABLE_GLX=NO"
"-DENABLE_X11=NO"
"-DENABLE_XV=NO"
"-DENABLE_V4L=NO"
"-DENABLE_MKV=NO"
"-DENABLE_QNX=YES"
)
......
......@@ -43,7 +43,6 @@ set(DEFAULT_VALUE_ENABLE_SRTP ON)
set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_V4L ON)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WASAPI ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
......@@ -155,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()
......
......@@ -26,6 +26,21 @@ option(ENABLE_GPL_THIRD_PARTIES "Enable GPL third-parties (FFmpeg)." ${DEFAULT_V
add_feature_info("GPL third parties" ENABLE_GPL_THIRD_PARTIES "Usage of GPL third-party code (FFmpeg and x264).")
option(ENABLE_NON_FREE_CODECS "Allow inclusion of non-free codecs in the build." YES)
# by default, non free codecs must be disabled BUT they can be enabled one by one
# using command line -DENABLE_CODEC=YES for instance
if (NOT ENABLE_NON_FREE_CODECS)
set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
set(DEFAULT_VALUE_ENABLE_AMRWB OFF)
set(DEFAULT_VALUE_ENABLE_G729 OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
if (NOT ENABLE_GPL_THIRD_PARTIES)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
endif()
endif()
option(ENABLE_SRTP "Enable SRTP support." ${DEFAULT_VALUE_ENABLE_SRTP})
add_feature_info("SRTP" ENABLE_SRTP "SRTP media encryption support.")
cmake_dependent_option(ENABLE_ZRTP "Enable ZRTP support." ${DEFAULT_VALUE_ENABLE_ZRTP} "ENABLE_SRTP" OFF)
......@@ -33,14 +48,14 @@ add_feature_info("ZRTP" ENABLE_ZRTP "ZRTP media encryption support.")
cmake_dependent_option(ENABLE_DTLS "Enable DTLS support." ${DEFAULT_VALUE_ENABLE_DTLS} "ENABLE_SRTP" OFF)
add_feature_info("DTLS" ENABLE_DTLS "DTLS media encryption support.")
cmake_dependent_option(ENABLE_AMRNB "Enable AMR narrow-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRNB} "ENABLE_NON_FREE_CODECS" OFF)
option(ENABLE_AMRNB "Enable AMR narrow-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRNB})
add_feature_info("AMR-NB" ENABLE_AMRNB "AMR narrow-band audio encoding/decoding support (require license).")
cmake_dependent_option(ENABLE_AMRWB "Enable AMR wide-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRWB} "ENABLE_NON_FREE_CODECS" OFF)
option(ENABLE_AMRWB "Enable AMR wide-band audio codec support." ${DEFAULT_VALUE_ENABLE_AMRWB})
add_feature_info("AMR-WB" ENABLE_AMRWB "AMR wide-band audio encoding/decoding support (require license).")
if(ENABLE_AMRNB OR ENABLE_AMRWB)
set(ENABLE_AMR ON CACHE BOOL "" FORCE)
endif()
cmake_dependent_option(ENABLE_G729 "Enable G.729 audio codec support." ${DEFAULT_VALUE_ENABLE_G729} "ENABLE_NON_FREE_CODECS" OFF)
option(ENABLE_G729 "Enable G.729 audio codec support." ${DEFAULT_VALUE_ENABLE_G729})
add_feature_info("G.729" ENABLE_G729 "G.729 audio encoding/decoding support (require license).")
option(ENABLE_GSM "Enable GSM audio codec support." ${DEFAULT_VALUE_ENABLE_GSM})
add_feature_info("GSM" ENABLE_GSM "GSM audio encoding/decoding support.")
......@@ -62,26 +77,26 @@ add_feature_info("WebRTC AEC" ENABLE_WEBRTC_AEC "WebRTC echo canceller support."
option(ENABLE_VIDEO "Enable video support." ${DEFAULT_VALUE_ENABLE_VIDEO})
add_feature_info("Video" ENABLE_VIDEO "Ability to capture and display video.")
# FFMpeg is LGPL which is an issue only for iOS applications
# FFMpeg is LGPL which is an issue only for iOS applications; otherwise it can be used in proprietary software as well
if (IOS)
cmake_dependent_option(ENABLE_FFMPEG "Enable ffmpeg support." ${DEFAULT_VALUE_ENABLE_FFMPEG} "ENABLE_VIDEO; ENABLE_GPL_THIRD_PARTIES" OFF)
else()
cmake_dependent_option(ENABLE_FFMPEG "Enable ffmpeg support." ${DEFAULT_VALUE_ENABLE_FFMPEG} "ENABLE_VIDEO" OFF)
endif()
add_feature_info("FFmpeg" ENABLE_FFMPEG "Some video processing features via FFmpeg: MPEG4 encoding/decoding, video scaling...")
cmake_dependent_option(ENABLE_H263 "Enable H263 video codec support." ${DEFAULT_VALUE_ENABLE_H263} "ENABLE_FFMPEG; ENABLE_NON_FREE_CODECS" OFF)
cmake_dependent_option(ENABLE_H263 "Enable H263 video codec support." ${DEFAULT_VALUE_ENABLE_H263} "ENABLE_FFMPEG" OFF)
add_feature_info("H263" ENABLE_H263 "H263 video encoding/decoding support (require license).")
cmake_dependent_option(ENABLE_H263P "Enable H263+ video codec support." ${DEFAULT_VALUE_ENABLE_H263P} "ENABLE_FFMPEG; ENABLE_NON_FREE_CODECS" OFF)
cmake_dependent_option(ENABLE_H263P "Enable H263+ video codec support." ${DEFAULT_VALUE_ENABLE_H263P} "ENABLE_FFMPEG" OFF)
add_feature_info("H263+" ENABLE_H263P "H263+ video encoding/decoding support (require license).")
cmake_dependent_option(ENABLE_MPEG4 "Enable MPEG4 video codec support." ${DEFAULT_VALUE_ENABLE_MPEG4} "ENABLE_FFMPEG; ENABLE_NON_FREE_CODECS" OFF)
cmake_dependent_option(ENABLE_MPEG4 "Enable MPEG4 video codec support." ${DEFAULT_VALUE_ENABLE_MPEG4} "ENABLE_FFMPEG" OFF)
add_feature_info("MPEG4" ENABLE_MPEG4 "MPEG4 video encoding/decoding support (require license).")
cmake_dependent_option(ENABLE_VPX "Enable VPX (VP8) video codec support." ${DEFAULT_VALUE_ENABLE_VPX} "ENABLE_VIDEO" OFF)
add_feature_info("VPX" ENABLE_VPX "VPX (VP8) video encoding/decoding support.")
cmake_dependent_option(ENABLE_X264 "Enable H.264 video encoder support with the x264 library." ${DEFAULT_VALUE_ENABLE_X264} "ENABLE_FFMPEG; ENABLE_GPL_THIRD_PARTIES; ENABLE_NON_FREE_CODECS; NOT ENABLE_OPENH264" OFF)
add_feature_info("x264" ENABLE_X264 "H.264 video encoding support with the x264 library (require license).")
cmake_dependent_option(ENABLE_OPENH264 "Enable H.264 video encoder support with the openh264 library." ${DEFAULT_VALUE_ENABLE_OPENH264} "ENABLE_VIDEO; ENABLE_NON_FREE_CODECS; NOT ENABLE_X264" OFF)
cmake_dependent_option(ENABLE_OPENH264 "Enable H.264 video encoder support with the openh264 library." ${DEFAULT_VALUE_ENABLE_OPENH264} "ENABLE_VIDEO; NOT ENABLE_X264" OFF)
add_feature_info("openh264" ENABLE_OPENH264 "H.264 video encoding support with the openh264 library (require license).")
cmake_dependent_option(ENABLE_V4L "Enable V4L camera driver." ${DEFAULT_VALUE_ENABLE_V4L} "ENABLE_VIDEO; UNIX; NOT APPLE" OFF)
cmake_dependent_option(ENABLE_X264 "Enable H.264 video encoder support with the x264 library." ${DEFAULT_VALUE_ENABLE_X264} "ENABLE_VIDEO; NOT ENABLE_OPENH264" OFF)
add_feature_info("x264" ENABLE_X264 "H.264 video encoding support with the x264 library (require license).")
cmake_dependent_option(ENABLE_V4L "Enable V4L camera driver." ON "ENABLE_VIDEO; UNIX; NOT APPLE" OFF)
add_feature_info("v4l" ENABLE_V4L "V4L camera driver.")
option(ENABLE_MKV "Enable MKV playing and recording support" ${DEFAULT_VALUE_ENABLE_MKV})
add_feature_info("MKV" ENABLE_MKV "MKV playing and recording support.")
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