This reverts commit 08279b5cf5a8412f7e946cc2bb43703e920f5855. Reason for revert: msvc bots breaking, blocking WebRTC rolls. Sample log: FAILED: obj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj ninja -t msvc -e environment.x64 -- E:\b\c\goma_client/gomacc.exe "e:\b\c\win_toolchain\vs_files\1180cb75833ea365097e279efb2d5d7a42dee4b0\vc\tools\msvc\14.11.25503\bin\hostx64\x64/cl.exe" /nologo /showIncludes @obj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj.rsp /c ../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc /Foobj/third_party/webrtc/modules/congestion_controller/estimators/probe_bitrate_estimator.obj /Fd"obj/third_party/webrtc/modules/congestion_controller/estimators_cc.pdb" ../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc(68): error C2220: warning treated as error - no 'object' file generated ../../third_party/webrtc/modules/congestion_controller/probe_bitrate_estimator.cc(68): warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data [22699/51826] CXX obj/third_party/webrtc/modules/pacing/pacing/packet_router.obj [22700/51826] CXX obj/third_party/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator/aimd_rate_control.obj [22701/51826] CXX obj/third_party/webrtc/modules/desktop_capture/desktop_capture_generic/dxgi_texture_mapping.obj [22702/51826] CXX obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj FAILED: obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj ninja -t msvc -e environment.x64 -- E:\b\c\goma_client/gomacc.exe "e:\b\c\win_toolchain\vs_files\1180cb75833ea365097e279efb2d5d7a42dee4b0\vc\tools\msvc\14.11.25503\bin\hostx64\x64/cl.exe" /nologo /showIncludes @obj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj.rsp /c ../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc /Foobj/third_party/webrtc/modules/congestion_controller/estimators/acknowledged_bitrate_estimator.obj /Fd"obj/third_party/webrtc/modules/congestion_controller/estimators_cc.pdb" ../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc(41): error C2220: warning treated as error - no 'object' file generated ../../third_party/webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.cc(41): warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data https://logs.chromium.org/v/?s=chromium%2Fbb%2Ftryserver.chromium.win%2Fwin-msvc-dbg%2F1780%2F%2B%2Frecipes%2Fsteps%2Fcompile__with_patch_%2F0%2Fstdout Original change's description: > Fix circular dependency in BWE code. > > Bug: webrtc:6828 > Change-Id: I531ee5dea41140f085d82641253fadb9e997a378 > Reviewed-on: https://webrtc-review.googlesource.com/34641 > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Commit-Queue: Patrik Höglund <phoglund@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21350} TBR=phoglund@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:6828 Change-Id: I361050942cbd1d2b344b129c8c3a4e7b6e1c02f4 Reviewed-on: https://webrtc-review.googlesource.com/35240 Reviewed-by: Olga Sharonova <olka@webrtc.org> Commit-Queue: Olga Sharonova <olka@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21384}
397 lines
11 KiB
Plaintext
397 lines
11 KiB
Plaintext
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("//third_party/protobuf/proto_library.gni")
|
|
import("../webrtc.gni")
|
|
|
|
group("rtc_tools") {
|
|
# This target shall build all targets in tools/.
|
|
testonly = true
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":frame_analyzer",
|
|
":video_quality_analysis",
|
|
]
|
|
if (!build_with_chromium) {
|
|
deps += [
|
|
":frame_editor",
|
|
":psnr_ssim_analyzer",
|
|
":rgba_to_i420_converter",
|
|
]
|
|
if (rtc_include_internal_audio_device) {
|
|
deps += [ ":force_mic_volume_max" ]
|
|
}
|
|
if (rtc_enable_protobuf) {
|
|
deps += [ ":chart_proto" ]
|
|
}
|
|
}
|
|
|
|
if (rtc_include_tests) {
|
|
deps += [
|
|
":activity_metric",
|
|
":tools_unittests",
|
|
]
|
|
if (rtc_enable_protobuf) {
|
|
deps += [
|
|
":event_log_visualizer",
|
|
":rtp_analyzer",
|
|
":unpack_aecdump",
|
|
"network_tester",
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
rtc_static_library("command_line_parser") {
|
|
sources = [
|
|
"simple_command_line_parser.cc",
|
|
"simple_command_line_parser.h",
|
|
]
|
|
deps = [
|
|
"../rtc_base:gtest_prod",
|
|
"../rtc_base:rtc_base_approved",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("video_quality_analysis") {
|
|
sources = [
|
|
"frame_analyzer/video_quality_analysis.cc",
|
|
"frame_analyzer/video_quality_analysis.h",
|
|
]
|
|
deps = [
|
|
# TODO(bugs.webrtc.org/6828): api:optional should be a dependency
|
|
# of rtc_base:rtc_base_approved_generic but that causes a circular
|
|
# dependency. In order to fix the chromium build on MSVC64 (dbg)
|
|
# this dependency has to be added here so the linker can find the
|
|
# symbols it needs.
|
|
"../api:optional",
|
|
"../common_video",
|
|
"//third_party/libyuv",
|
|
]
|
|
}
|
|
|
|
rtc_executable("frame_analyzer") {
|
|
sources = [
|
|
"frame_analyzer/frame_analyzer.cc",
|
|
]
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":video_quality_analysis",
|
|
"//build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
|
|
# Only expose the targets needed by Chromium (e.g. frame_analyzer) to avoid
|
|
# building a lot of redundant code as part of Chromium builds.
|
|
if (!build_with_chromium) {
|
|
rtc_executable("psnr_ssim_analyzer") {
|
|
sources = [
|
|
"psnr_ssim_analyzer/psnr_ssim_analyzer.cc",
|
|
]
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":video_quality_analysis",
|
|
"//build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("reference_less_video_analysis_lib") {
|
|
sources = [
|
|
"frame_analyzer/reference_less_video_analysis_lib.cc",
|
|
"frame_analyzer/reference_less_video_analysis_lib.h",
|
|
]
|
|
|
|
deps = [
|
|
":video_quality_analysis",
|
|
]
|
|
}
|
|
|
|
rtc_executable("reference_less_video_analysis") {
|
|
sources = [
|
|
"frame_analyzer/reference_less_video_analysis.cc",
|
|
]
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":reference_less_video_analysis_lib",
|
|
"//build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
|
|
rtc_executable("rgba_to_i420_converter") {
|
|
sources = [
|
|
"converter/converter.cc",
|
|
"converter/converter.h",
|
|
"converter/rgba_to_i420_converter.cc",
|
|
]
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
"../common_video",
|
|
"//build/win:default_exe_manifest",
|
|
"//third_party/libyuv",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("frame_editing_lib") {
|
|
sources = [
|
|
"frame_editing/frame_editing_lib.cc",
|
|
"frame_editing/frame_editing_lib.h",
|
|
]
|
|
|
|
# TODO(jschuh): Bug 1348: fix this warning.
|
|
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
"..:webrtc_common",
|
|
"../:typedefs",
|
|
"../common_video",
|
|
]
|
|
}
|
|
|
|
rtc_executable("frame_editor") {
|
|
sources = [
|
|
"frame_editing/frame_editing.cc",
|
|
]
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":frame_editing_lib",
|
|
"//build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
|
|
# It doesn't make sense to build this tool without the ADM enabled.
|
|
if (rtc_include_internal_audio_device) {
|
|
rtc_executable("force_mic_volume_max") {
|
|
sources = [
|
|
"force_mic_volume_max/force_mic_volume_max.cc",
|
|
]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
"../modules/audio_device",
|
|
"../system_wrappers:system_wrappers_default",
|
|
"//build/win:default_exe_manifest",
|
|
]
|
|
}
|
|
}
|
|
|
|
if (rtc_enable_protobuf) {
|
|
proto_library("chart_proto") {
|
|
sources = [
|
|
"event_log_visualizer/chart.proto",
|
|
]
|
|
proto_out_dir = "rtc_tools/event_log_visualizer"
|
|
}
|
|
|
|
rtc_static_library("event_log_visualizer_utils") {
|
|
sources = [
|
|
"event_log_visualizer/analyzer.cc",
|
|
"event_log_visualizer/analyzer.h",
|
|
"event_log_visualizer/plot_base.cc",
|
|
"event_log_visualizer/plot_base.h",
|
|
"event_log_visualizer/plot_protobuf.cc",
|
|
"event_log_visualizer/plot_protobuf.h",
|
|
"event_log_visualizer/plot_python.cc",
|
|
"event_log_visualizer/plot_python.h",
|
|
"event_log_visualizer/triage_notifications.h",
|
|
]
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
defines = [ "ENABLE_RTC_EVENT_LOG" ]
|
|
deps = [
|
|
":chart_proto",
|
|
"../:webrtc_common",
|
|
"../call:call_interfaces",
|
|
"../call:video_stream_api",
|
|
"../logging:rtc_event_log_api",
|
|
"../logging:rtc_event_log_impl",
|
|
"../logging:rtc_event_log_parser",
|
|
"../modules:module_api",
|
|
"../modules/audio_coding:ana_debug_dump_proto",
|
|
"../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",
|
|
|
|
# TODO(kwiberg): Remove this dependency.
|
|
"../api/audio_codecs:audio_codecs_api",
|
|
"../modules/congestion_controller",
|
|
"../modules/pacing",
|
|
"../modules/rtp_rtcp",
|
|
"../system_wrappers:system_wrappers_default",
|
|
"//build/config:exe_and_shlib_deps",
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
if (rtc_include_tests) {
|
|
if (rtc_enable_protobuf) {
|
|
rtc_executable("event_log_visualizer") {
|
|
testonly = true
|
|
sources = [
|
|
"event_log_visualizer/main.cc",
|
|
]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
defines = [ "ENABLE_RTC_EVENT_LOG" ]
|
|
deps = [
|
|
":event_log_visualizer_utils",
|
|
"../logging:rtc_event_log_parser",
|
|
"../rtc_base:protobuf_utils",
|
|
"../rtc_base:rtc_base_approved",
|
|
"../test:field_trial",
|
|
"../test:test_support",
|
|
]
|
|
}
|
|
}
|
|
|
|
rtc_executable("activity_metric") {
|
|
testonly = true
|
|
sources = [
|
|
"agc/activity_metric.cc",
|
|
]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
"../modules:module_api",
|
|
"../modules/audio_processing",
|
|
"../rtc_base:rtc_base_approved",
|
|
"../system_wrappers:metrics_default",
|
|
"../test:test_support",
|
|
"//build/win:default_exe_manifest",
|
|
"//testing/gtest",
|
|
]
|
|
}
|
|
|
|
tools_unittests_resources = [
|
|
"../resources/foreman_cif.yuv",
|
|
"../resources/reference_less_video_test_file.y4m",
|
|
"../resources/video_quality_analysis_frame.txt",
|
|
]
|
|
|
|
if (is_ios) {
|
|
bundle_data("tools_unittests_bundle_data") {
|
|
testonly = true
|
|
sources = tools_unittests_resources
|
|
outputs = [
|
|
"{{bundle_resources_dir}}/{{source_file_part}}",
|
|
]
|
|
}
|
|
}
|
|
|
|
rtc_test("tools_unittests") {
|
|
testonly = true
|
|
|
|
sources = [
|
|
"frame_analyzer/reference_less_video_analysis_unittest.cc",
|
|
"frame_analyzer/video_quality_analysis_unittest.cc",
|
|
"frame_editing/frame_editing_unittest.cc",
|
|
"sanitizers_unittest.cc",
|
|
"simple_command_line_parser_unittest.cc",
|
|
]
|
|
|
|
# TODO(jschuh): Bug 1348: fix this warning.
|
|
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
":command_line_parser",
|
|
":frame_editing_lib",
|
|
":reference_less_video_analysis_lib",
|
|
":video_quality_analysis",
|
|
"../common_video:common_video",
|
|
"../rtc_base",
|
|
"../rtc_base:checks",
|
|
"../test:test_main",
|
|
"//testing/gtest",
|
|
]
|
|
|
|
if (rtc_enable_protobuf) {
|
|
deps += [ "network_tester:network_tester_unittests" ]
|
|
}
|
|
|
|
data = tools_unittests_resources
|
|
if (is_android) {
|
|
deps += [ "//testing/android/native_test:native_test_support" ]
|
|
shard_timeout = 900
|
|
}
|
|
if (is_ios) {
|
|
deps += [ ":tools_unittests_bundle_data" ]
|
|
}
|
|
}
|
|
|
|
if (rtc_enable_protobuf) {
|
|
copy("rtp_analyzer") {
|
|
sources = [
|
|
"py_event_log_analyzer/misc.py",
|
|
"py_event_log_analyzer/pb_parse.py",
|
|
"py_event_log_analyzer/rtp_analyzer.py",
|
|
"py_event_log_analyzer/rtp_analyzer.sh",
|
|
]
|
|
outputs = [
|
|
"$root_build_dir/{{source_file_part}}",
|
|
]
|
|
deps = [
|
|
"../logging:rtc_event_log_proto",
|
|
]
|
|
} # rtp_analyzer
|
|
|
|
rtc_executable("unpack_aecdump") {
|
|
testonly = true
|
|
sources = [
|
|
"unpack_aecdump/unpack.cc",
|
|
]
|
|
|
|
deps = [
|
|
"..:webrtc_common",
|
|
"../:typedefs",
|
|
"../common_audio",
|
|
"../modules/audio_processing",
|
|
"../modules/audio_processing:audioproc_debug_proto",
|
|
"../modules/audio_processing:audioproc_debug_proto",
|
|
"../modules/audio_processing:audioproc_protobuf_utils",
|
|
"../modules/audio_processing:audioproc_test_utils",
|
|
"../rtc_base:protobuf_utils",
|
|
"../rtc_base:rtc_base_approved",
|
|
"../system_wrappers:system_wrappers_default",
|
|
]
|
|
} # unpack_aecdump
|
|
}
|
|
}
|