Commit a15eea5b authored by jehan's avatar jehan

prepare work to support G729B_CNG

parent b6016487
...@@ -106,6 +106,11 @@ endif() ...@@ -106,6 +106,11 @@ endif()
if(ENABLE_V4L AND LINPHONE_BUILDER_BUILD_DEPENDENCIES) if(ENABLE_V4L AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_ms2_DEPENDENCIES EP_v4l) list(APPEND EP_ms2_DEPENDENCIES EP_v4l)
endif() endif()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_G729B_CNG=${ENABLE_G729B_CNG}")
if(ENABLE_G729B_CNG AND LINPHONE_BUILDER_BUILD_DEPENDENCIES )
list(APPEND EP_bcg729_CMAKE_OPTIONS "-DENABLE_MSPLUGIN=NO")
list(APPEND EP_ms2_DEPENDENCIES EP_bcg729)
endif()
set(EP_ms2_SPEC_FILE "mediastreamer2.spec") set(EP_ms2_SPEC_FILE "mediastreamer2.spec")
set(EP_ms2_RPMBUILD_NAME "mediastreamer") set(EP_ms2_RPMBUILD_NAME "mediastreamer")
...@@ -68,6 +68,7 @@ if(ENABLE_AMRNB OR ENABLE_AMRWB) ...@@ -68,6 +68,7 @@ if(ENABLE_AMRNB OR ENABLE_AMRWB)
endif() endif()
ms2_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}") ms2_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}")
ms2_add_strict_dependent_option("G729" "G.729 audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).") ms2_add_strict_dependent_option("G729" "G.729 audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
ms2_add_strict_dependent_option("G729B_CNG" "G.729 annex B confort noise generation (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
ms2_add_option("GSM" "GSM audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_GSM}") 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("iLBC" "iLBC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ILBC}")
ms2_add_option("ISAC" "ISAC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ISAC}") ms2_add_option("ISAC" "ISAC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ISAC}")
......
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