Title: [211009] trunk
- Revision
- 211009
- Author
- [email protected]
- Date
- 2017-01-20 18:36:03 -0800 (Fri, 20 Jan 2017)
Log Message
[WebRTC] Update build system to make G711 optional in libwebrtc
https://bugs.webkit.org/show_bug.cgi?id=167256
Patch by Youenn Fablet <[email protected]> on 2017-01-20
Reviewed by Alex Christensen.
Source/ThirdParty/libwebrtc:
* CMakeLists.txt: Updating to add compilation of generic pcm encoder functions.
Tools:
* Scripts/webkitpy/libwebrtc/generate_cmake.py:
(CMakeGenerator.remove_webrtc_g711): Adding a missing file to the build system as this file includes generic pcm encoder functions.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt (211008 => 211009)
--- trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2017-01-21 02:31:33 UTC (rev 211008)
+++ trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2017-01-21 02:36:03 UTC (rev 211009)
@@ -1308,7 +1308,8 @@
# Start of target WebrtcModulesAudio_CodingPcm16B
set(WebrtcModulesAudio_CodingPcm16B_SOURCES ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc
${LIBWEBRTC_INPUT_DIR}/webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc
- ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c)
+ ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
+ ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc)
add_library(WebrtcModulesAudio_CodingPcm16B STATIC ${WebrtcModulesAudio_CodingPcm16B_SOURCES})
target_compile_options(WebrtcModulesAudio_CodingPcm16B PRIVATE "-fno-strict-aliasing" "-fstack-protector-strong" "-fcolor-diagnostics" "-arch" "x86_64" "-gdwarf-2" "-mmacosx-version-min=10.9" "-Wall" "-Werror" "-Wextra" "-Wpartial-availability" "-Wno-missing-field-initializers" "-Wno-unused-parameter" "-Wno-c++11-narrowing" "-Wno-covered-switch-default" "-Wno-deprecated-register" "-Wno-unneeded-internal-declaration" "-Wno-inconsistent-missing-override" "-Wno-shift-negative-value" "-O0" "-fvisibility=hidden" "-Wheader-hygiene" "-Wstring-conversion" "-Wno-strict-overflow" "-Wimplicit-fallthrough" "-Wthread-safety" "-Winconsistent-missing-override" "-Wundef" "-std=c99"
"-fno-threadsafe-statics" "-fvisibility-inlines-hidden" "-Wno-undefined-bool-conversion" "-Wno-tautological-undefined-compare" "-stdlib=libc++" "-fno-rtti" "-fno-exceptions" "-Wnon-virtual-dtor" "-Woverloaded-virtual" "-Wobjc-missing-property-synthesis" "-fobjc-call-cxx-cdtors")
target_compile_definitions(WebrtcModulesAudio_CodingPcm16B PRIVATE V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE EXPAT_RELATIVE_PATH RTC_DISABLE_VP9 WEBRTC_POSIX WEBRTC_MAC)
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (211008 => 211009)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-21 02:31:33 UTC (rev 211008)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-01-21 02:36:03 UTC (rev 211009)
@@ -1,5 +1,14 @@
2017-01-20 Youenn Fablet <[email protected]>
+ [WebRTC] Update build system to make G711 optional in libwebrtc
+ https://bugs.webkit.org/show_bug.cgi?id=167256
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Updating to add compilation of generic pcm encoder functions.
+
+2017-01-20 Youenn Fablet <[email protected]>
+
[WebRTC] Update libwertc AudioRtpSender::SetAudioSend
https://bugs.webkit.org/show_bug.cgi?id=167243
Modified: trunk/Tools/ChangeLog (211008 => 211009)
--- trunk/Tools/ChangeLog 2017-01-21 02:31:33 UTC (rev 211008)
+++ trunk/Tools/ChangeLog 2017-01-21 02:36:03 UTC (rev 211009)
@@ -1,3 +1,13 @@
+2017-01-20 Youenn Fablet <[email protected]>
+
+ [WebRTC] Update build system to make G711 optional in libwebrtc
+ https://bugs.webkit.org/show_bug.cgi?id=167256
+
+ Reviewed by Alex Christensen.
+
+ * Scripts/webkitpy/libwebrtc/generate_cmake.py:
+ (CMakeGenerator.remove_webrtc_g711): Adding a missing file to the build system as this file includes generic pcm encoder functions.
+
2017-01-20 Joseph Pecoraro <[email protected]>
Cleanup RuntimeEnabledFeatures
Modified: trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py (211008 => 211009)
--- trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py 2017-01-21 02:31:33 UTC (rev 211008)
+++ trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py 2017-01-21 02:36:03 UTC (rev 211009)
@@ -174,6 +174,8 @@
self._remove_target("//webrtc/modules/audio_coding:audio_decoder_unittests")
self._remove_target("//webrtc/modules/audio_coding:g711")
+ self.targets["//webrtc/modules/audio_coding:pcm16b"]["sources"].append("//webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc")
+ self.targets["//webrtc/modules/audio_coding:pcm16b"]["source_outputs"]["//webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc"] = "obj/webrtc/modules/audio_coding/g711/audio_encoder_pcm.o"
for name, target in self.targets.iteritems():
if "include_dirs" in target:
include_dirs = target["include_dirs"]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
