zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set WEBRTC_USE_H264 in common_config

Browse Source 
Bug: none
Change-Id: I3dce8fdc409c88cdd771ea57eca3ea375e6e82c9
Reviewed-on: https://webrtc-review.googlesource.com/c/121948
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26603}
This commit is contained in:
Johannes Kron
2019-02-08 10:13:25 +01:00
committed by Commit Bot
parent 3f171df263
commit b76b9ba8ce
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -242,6 +242,10 @@ config("common_config") {
defines += [ "ENABLE_EXTERNAL_AUTH" ] defines += [ "ENABLE_EXTERNAL_AUTH" ]
} }
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
}
if (build_with_chromium) { if (build_with_chromium) {
defines += [ defines += [
# NOTICE: Since common_inherited_config is used in public_configs for our # NOTICE: Since common_inherited_config is used in public_configs for our

8
media/BUILD.gn
View File

@ -481,10 +481,6 @@ if (rtc_include_tests) {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
} }
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
}
deps += [ deps += [
":rtc_internal_video_codecs", ":rtc_internal_video_codecs",
":rtc_media", ":rtc_media",
@ -587,10 +583,6 @@ if (rtc_include_tests) {
sources += [ "sctp/sctp_transport_unittest.cc" ] sources += [ "sctp/sctp_transport_unittest.cc" ]
} }
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
}
if (rtc_opus_support_120ms_ptime) { if (rtc_opus_support_120ms_ptime) {
defines += [ "WEBRTC_OPUS_SUPPORT_120MS_PTIME=1" ] defines += [ "WEBRTC_OPUS_SUPPORT_120MS_PTIME=1" ]
} else { } else {

4
modules/video_coding/BUILD.gn
View File

@ -336,7 +336,6 @@ rtc_static_library("webrtc_h264") {
if (rtc_use_h264) { if (rtc_use_h264) {
assert(!(is_win && !is_clang), "See: bugs.webrtc.org/9213#c13.") assert(!(is_win && !is_clang), "See: bugs.webrtc.org/9213#c13.")
defines += [ "WEBRTC_USE_H264" ]
sources += [ sources += [
"codecs/h264/h264_color_space.cc", "codecs/h264/h264_color_space.cc",
"codecs/h264/h264_color_space.h", "codecs/h264/h264_color_space.h",
@ -761,9 +760,6 @@ if (rtc_include_tests) {
rtc_source_set("video_coding_modules_tests") { rtc_source_set("video_coding_modules_tests") {
testonly = true testonly = true
defines = [] defines = []
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
}
sources = [ sources = [
"codecs/h264/test/h264_impl_unittest.cc", "codecs/h264/test/h264_impl_unittest.cc",

6
video/BUILD.gn
View File

@ -322,9 +322,6 @@ if (rtc_include_tests) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
} }
if (rtc_use_h264) {
defines = [ "WEBRTC_USE_H264" ]
}
} }
rtc_executable("video_loopback") { rtc_executable("video_loopback") {
@ -584,9 +581,6 @@ if (rtc_include_tests) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
} }
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
}
if (!build_with_mozilla) { if (!build_with_mozilla) {
deps += [ "../media:rtc_media_base" ] deps += [ "../media:rtc_media_base" ]
} }