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

Revert "Fix circular dependencies between optional, array_view, and rtc_base."

Browse Source 
This reverts commit a9e0924fa7688c4e4558e179c6608ce1093e15f8.

Reason for revert: Breaks because of RTC_LAST_SYSTEM_ERROR

Original change's description:
> Fix circular dependencies between optional, array_view, and rtc_base.
> 
> This splits things out of rtc_base and makes dependencies explicit.
> 
> Bug: webrtc:6828
> Change-Id: Ib813c7bd9e4de7ab015acb917bc09ee7204ba7bd
> Reviewed-on: https://webrtc-review.googlesource.com/31940
> Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21245}

TBR=phoglund@webrtc.org,kwiberg@webrtc.org

Change-Id: I1a5dcf2223f00ae7c46f9f2a12b990ab3a84397d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:6828
Reviewed-on: https://webrtc-review.googlesource.com/32760
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21251}
This commit is contained in:
Patrik Höglund
2017-12-13 14:56:20 +00:00
committed by Commit Bot
parent 1de4b62955
commit d37709b659
55 changed files with 145 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/BUILD.gn
View File

@ -87,7 +87,6 @@ rtc_static_library("libjingle_peerconnection_api") {
":optional",
":rtc_stats_api",
":video_frame_api",
"../rtc_base:checks",
"audio_codecs:audio_codecs_api",
# Basically, don't add stuff here. You might break sensitive downstream
@ -186,7 +185,6 @@ rtc_source_set("rtc_stats_api") {
]
deps = [
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}
@ -222,7 +220,6 @@ rtc_source_set("video_frame_api") {
]
deps = [
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}
@ -235,7 +232,6 @@ rtc_source_set("video_frame_api_i420") {
deps = [
":video_frame_api",
"$rtc_libyuv_dir",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]
@ -246,8 +242,7 @@ rtc_source_set("array_view") {
"array_view.h",
]
deps = [
"../rtc_base:checks",
"../rtc_base:type_traits",
"../rtc_base:rtc_base_approved",
]
}
@ -258,8 +253,7 @@ rtc_source_set("optional") {
]
deps = [
":array_view",
"../rtc_base:checks",
"../rtc_base:sanitizer",
"../rtc_base:rtc_base_approved",
]
}
@ -331,7 +325,6 @@ if (rtc_include_tests) {
":libjingle_peerconnection_api",
"../api:peerconnection_and_implicit_call_api",
"../media:rtc_media_base",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
if (!build_with_chromium && is_clang) {
@ -363,7 +356,6 @@ if (rtc_include_tests) {
":libjingle_peerconnection_test_api",
":optional",
":ortc_api",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../test:test_support",

2
api/audio_codecs/BUILD.gn
View File

@ -29,9 +29,7 @@ rtc_source_set("audio_codecs_api") {
"..:array_view",
"..:optional",
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
]
}

1
api/video_codecs/BUILD.gn
View File

@ -27,7 +27,6 @@ rtc_source_set("video_codecs_api") {
"..:video_frame_api",
"../..:webrtc_common",
"../../common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}

2
audio/BUILD.gn
View File

@ -54,7 +54,6 @@ rtc_static_library("audio") {
"../modules/pacing:pacing",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
"../modules/rtp_rtcp",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
@ -114,7 +113,6 @@ if (rtc_include_tests) {
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_task_queue",
"../rtc_base:safe_compare",
"../system_wrappers:system_wrappers",
"../test:audio_codec_mocks",
"../test:rtp_test_utils",

2
audio/utility/BUILD.gn
View File

@ -23,7 +23,6 @@ rtc_static_library("audio_frame_operations") {
"../..:webrtc_common",
"../../modules:module_api",
"../../modules/audio_coding:audio_format_conversion",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -37,7 +36,6 @@ if (rtc_include_tests) {
deps = [
":audio_frame_operations",
"../../modules:module_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
"//testing/gtest",

5
call/BUILD.gn
View File

@ -73,7 +73,6 @@ rtc_source_set("rtp_receiver") {
"../api:optional",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}
@ -99,7 +98,6 @@ rtc_source_set("bitrate_allocator") {
]
deps = [
"../modules/bitrate_controller",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:sequenced_task_checker",
"../system_wrappers",
@ -144,7 +142,6 @@ rtc_static_library("call") {
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"../rtc_base:sequenced_task_checker",
@ -219,7 +216,6 @@ if (rtc_include_tests) {
"../modules/rtp_rtcp:mock_rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility:mock_process_thread",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../test:audio_codec_mocks",
@ -253,7 +249,6 @@ if (rtc_include_tests) {
"../modules/audio_coding",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/rtp_rtcp",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../system_wrappers:metrics_default",

8
common_audio/BUILD.gn
View File

@ -63,7 +63,6 @@ rtc_static_library("common_audio") {
":sinc_resampler",
"..:webrtc_common",
"../api:optional",
"../rtc_base:checks",
"../rtc_base:gtest_prod",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
@ -223,10 +222,8 @@ rtc_source_set("common_audio_c") {
":common_audio_c_arm_asm",
":common_audio_cc",
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:compile_assert_c",
"../rtc_base:rtc_base_approved",
"../rtc_base:sanitizer",
"../system_wrappers",
"../system_wrappers:cpu_features_api",
]
@ -275,7 +272,6 @@ rtc_source_set("fir_filter_factory") {
]
deps = [
":fir_filter",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers:cpu_features_api",
]
@ -306,7 +302,6 @@ if (current_cpu == "x86" || current_cpu == "x64") {
deps = [
":fir_filter",
":sinc_resampler",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]
@ -346,7 +341,6 @@ if (rtc_build_with_neon) {
deps = [
":fir_filter",
":sinc_resampler",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]
@ -386,7 +380,6 @@ if (rtc_build_with_neon) {
}
deps = [
":common_audio_c",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}
@ -447,7 +440,6 @@ if (rtc_include_tests) {
":fir_filter_factory",
":sinc_resampler",
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:cpu_features_api",

6
examples/BUILD.gn
View File

@ -112,9 +112,7 @@ if (is_android) {
apk_name = "AppRTCMobileTest"
android_manifest = "androidtests/AndroidManifest.xml"
java_files = [
"androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java",
]
java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ]
apk_under_test = ":AppRTCMobile"
@ -502,7 +500,6 @@ if (is_linux || is_win) {
}
deps = [
"../api:video_frame_api_i420",
"../rtc_base:checks",
]
if (is_win) {
sources += [
@ -718,7 +715,6 @@ if (!build_with_chromium) {
deps = [
"../p2p:libstunprober",
"../p2p:rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",

8
logging/BUILD.gn
View File

@ -78,9 +78,7 @@ rtc_source_set("rtc_event_log_api") {
"../modules/audio_coding:audio_network_adaptor_config",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]
# TODO(eladalon): Remove this.
@ -108,7 +106,6 @@ rtc_static_library("rtc_event_log_impl") {
"../modules/audio_coding:audio_network_adaptor",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
@ -151,7 +148,6 @@ if (rtc_enable_protobuf) {
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
@ -189,7 +185,6 @@ if (rtc_enable_protobuf) {
"../modules/audio_coding:audio_network_adaptor",
"../modules/remote_bitrate_estimator:remote_bitrate_estimator",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers:metrics_default",
@ -213,7 +208,6 @@ if (rtc_enable_protobuf) {
":rtc_event_log_parser",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
"../system_wrappers:field_trial_default",
@ -239,7 +233,6 @@ if (rtc_enable_protobuf) {
"../:webrtc_common",
"../call:video_stream_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:protobuf_utils",
"../rtc_base:rtc_base_approved",
@ -264,7 +257,6 @@ if (rtc_enable_protobuf) {
":rtc_event_log_api",
":rtc_event_log_impl",
":rtc_event_log_proto",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
if (!build_with_chromium && is_clang) {

8
media/BUILD.gn
View File

@ -54,10 +54,7 @@ rtc_source_set("rtc_h264_profile_id") {
rtc_static_library("rtc_media_base") {
defines = []
libs = []
deps = [
"../rtc_base:checks",
"../rtc_base:sanitizer",
]
deps = []
public_deps = []
sources = [
"base/adaptedvideotracksource.cc",
@ -133,7 +130,6 @@ rtc_static_library("rtc_audio_video") {
"../api:video_frame_api_i420",
"../call:call_interfaces",
"../modules/video_coding:video_coding_utility",
"../rtc_base:checks",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
]
@ -347,7 +343,6 @@ if (rtc_include_tests) {
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/video_coding:video_coding_utility",
"../p2p:rtc_p2p",
"../rtc_base:checks",
]
sources = [
"base/fakemediaengine.h",
@ -439,7 +434,6 @@ if (rtc_include_tests) {
"../api:video_frame_api_i420",
"../pc:rtc_pc",
"../pc:rtc_pc_base",
"../rtc_base:checks",
"../test:field_trial",
]
sources = [

35
modules/audio_coding/BUILD.gn
View File

@ -50,9 +50,7 @@ rtc_static_library("audio_format_conversion") {
"../../api:array_view",
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
]
}
@ -65,7 +63,6 @@ rtc_static_library("rent_a_codec") {
"acm2/rent_a_codec.h",
]
deps = [
"../../rtc_base:checks",
"../../api:array_view",
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
@ -132,7 +129,6 @@ rtc_static_library("audio_coding") {
}
deps = audio_coding_deps + [
"../../rtc_base:checks",
"../../system_wrappers:metrics_api",
"..:module_api",
"../../api:array_view",
@ -200,7 +196,6 @@ rtc_static_library("red") {
deps = [
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -224,7 +219,6 @@ rtc_static_library("g711") {
":legacy_encoded_audio_frame",
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
public_deps = [
@ -264,7 +258,6 @@ rtc_static_library("g722") {
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs/g722:audio_encoder_g722_config",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
public_deps = [
@ -306,7 +299,6 @@ rtc_static_library("ilbc") {
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs/ilbc:audio_encoder_ilbc_config",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
public_deps = [
@ -463,9 +455,7 @@ rtc_source_set("ilbc_c") {
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
]
}
@ -479,7 +469,6 @@ rtc_static_library("isac_common") {
deps = [
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -570,7 +559,6 @@ rtc_static_library("isac_c") {
":isac_common",
"../..:webrtc_common",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:compile_assert_c",
"../../rtc_base:rtc_base_approved",
]
@ -677,10 +665,8 @@ rtc_source_set("isac_fix_c") {
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:compile_assert_c",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
"../../system_wrappers:cpu_features_api",
]
@ -755,7 +741,6 @@ if (rtc_build_with_neon) {
deps = [
":isac_fix_common",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -781,7 +766,6 @@ rtc_static_library("pcm16b") {
":legacy_encoded_audio_frame",
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
public_deps = [
@ -818,7 +802,6 @@ rtc_static_library("webrtc_opus") {
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs/opus:audio_encoder_opus_config",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../system_wrappers:field_trial_api",
@ -856,7 +839,6 @@ rtc_source_set("webrtc_opus_c") {
deps = [
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -930,7 +912,6 @@ rtc_static_library("audio_network_adaptor") {
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
@ -1045,10 +1026,8 @@ rtc_static_library("neteq") {
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
]
@ -1087,7 +1066,6 @@ rtc_source_set("neteq_tools_minimal") {
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
]
@ -1123,7 +1101,6 @@ rtc_source_set("neteq_test_tools") {
"../..:webrtc_common",
"../../api:array_view",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../test:rtp_test_utils",
@ -1172,7 +1149,6 @@ rtc_source_set("neteq_tools") {
"../../api:array_view",
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
@ -1196,7 +1172,6 @@ rtc_source_set("neteq_input_audio_tools") {
deps = [
"../..:webrtc_common",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -1218,7 +1193,6 @@ if (rtc_enable_protobuf) {
deps = [
":neteq_tools_minimal",
"../../logging:rtc_event_log_parser",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format",
@ -1384,7 +1358,6 @@ if (rtc_include_tests) {
defines = audio_coding_defines
deps = audio_coding_deps + [
"../../rtc_base:checks",
":audio_coding",
":neteq_tools",
"../../api/audio_codecs:audio_codecs_api",
@ -1519,7 +1492,6 @@ if (rtc_include_tests) {
defines = []
deps = [
"..:module_api",
"../../rtc_base:checks",
]
sources = [
"neteq/tools/neteq_rtpplay.cc",
@ -1628,7 +1600,6 @@ if (rtc_include_tests) {
"../..:webrtc_common",
"../../api/audio_codecs:audio_codecs_api",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../test:test_support",
@ -1654,7 +1625,6 @@ if (rtc_include_tests) {
"..:module_api",
"../..:webrtc_common",
"../../api/audio_codecs:builtin_audio_decoder_factory",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
"//testing/gtest",
@ -1709,7 +1679,6 @@ if (rtc_include_tests) {
]
deps = [
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:rtp_test_utils",
@ -1787,7 +1756,6 @@ if (rtc_include_tests) {
":neteq_quality_test_support",
":neteq_tools",
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:test_main",
@ -1823,7 +1791,6 @@ if (rtc_include_tests) {
":g711",
":neteq",
":neteq_quality_test_support",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_main",
"//testing/gtest",
@ -2106,12 +2073,10 @@ if (rtc_include_tests) {
"../../common_audio",
"../../common_audio:mock_common_audio",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:sanitizer",
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",
"../../test:audio_codec_mocks",

3
modules/audio_device/BUILD.gn
View File

@ -76,7 +76,6 @@ if (rtc_include_internal_audio_device && is_ios) {
deps = [
":audio_device_generic",
"../../api:array_view",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base",
"../../sdk:audio_objc",
@ -102,7 +101,6 @@ rtc_source_set("audio_device_generic") {
"../..:webrtc_common",
"../../api:array_view",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers",
@ -331,7 +329,6 @@ if (rtc_include_tests) {
":mock_audio_device",
"../../api:array_view",
"../../api:optional",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../test:test_support",

3
modules/audio_mixer/BUILD.gn
View File

@ -39,7 +39,6 @@ rtc_static_library("audio_mixer_impl") {
"../../api:array_view",
"../../api:audio_mixer_api",
"../../audio/utility:audio_frame_operations",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../audio_processing",
@ -60,7 +59,6 @@ rtc_static_library("audio_frame_manipulator") {
deps = [
"..:module_api",
"../../audio/utility:audio_frame_operations",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -85,7 +83,6 @@ if (rtc_include_tests) {
"../../api:array_view",
"../../api:audio_mixer_api",
"../../audio/utility:audio_frame_operations",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../test:test_support",

10
modules/audio_processing/BUILD.gn
View File

@ -229,10 +229,8 @@ rtc_static_library("audio_processing") {
"../../api:array_view",
"../../api:optional",
"../../audio/utility:audio_frame_operations",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:protobuf_utils",
"../../rtc_base:sanitizer",
"../../system_wrappers:cpu_features_api",
"../../system_wrappers:metrics_api",
"../audio_coding:isac",
@ -342,7 +340,6 @@ rtc_source_set("audio_processing_c") {
deps = [
"../..:webrtc_common",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",
]
@ -405,9 +402,7 @@ rtc_source_set("aec_core") {
":audio_processing_statistics",
"../..:webrtc_common",
"../../common_audio:common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:sanitizer",
"../../system_wrappers:cpu_features_api",
"../../system_wrappers:metrics_api",
]
@ -585,7 +580,6 @@ if (rtc_include_tests) {
"../../api:array_view",
"../../api:optional",
"../../common_audio:common_audio",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base",
@ -738,7 +732,6 @@ if (rtc_include_tests) {
"../../api:array_view",
"../../common_audio:common_audio",
"../../modules:module_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -764,7 +757,6 @@ if (rtc_include_tests) {
":audioproc_test_utils",
"../../api:optional",
"../../common_audio:common_audio",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
@ -799,7 +791,6 @@ if (rtc_include_tests) {
"../../api:array_view",
"../../api:optional",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../test:test_support",
@ -852,7 +843,6 @@ if (rtc_include_tests) {
":audio_processing",
":audioproc_test_utils",
"../../common_audio:common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics_default",
]

1
modules/audio_processing/aec_dump/BUILD.gn
View File

@ -74,7 +74,6 @@ if (rtc_enable_protobuf) {
deps = [
"../../../modules:module_api",
"../../../rtc_base:checks",
"../../../rtc_base:protobuf_utils",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base:rtc_task_queue",

1
modules/audio_processing/test/conversational_speech/BUILD.gn
View File

@ -47,7 +47,6 @@ rtc_static_library("lib") {
"../../../..:webrtc_common",
"../../../../api:array_view",
"../../../../common_audio",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
visibility = [ ":*" ] # Only targets in this file can depend on this.

1
modules/audio_processing/test/py_quality_assessment/BUILD.gn
View File

@ -117,7 +117,6 @@ rtc_executable("fake_polqa") {
output_name = "py_quality_assessment/quality_assessment/fake_polqa"
deps = [
"../../../..:webrtc_common",
"../../../../rtc_base:checks",
"../../../../rtc_base:rtc_base_approved",
]
}

3
modules/congestion_controller/BUILD.gn
View File

@ -51,8 +51,6 @@ rtc_static_library("congestion_controller") {
"../..:webrtc_common",
"../../api:optional",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:rate_limiter",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
@ -89,7 +87,6 @@ if (rtc_include_tests) {
deps = [
":congestion_controller",
":mock_congestion_controller",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",

9
modules/desktop_capture/BUILD.gn
View File

@ -28,7 +28,6 @@ rtc_static_library("primitives") {
deps = [
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
]
}
@ -38,9 +37,7 @@ if (rtc_include_tests) {
testonly = true
sources = []
deps = [
"../../rtc_base:checks",
]
deps = []
if (rtc_desktop_capture_supported) {
deps += [
":desktop_capture_mock",
@ -89,7 +86,6 @@ if (rtc_include_tests) {
":desktop_capture_mock",
":primitives",
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",
"../../test:test_support",
@ -129,7 +125,6 @@ if (rtc_include_tests) {
deps = [
":primitives",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
@ -179,7 +174,6 @@ if (is_mac) {
deps = [
":desktop_capture_generic",
":primitives",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../sdk:common_objc",
@ -334,7 +328,6 @@ rtc_static_library("desktop_capture_generic") {
":primitives",
"../..:webrtc_common",
"../../api:refcountedbase",
"../../rtc_base:checks",
"../../rtc_base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
"../../system_wrappers",
"../../system_wrappers:cpu_features_api",

2
modules/pacing/BUILD.gn
View File

@ -37,7 +37,6 @@ rtc_static_library("pacing") {
"../../:webrtc_common",
"../../api:optional",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
@ -61,7 +60,6 @@ if (rtc_include_tests) {
]
deps = [
":pacing",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers",

3
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -49,7 +49,6 @@ rtc_static_library("remote_bitrate_estimator") {
"../../api:optional",
"../../modules:module_api",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
@ -141,7 +140,6 @@ if (rtc_include_tests) {
"..:module_api",
"../..:webrtc_common",
"../../api:optional",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
@ -205,7 +203,6 @@ if (rtc_include_tests) {
":bwe_simulator_lib",
":remote_bitrate_estimator",
"../..:webrtc_common",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",

8
modules/rtp_rtcp/BUILD.gn
View File

@ -87,7 +87,6 @@ rtc_source_set("rtp_rtcp_format") {
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
@ -199,9 +198,7 @@ rtc_static_library("rtp_rtcp") {
"../../api/audio_codecs:audio_codecs_api",
"../../common_video",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:gtest_prod",
"../../rtc_base:rate_limiter",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:sequenced_task_checker",
@ -241,7 +238,6 @@ rtc_source_set("rtcp_transceiver") {
"../../api:array_view",
"../../api:optional",
"../../api:transport_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:weak_ptr",
@ -259,7 +255,6 @@ rtc_source_set("fec_test_helper") {
":rtp_rtcp",
":rtp_rtcp_format",
"..:module_api",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
@ -283,7 +278,6 @@ rtc_source_set("mock_rtp_rtcp") {
":rtp_rtcp_format",
"..:module_api",
"../../api:optional",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
]
@ -405,8 +399,6 @@ if (rtc_include_tests) {
"../../call:rtp_receiver",
"../../common_video:common_video",
"../../logging:rtc_event_log_api",
"../../rtc_base:checks",
"../../rtc_base:rate_limiter",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:rtc_task_queue",

1
modules/utility/BUILD.gn
View File

@ -34,7 +34,6 @@ rtc_static_library("utility") {
"../..:webrtc_common",
"../../audio/utility:audio_frame_operations",
"../../common_audio",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../system_wrappers",

1
modules/video_capture/BUILD.gn
View File

@ -125,7 +125,6 @@ if (!build_with_chromium) {
deps = [
":video_capture_module",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]

10
modules/video_coding/BUILD.gn
View File

@ -103,7 +103,6 @@ rtc_static_library("video_coding") {
"../../api:video_frame_api_i420",
"../../call:video_stream_api",
"../../common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
@ -173,7 +172,6 @@ rtc_source_set("video_coding_utility") {
"../../api/video_codecs:video_codecs_api",
"../../common_video",
"../../modules/rtp_rtcp",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:rtc_task_queue",
@ -200,7 +198,6 @@ rtc_static_library("webrtc_h264") {
"../../api:video_frame_api_i420",
"../../api/video_codecs:video_codecs_api",
"../../media:rtc_media_base",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics_api",
]
@ -242,7 +239,6 @@ rtc_static_library("webrtc_i420") {
"../..:webrtc_common",
"../../api:video_frame_api_i420",
"../../common_video:common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
@ -305,7 +301,6 @@ rtc_static_library("webrtc_vp8") {
"../../api:optional",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",
"../../rtc_base:sequenced_task_checker",
@ -344,7 +339,6 @@ rtc_static_library("webrtc_vp9") {
":video_coding_utility",
"..:module_api",
"../../common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]
@ -398,7 +392,6 @@ if (rtc_include_tests) {
"../../api:video_frame_api",
"../../api:video_frame_api_i420",
"../../common_video:common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../test:test_support",
]
@ -434,7 +427,6 @@ if (rtc_include_tests) {
"../../api:video_frame_api_i420",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
"../../rtc_base:sequenced_task_checker",
@ -493,7 +485,6 @@ if (rtc_include_tests) {
"../../common_video",
"../../media:rtc_audio_video",
"../../media:rtc_media_base",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../system_wrappers",
@ -603,7 +594,6 @@ if (rtc_include_tests) {
"../../api:video_frame_api_i420",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_numerics",

1
modules/video_processing/BUILD.gn
View File

@ -31,7 +31,6 @@ rtc_static_library("video_processing") {
"../../common_audio",
"../../common_video",
"../../modules/utility",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:cpu_features_api",
]

1
ortc/BUILD.gn
View File

@ -47,7 +47,6 @@ rtc_static_library("ortc") {
"../pc:peerconnection",
"../pc:rtc_pc",
"../pc:rtc_pc_base",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
]

4
p2p/BUILD.gn
View File

@ -91,7 +91,6 @@ rtc_static_library("rtc_p2p") {
"../api:libjingle_peerconnection_api",
"../api:optional",
"../api:ortc_api",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../system_wrappers:field_trial_api",
]
@ -176,7 +175,6 @@ if (rtc_include_tests) {
":rtc_p2p",
"../api:fakemetricsobserver",
"../api:ortc_api",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
@ -201,7 +199,6 @@ rtc_static_library("libstunprober") {
deps = [
":rtc_p2p",
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:rtc_base",
]
}
@ -217,7 +214,6 @@ if (rtc_include_tests) {
":libstunprober",
":p2p_test_utils",
":rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_tests_utils",
"//testing/gmock",

5
pc/BUILD.gn
View File

@ -75,7 +75,6 @@ rtc_static_library("rtc_pc_base") {
"../media:rtc_h264_profile_id",
"../media:rtc_media_base",
"../p2p:rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_task_queue",
]
@ -183,7 +182,6 @@ rtc_static_library("peerconnection") {
"../media:rtc_data",
"../media:rtc_media_base",
"../p2p:rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../stats",
@ -291,7 +289,6 @@ if (rtc_include_tests) {
"../media:rtc_media_tests_utils",
"../p2p:p2p_test_utils",
"../p2p:rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_main",
@ -345,7 +342,6 @@ if (rtc_include_tests) {
"../media:rtc_media_tests_utils",
"../modules/audio_device:audio_device",
"../p2p:p2p_test_utils",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
@ -440,7 +436,6 @@ if (rtc_include_tests) {
deps = [
":peerconnection",
":rtc_pc_base",
"../rtc_base:checks",
]
if (is_android) {
deps += [ ":android_black_magic" ]

79
rtc_base/BUILD.gn
View File

@ -89,49 +89,6 @@ rtc_source_set("rtc_base_approved") {
}
}
rtc_source_set("checks") {
sources = [
"checks.cc",
"checks.h",
]
deps = [
":safe_compare",
"..:webrtc_common",
]
}
rtc_source_set("type_traits") {
sources = [
"type_traits.h",
]
}
rtc_source_set("sanitizer") {
sources = [
"sanitizer.h",
]
}
rtc_source_set("safe_compare") {
sources = [
"numerics/safe_compare.h",
]
deps = [
":type_traits",
]
}
rtc_source_set("rate_limiter") {
sources = [
"rate_limiter.cc",
"rate_limiter.h",
]
deps = [
":rtc_base_approved",
"../system_wrappers",
]
}
# The subset of rtc_base approved for use outside of libjingle.
rtc_source_set("rtc_base_approved_generic") {
visibility = [
@ -140,14 +97,13 @@ rtc_source_set("rtc_base_approved_generic") {
":weak_ptr_unittests",
]
cflags = []
# TODO(kjellander): Remove (bugs.webrtc.org/7480)
# Enabling GN check triggers a cyclic dependency caused by rate_limiter.cc:
# :rtc_base_approved -> ../system_wrappers -> :rtc_base_approved
check_includes = false
defines = []
libs = []
deps = [
":checks",
":safe_compare",
":type_traits",
]
deps = []
sources = [
"arraysize.h",
@ -166,6 +122,8 @@ rtc_source_set("rtc_base_approved_generic") {
"bytebuffer.cc",
"bytebuffer.h",
"byteorder.h",
"checks.cc",
"checks.h",
"constructormagic.h",
"copyonwritebuffer.cc",
"copyonwritebuffer.h",
@ -187,6 +145,7 @@ rtc_source_set("rtc_base_approved_generic") {
"numerics/histogram_percentile_counter.h",
"numerics/mod_ops.h",
"numerics/moving_max_counter.h",
"numerics/safe_compare.h",
"numerics/safe_conversions.h",
"numerics/safe_conversions_impl.h",
"numerics/safe_minmax.h",
@ -203,6 +162,8 @@ rtc_source_set("rtc_base_approved_generic") {
"race_checker.h",
"random.cc",
"random.h",
"rate_limiter.cc",
"rate_limiter.h",
"rate_statistics.cc",
"rate_statistics.h",
"ratetracker.cc",
@ -210,6 +171,7 @@ rtc_source_set("rtc_base_approved_generic") {
"refcount.h",
"refcountedobject.h",
"refcounter.h",
"sanitizer.h",
"scoped_ref_ptr.h",
"string_to_number.cc",
"string_to_number.h",
@ -229,13 +191,10 @@ rtc_source_set("rtc_base_approved_generic") {
"timeutils.cc",
"timeutils.h",
"trace_event.h",
"type_traits.h",
]
deps += [
"..:webrtc_common",
"../api:array_view",
"../api:optional",
]
deps += [ "..:webrtc_common" ]
if (is_android) {
libs += [ "log" ]
@ -391,7 +350,6 @@ rtc_source_set("rtc_task_queue_api") {
rtc_source_set("rtc_task_queue_impl") {
deps = [
":checks",
":rtc_base_approved",
":rtc_task_queue_api",
]
@ -427,7 +385,6 @@ rtc_static_library("sequenced_task_checker") {
"sequenced_task_checker_impl.h",
]
deps = [
":checks",
":rtc_base_approved",
":rtc_task_queue",
]
@ -453,9 +410,7 @@ rtc_static_library("rtc_numerics") {
"numerics/sequence_number_util.h",
]
deps = [
":checks",
":rtc_base_approved",
":safe_compare",
"../api:optional",
]
}
@ -525,7 +480,6 @@ rtc_static_library("rtc_base_generic") {
libs = []
defines = []
deps = [
":checks",
"..:webrtc_common",
"../api:optional",
]
@ -843,7 +797,6 @@ rtc_source_set("rtc_base_tests_utils") {
configs += [ ":rtc_base_tests_utils_warnings_config" ]
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
deps = [
":checks",
":rtc_base",
"../test:field_trial",
"../test:test_support",
@ -888,7 +841,6 @@ if (rtc_include_tests) {
"socketaddress_unittest.cc",
]
deps = [
":checks",
":rtc_base",
":rtc_base_tests_main",
":rtc_base_tests_utils",
@ -948,14 +900,11 @@ if (rtc_include_tests) {
"virtualsocket_unittest.cc",
]
deps = [
":checks",
":rate_limiter",
":rtc_base",
":rtc_base_approved",
":rtc_base_tests_main",
":rtc_base_tests_utils",
":rtc_task_queue",
":safe_compare",
"../api:array_view",
"../system_wrappers:system_wrappers",
"../test:test_support",
@ -984,7 +933,6 @@ if (rtc_include_tests) {
"sequenced_task_checker_unittest.cc",
]
deps = [
":checks",
":rtc_base_approved",
":rtc_base_tests_main",
":rtc_task_queue",
@ -1077,7 +1025,6 @@ if (rtc_include_tests) {
]
}
deps = [
":checks",
":rtc_base_tests_main",
":rtc_base_tests_utils",
"../api:optional",

12
rtc_base/checks.cc
View File

@ -30,18 +30,8 @@
#include <windows.h>
#endif
#if defined(WEBRTC_WIN)
#define RTC_LAST_SYSTEM_ERROR \
(::GetLastError())
#elif defined(__native_client__) && __native_client__
#define RTC_LAST_SYSTEM_ERROR \
(0)
#elif defined(WEBRTC_POSIX)
#define RTC_LAST_SYSTEM_ERROR \
(errno)
#endif // WEBRTC_WIN
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#if defined(_MSC_VER)
// Warning C4722: destructor never returns, potential memory leak.

2
rtc_base/event.h
View File

@ -13,7 +13,7 @@
#include "rtc_base/constructormagic.h"
#if defined(WEBRTC_WIN)
#include <windows.h>
#include "rtc_base/win32.h" // NOLINT: consider this a system header.
#elif defined(WEBRTC_POSIX)
#include <pthread.h>
#else

4
rtc_base/file_win.cc
View File

@ -11,9 +11,9 @@
#include "rtc_base/file.h"
#include <io.h>
#include <windows.h>
#include "rtc_base/win32.h"
#include <limits>
#include <limits> // NOLINT: win32.h should be considered a system header
#include "rtc_base/checks.h"

6
rtc_base/fileutils.h
View File

@ -13,15 +13,13 @@
#include <string>
#if defined(WEBRTC_WIN)
#include <windows.h>
#else
#if !defined(WEBRTC_WIN)
#include <dirent.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#endif // WEBRTC_WIN
#endif
#include "rtc_base/checks.h"
#include "rtc_base/constructormagic.h"

3
rtc_base/flags.cc
View File

@ -15,10 +15,9 @@
#include <string.h>
#include "rtc_base/checks.h"
#include "rtc_base/stringutils.h"
#if defined(WEBRTC_WIN)
#include <windows.h>
#include "rtc_base/win32.h"
#include <shellapi.h>
#endif

6
rtc_base/logging.h
View File

@ -341,16 +341,22 @@ inline bool LogCheckLevel(LoggingSeverity sev) {
RTC_LOG_GLE_EX(sev, err)
#define RTC_LOG_ERR(sev) \
RTC_LOG_GLE(sev)
#define RTC_LAST_SYSTEM_ERROR \
(::GetLastError())
#elif defined(__native_client__) && __native_client__
#define RTC_LOG_ERR_EX(sev, err) \
RTC_LOG(sev)
#define RTC_LOG_ERR(sev) \
RTC_LOG(sev)
#define RTC_LAST_SYSTEM_ERROR \
(0)
#elif defined(WEBRTC_POSIX)
#define RTC_LOG_ERR_EX(sev, err) \
RTC_LOG_ERRNO_EX(sev, err)
#define RTC_LOG_ERR(sev) \
RTC_LOG_ERRNO(sev)
#define RTC_LAST_SYSTEM_ERROR \
(errno)
#endif // WEBRTC_WIN
#define RTC_LOG_TAG(sev, tag) \

2
rtc_base/pathutils.cc
View File

@ -9,7 +9,7 @@
*/
#if defined(WEBRTC_WIN)
#include <windows.h>
#include "rtc_base/win32.h"
#include <shellapi.h>
#include <shlobj.h>
#include <tchar.h>

14
rtc_base/physicalsocketserver.cc
View File

@ -19,6 +19,7 @@
#if defined(WEBRTC_POSIX)
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#if defined(WEBRTC_USE_EPOLL)
// "poll" will be used to wait for the signal dispatcher.
@ -39,8 +40,6 @@
#undef SetPort
#endif
#include <errno.h>
#include <algorithm>
#include <map>
@ -54,17 +53,6 @@
#include "rtc_base/timeutils.h"
#include "rtc_base/win32socketinit.h"
#if defined(WEBRTC_WIN)
#define RTC_LAST_SYSTEM_ERROR \
(::GetLastError())
#elif defined(__native_client__) && __native_client__
#define RTC_LAST_SYSTEM_ERROR \
(0)
#elif defined(WEBRTC_POSIX)
#define RTC_LAST_SYSTEM_ERROR \
(errno)
#endif // WEBRTC_WIN
#if defined(WEBRTC_POSIX)
#include <netinet/tcp.h> // for TCP_NODELAY
#define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h

2
rtc_base/platform_file.cc
View File

@ -10,8 +10,6 @@
#include "rtc_base/platform_file.h"
#include "rtc_base/stringutils.h"
#if defined(WEBRTC_WIN)
#include <io.h>
#else

2
rtc_base/platform_file.h
View File

@ -15,7 +15,7 @@
#include <string>
#if defined(WEBRTC_WIN)
#include <windows.h>
#include "rtc_base/win32.h"
#endif
namespace rtc {

2
rtc_base/stream.cc
View File

@ -29,7 +29,7 @@
#include "rtc_base/timeutils.h"
#if defined(WEBRTC_WIN)
#include <windows.h>
#include "rtc_base/win32.h"
#define fileno _fileno
#endif

38
rtc_base/stringutils.h
View File

@ -19,7 +19,6 @@
#if defined(WEBRTC_WIN)
#include <malloc.h>
#include <wchar.h>
#include <windows.h>
#define alloca _alloca
#endif // WEBRTC_WIN
@ -296,43 +295,6 @@ struct Traits<wchar_t> {
#endif // WEBRTC_WIN
///////////////////////////////////////////////////////////////////////////////
// UTF helpers (Windows only)
///////////////////////////////////////////////////////////////////////////////
#if defined(WEBRTC_WIN)
inline std::wstring ToUtf16(const char* utf8, size_t len) {
int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
nullptr, 0);
wchar_t* ws = STACK_ARRAY(wchar_t, len16);
::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws, len16);
return std::wstring(ws, len16);
}
inline std::wstring ToUtf16(const std::string& str) {
return ToUtf16(str.data(), str.length());
}
inline std::string ToUtf8(const wchar_t* wide, size_t len) {
int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
nullptr, 0, nullptr, nullptr);
char* ns = STACK_ARRAY(char, len8);
::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns, len8,
nullptr, nullptr);
return std::string(ns, len8);
}
inline std::string ToUtf8(const wchar_t* wide) {
return ToUtf8(wide, wcslen(wide));
}
inline std::string ToUtf8(const std::wstring& wstr) {
return ToUtf8(wstr.data(), wstr.length());
}
#endif // WEBRTC_WIN
// Replaces all occurrences of "search" with "replace".
void replace_substrs(const char *search,
size_t search_len,

60
rtc_base/win32.cc
View File

@ -311,6 +311,66 @@ int inet_pton_v6(const char* src, void* dst) {
return 1;
}
//
// Unix time is in seconds relative to 1/1/1970. So we compute the windows
// FILETIME of that time/date, then we add/subtract in appropriate units to
// convert to/from unix time.
// The units of FILETIME are 100ns intervals, so by multiplying by or dividing
// by 10000000, we can convert to/from seconds.
//
// FileTime = UnixTime*10000000 + FileTime(1970)
// UnixTime = (FileTime-FileTime(1970))/10000000
//
void FileTimeToUnixTime(const FILETIME& ft, time_t* ut) {
RTC_DCHECK(nullptr != ut);
// FILETIME has an earlier date base than time_t (1/1/1970), so subtract off
// the difference.
SYSTEMTIME base_st;
memset(&base_st, 0, sizeof(base_st));
base_st.wDay = 1;
base_st.wMonth = 1;
base_st.wYear = 1970;
FILETIME base_ft;
SystemTimeToFileTime(&base_st, &base_ft);
ULARGE_INTEGER base_ul, current_ul;
memcpy(&base_ul, &base_ft, sizeof(FILETIME));
memcpy(&current_ul, &ft, sizeof(FILETIME));
// Divide by big number to convert to seconds, then subtract out the 1970
// base date value.
const ULONGLONG RATIO = 10000000;
*ut = static_cast<time_t>((current_ul.QuadPart - base_ul.QuadPart) / RATIO);
}
void UnixTimeToFileTime(const time_t& ut, FILETIME* ft) {
RTC_DCHECK(nullptr != ft);
// FILETIME has an earlier date base than time_t (1/1/1970), so add in
// the difference.
SYSTEMTIME base_st;
memset(&base_st, 0, sizeof(base_st));
base_st.wDay = 1;
base_st.wMonth = 1;
base_st.wYear = 1970;
FILETIME base_ft;
SystemTimeToFileTime(&base_st, &base_ft);
ULARGE_INTEGER base_ul;
memcpy(&base_ul, &base_ft, sizeof(FILETIME));
// Multiply by big number to convert to 100ns units, then add in the 1970
// base date value.
const ULONGLONG RATIO = 10000000;
ULARGE_INTEGER current_ul;
current_ul.QuadPart = base_ul.QuadPart + static_cast<int64_t>(ut) * RATIO;
memcpy(ft, &current_ul, sizeof(FILETIME));
}
bool Utf8ToWindowsFilename(const std::string& utf8, std::wstring* filename) {
// TODO: Integrate into fileutils.h
// TODO: Handle wide and non-wide cases via TCHAR?

41
rtc_base/win32.h
View File

@ -46,9 +46,50 @@ namespace rtc {
const char* win32_inet_ntop(int af, const void *src, char* dst, socklen_t size);
int win32_inet_pton(int af, const char* src, void *dst);
inline std::wstring ToUtf16(const char* utf8, size_t len) {
int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
nullptr, 0);
wchar_t* ws = STACK_ARRAY(wchar_t, len16);
::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws, len16);
return std::wstring(ws, len16);
}
inline std::wstring ToUtf16(const std::string& str) {
return ToUtf16(str.data(), str.length());
}
inline std::string ToUtf8(const wchar_t* wide, size_t len) {
int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
nullptr, 0, nullptr, nullptr);
char* ns = STACK_ARRAY(char, len8);
::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns, len8,
nullptr, nullptr);
return std::string(ns, len8);
}
inline std::string ToUtf8(const wchar_t* wide) {
return ToUtf8(wide, wcslen(wide));
}
inline std::string ToUtf8(const std::wstring& wstr) {
return ToUtf8(wstr.data(), wstr.length());
}
// Convert FILETIME to time_t
void FileTimeToUnixTime(const FILETIME& ft, time_t* ut);
// Convert time_t to FILETIME
void UnixTimeToFileTime(const time_t& ut, FILETIME * ft);
// Convert a Utf8 path representation to a non-length-limited Unicode pathname.
bool Utf8ToWindowsFilename(const std::string& utf8, std::wstring* filename);
// Convert a FILETIME to a UInt64
inline uint64_t ToUInt64(const FILETIME& ft) {
ULARGE_INTEGER r = {{ft.dwLowDateTime, ft.dwHighDateTime}};
return r.QuadPart;
}
enum WindowsMajorVersions {
kWindows2000 = 5,
kWindowsVista = 6,

9
rtc_base/win32_unittest.cc
View File

@ -26,6 +26,15 @@ class Win32Test : public testing::Test {
}
};
TEST_F(Win32Test, FileTimeToUInt64Test) {
FILETIME ft;
ft.dwHighDateTime = 0xBAADF00D;
ft.dwLowDateTime = 0xFEED3456;
uint64_t expected = 0xBAADF00DFEED3456;
EXPECT_EQ(expected, ToUInt64(ft));
}
TEST_F(Win32Test, IPv6AddressCompression) {
IPAddress ipv6;

2
rtc_tools/BUILD.gn
View File

@ -235,7 +235,6 @@ if (!build_with_chromium) {
"../modules/audio_coding:audio_network_adaptor",
"../modules/audio_coding:neteq_tools",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_numerics",
@ -341,7 +340,6 @@ if (rtc_include_tests) {
"$rtc_libyuv_dir",
"../common_video:common_video",
"../rtc_base",
"../rtc_base:checks",
"../test:test_main",
"//testing/gtest",
]

1
rtc_tools/network_tester/BUILD.gn
View File

@ -43,7 +43,6 @@ if (rtc_enable_protobuf) {
":network_tester_packet_proto",
"../../api:optional",
"../../p2p",
"../../rtc_base:checks",
"../../rtc_base:protobuf_utils",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",

9
sdk/BUILD.gn
View File

@ -68,7 +68,6 @@ if (is_ios || is_mac) {
]
deps = [
"../rtc_base:checks",
"../rtc_base:rtc_base",
]
configs += [ "..:common_objc" ]
@ -106,7 +105,6 @@ if (is_ios || is_mac) {
deps = [
":common_objc",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
@ -140,7 +138,6 @@ if (is_ios || is_mac) {
"../api:video_frame_api_i420",
"../common_video",
"../media:rtc_media_base",
"../rtc_base:checks",
"../rtc_base:rtc_base",
]
@ -198,7 +195,6 @@ if (is_ios || is_mac) {
"../api:optional",
"../common_video",
"../media:rtc_media_base",
"../rtc_base:checks",
"../rtc_base:rtc_base",
]
@ -263,7 +259,6 @@ if (is_ios || is_mac) {
deps = [
":video_objc",
"../api:video_frame_api",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
configs += [ "..:common_objc" ]
@ -520,7 +515,6 @@ if (is_ios || is_mac) {
"../media:rtc_media_base",
"../modules:module_api",
"../pc:peerconnection",
"../rtc_base:checks",
"../rtc_base:rtc_base",
]
}
@ -776,7 +770,6 @@ if (is_ios || is_mac) {
"$rtc_libyuv_dir",
"../api:video_frame_api_i420",
"../common_video",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
@ -801,7 +794,6 @@ if (is_ios || is_mac) {
"../common_video",
"../modules:module_api",
"../modules/video_coding:webrtc_h264",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
if (!build_with_chromium && is_clang) {
@ -837,7 +829,6 @@ if (is_ios || is_mac) {
"../modules:module_api",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding:webrtc_h264",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]

3
sdk/android/BUILD.gn
View File

@ -81,7 +81,6 @@ rtc_source_set("base_jni") {
":generated_external_classes_jni",
"../../api:libjingle_peerconnection_api",
"../../api:optional",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:metrics_api",
@ -232,7 +231,6 @@ rtc_static_library("video_jni") {
"../../modules/video_coding:video_coding_utility",
"../../modules/video_coding:webrtc_vp8",
"../../modules/video_coding:webrtc_vp9",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
@ -397,7 +395,6 @@ rtc_static_library("peerconnection_jni") {
"../../modules/audio_device:audio_device",
"../../modules/utility:utility",
"../../pc:peerconnection",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",

1
stats/BUILD.gn
View File

@ -58,7 +58,6 @@ if (rtc_include_tests) {
":rtc_stats",
":rtc_stats_test_utils",
"../api:rtc_stats_api",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_main",
"../rtc_base:rtc_base_tests_utils",

2
system_wrappers/BUILD.gn
View File

@ -56,7 +56,6 @@ rtc_static_library("system_wrappers") {
"..:webrtc_common",
"../api:optional",
"../modules:module_api_public",
"../rtc_base:checks",
]
if (is_android) {
@ -133,7 +132,6 @@ rtc_source_set("metrics_api") {
]
deps = [
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}

10
test/BUILD.gn
View File

@ -67,7 +67,6 @@ rtc_source_set("video_test_common") {
"../common_video",
"../media:rtc_media_base",
"../modules/video_capture:video_capture_module",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
@ -95,7 +94,6 @@ rtc_source_set("rtp_test_utils") {
"../api:array_view",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"//testing/gtest",
]
@ -219,7 +217,6 @@ if (rtc_include_tests) {
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../common_video",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"//testing/gmock",
@ -363,7 +360,6 @@ if (is_ios) {
]
deps = [
"..:webrtc_common",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../sdk:common_objc",
]
@ -385,7 +381,6 @@ rtc_source_set("fileutils") {
deps = [
"..:webrtc_common",
"../api:optional",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
if (is_ios) {
@ -449,7 +444,6 @@ rtc_source_set("fileutils_unittests") {
":fileutils",
":test_support",
"../api:optional",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"//testing/gmock",
"//testing/gtest",
@ -490,7 +484,6 @@ rtc_source_set("single_threaded_task_queue") {
"single_threaded_task_queue.h",
]
deps = [
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
}
@ -510,7 +503,6 @@ rtc_source_set("fake_audio_device") {
"../api:array_view",
"../common_audio:common_audio",
"../modules/audio_device:audio_device",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]
@ -589,7 +581,6 @@ rtc_source_set("test_common") {
"../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp8",
"../modules/video_coding:webrtc_vp9",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"../rtc_base:sequenced_task_checker",
@ -671,7 +662,6 @@ rtc_source_set("test_renderer_generic") {
"../common_video",
"../media:rtc_media_base",
"../modules/media_file",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"//testing/gtest",
]

5
test/fuzzers/BUILD.gn
View File

@ -151,7 +151,6 @@ webrtc_fuzzer_test("ulpfec_generator_fuzzer") {
"../../modules/rtp_rtcp",
"../../modules/rtp_rtcp:fec_test_helper",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -197,7 +196,6 @@ webrtc_fuzzer_test("rtcp_receiver_fuzzer") {
]
deps = [
"../../modules/rtp_rtcp",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
]
@ -248,7 +246,6 @@ rtc_static_library("audio_decoder_fuzzer") {
"../../api:optional",
"../../api/audio_codecs:audio_codecs_api",
"../../modules/rtp_rtcp:rtp_rtcp_format",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -360,7 +357,6 @@ webrtc_fuzzer_test("residual_echo_detector_fuzzer") {
]
deps = [
"../../modules/audio_processing:audio_processing",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
@ -430,7 +426,6 @@ webrtc_fuzzer_test("audio_processing_fuzzer") {
"../../api:optional",
"../../modules:module_api",
"../../modules/audio_processing",
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}

5
video/BUILD.gn
View File

@ -64,7 +64,6 @@ rtc_static_library("video") {
"../call:rtp_interfaces",
"../call:video_stream_api",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../system_wrappers:field_trial_api",
"../system_wrappers:metrics_api",
@ -114,7 +113,6 @@ if (rtc_include_tests) {
"../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp8",
"../modules/video_coding:webrtc_vp9",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_task_queue",
@ -221,7 +219,6 @@ if (rtc_include_tests) {
"../common_video",
"../logging:rtc_event_log_api",
"../modules/rtp_rtcp",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
"../system_wrappers:metrics_default",
@ -292,8 +289,6 @@ if (rtc_include_tests) {
"../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp8",
"../modules/video_coding:webrtc_vp9",
"../rtc_base:checks",
"../rtc_base:rate_limiter",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_numerics",

3
voice_engine/BUILD.gn
View File

@ -76,8 +76,6 @@ rtc_static_library("voice_engine") {
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../rtc_base:checks",
"../rtc_base:rate_limiter",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
@ -115,7 +113,6 @@ if (rtc_include_tests) {
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/utility",
"../modules/video_capture:video_capture",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_base_tests_utils",
"../system_wrappers",