Add H263, H263P and MPEG4 options.

builders/ffmpeg.cmake

@@ -41,6 +41,21 @@ set(EP_ffmpeg_CONFIGURE_OPTIONS
 	"--disable-vaapi"
 	"--disable-vdpau"
 )
+if(${ENABLE_H263})
+	list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
+		"--enable-decoder=h263"
+		"--enable-encoder=h263"
+	)
+endif(${ENABLE_H263})
+if(${ENABLE_H263P})
+	list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--enable-encoder=h263p")
+endif(${ENABLE_H263P})
+if(${ENABLE_MPEG4})
+	list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
+		"--enable-decoder=mpeg4"
+		"--enable-encoder=mpeg4"
+	)
+endif(${ENABLE_MPEG4})
 set(EP_ffmpeg_LINKING_TYPE "--disable-static" "--enable-shared")
 set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch")
 set(EP_ffmpeg_ARCH "i386")

cmake/LinphoneBuilderOptions.cmake

@@ -60,6 +60,12 @@ linphone_builder_add_feature_info("Speex" ENABLE_SPEEX "Speex audio encoding/dec
 
 cmake_dependent_option(ENABLE_FFMPEG "Enable ffmpeg support." ${DEFAULT_VALUE_ENABLE_FFMPEG} "ENABLE_VIDEO;ENABLE_GPL_THIRD_PARTIES" OFF)
 linphone_builder_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" OFF)
+linphone_builder_add_feature_info("H263" ENABLE_H263 "H263 video encoding/decoding support.")
+cmake_dependent_option(ENABLE_H263P "Enable H263+ video codec support." ${DEFAULT_VALUE_ENABLE_H263P} "ENABLE_FFMPEG" OFF)
+linphone_builder_add_feature_info("H263+" ENABLE_H263P "H263+ video encoding/decoding support.")
+cmake_dependent_option(ENABLE_MPEG4 "Enable MPEG4 video codec support." ${DEFAULT_VALUE_ENABLE_MPEG4} "ENABLE_FFMPEG" OFF)
+linphone_builder_add_feature_info("MPEG4" ENABLE_MPEG4 "MPEG4 video encoding/decoding support.")
 cmake_dependent_option(ENABLE_VPX "Enable VPX video codec support." ${DEFAULT_VALUE_ENABLE_VPX} "ENABLE_VIDEO" OFF)
 linphone_builder_add_feature_info("VPX" ENABLE_VPX "VPX 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" OFF)

configs/config-bb10.cmake

@@ -34,6 +34,9 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_H263 OFF)
+set(DEFAULT_VALUE_ENABLE_H263P OFF)
+set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
 set(DEFAULT_VALUE_ENABLE_VPX OFF)
 set(DEFAULT_VALUE_ENABLE_X264 OFF)
 set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)

configs/config-desktop.cmake

@@ -34,6 +34,9 @@ set(DEFAULT_VALUE_ENABLE_ISAC ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_H263 ON)
+set(DEFAULT_VALUE_ENABLE_H263P ON)
+set(DEFAULT_VALUE_ENABLE_MPEG4 ON)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
 set(DEFAULT_VALUE_ENABLE_X264 ON)
 set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)

configs/config-ios.cmake

@@ -34,6 +34,9 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_H263 OFF)
+set(DEFAULT_VALUE_ENABLE_H263P OFF)
+set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
 set(DEFAULT_VALUE_ENABLE_VPX OFF)
 set(DEFAULT_VALUE_ENABLE_X264 OFF)
 set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)

configs/config-webplugin.cmake

@@ -34,6 +34,9 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK OFF)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_H263 OFF)
+set(DEFAULT_VALUE_ENABLE_H263P OFF)
+set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
 set(DEFAULT_VALUE_ENABLE_VPX ON)
 set(DEFAULT_VALUE_ENABLE_X264 OFF)
 set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)