| Index: webrtc/tools/BUILD.gn
|
| diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
|
| index ff45daf09cf6d176368e682d13afc30c751d4621..35e466916646b0152a60fce56ab42a30c5b1b559 100644
|
| --- a/webrtc/tools/BUILD.gn
|
| +++ b/webrtc/tools/BUILD.gn
|
| @@ -6,7 +6,7 @@
|
| # 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")
|
| +# TODO(kjellander): Remove when bugs.webrtc.org/7855 is completed.
|
| import("../webrtc.gni")
|
|
|
| group("tools") {
|
| @@ -14,337 +14,58 @@ group("tools") {
|
| testonly = true
|
|
|
| public_deps = [
|
| - ":command_line_parser",
|
| - ":frame_analyzer",
|
| - ":frame_editor",
|
| - ":psnr_ssim_analyzer",
|
| - ":rgba_to_i420_converter",
|
| + "../rtc_tools",
|
| ]
|
| - if (rtc_include_internal_audio_device) {
|
| - public_deps += [ ":force_mic_volume_max" ]
|
| - }
|
| - if (rtc_enable_protobuf) {
|
| - public_deps += [ ":chart_proto" ]
|
| - }
|
| -
|
| - if (rtc_include_tests) {
|
| - public_deps += [
|
| - ":activity_metric",
|
| - ":tools_unittests",
|
| - ]
|
| - if (rtc_enable_protobuf) {
|
| - public_deps += [
|
| - ":event_log_visualizer",
|
| - ":rtp_analyzer",
|
| - "network_tester",
|
| - ]
|
| - }
|
| - }
|
| }
|
|
|
| -rtc_static_library("command_line_parser") {
|
| - sources = [
|
| - "simple_command_line_parser.cc",
|
| - "simple_command_line_parser.h",
|
| - ]
|
| - deps = [
|
| - "../base:gtest_prod",
|
| - "../base:rtc_base_approved",
|
| - ]
|
| +group("command_line_parser") {
|
| + public_deps = [ "../rtc_tools:command_line_parser" ]
|
| }
|
|
|
| -rtc_static_library("video_quality_analysis") {
|
| - sources = [
|
| - "frame_analyzer/video_quality_analysis.cc",
|
| - "frame_analyzer/video_quality_analysis.h",
|
| - ]
|
| -
|
| - deps = [
|
| - "../common_video",
|
| - ]
|
| - public_deps = [
|
| - "../common_video",
|
| - ]
|
| +group("video_quality_analysis") {
|
| + public_deps = [ "../rtc_tools:video_quality_analysis" ]
|
| }
|
|
|
| -rtc_executable("frame_analyzer") {
|
| - sources = [
|
| - "frame_analyzer/frame_analyzer.cc",
|
| - ]
|
| -
|
| - deps = [
|
| - ":command_line_parser",
|
| - ":video_quality_analysis",
|
| - "//build/win:default_exe_manifest",
|
| - ]
|
| +group("frame_analyzer") {
|
| + public_deps = [ "../rtc_tools:frame_analyzer" ]
|
| }
|
|
|
| -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",
|
| - ]
|
| +group("psnr_ssim_analyzer") {
|
| + public_deps = [ "../rtc_tools:psnr_ssim_analyzer" ]
|
| }
|
|
|
| -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",
|
| - ]
|
| +group("reference_less_video_analysis_lib") {
|
| + public_deps = [ "../rtc_tools:reference_less_video_analysis_lib" ]
|
| }
|
|
|
| -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",
|
| - ]
|
| +group("reference_less_video_analysis") {
|
| + public_deps = [ "../rtc_tools:reference_less_video_analysis" ]
|
| }
|
|
|
| -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",
|
| - ]
|
| +group("rgba_to_i420_converter") {
|
| + public_deps = [ "../rtc_tools:rgba_to_i420_converter" ]
|
| }
|
|
|
| -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",
|
| - "../common_video",
|
| - ]
|
| +group("frame_editing_lib") {
|
| + public_deps = [ "../rtc_tools:frame_editing_lib" ]
|
| }
|
|
|
| -rtc_executable("frame_editor") {
|
| - sources = [
|
| - "frame_editing/frame_editing.cc",
|
| - ]
|
| -
|
| - deps = [
|
| - ":command_line_parser",
|
| - ":frame_editing_lib",
|
| - "//build/win:default_exe_manifest",
|
| - ]
|
| +group("frame_editor") {
|
| + public_deps = [ "../rtc_tools:frame_editor" ]
|
| }
|
|
|
| -# 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 = "webrtc/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",
|
| - ]
|
| - 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 = [
|
| - "..:video_stream_api",
|
| - "../base:rtc_base_approved",
|
| - "../call:call_interfaces",
|
| - "../logging:rtc_event_log_impl",
|
| - "../logging:rtc_event_log_parser",
|
| - "../modules:module_api",
|
| - "../modules/audio_coding:ana_debug_dump_proto",
|
| - "../modules/audio_coding:neteq_tools",
|
| -
|
| - # TODO(kwiberg): Remove this dependency.
|
| - "../api/audio_codecs:audio_codecs_api",
|
| - "../modules/congestion_controller",
|
| - "../modules/rtp_rtcp",
|
| - "../system_wrappers:system_wrappers_default",
|
| - "//build/config:exe_and_shlib_deps",
|
| - ]
|
| - public_deps = [
|
| - ":chart_proto",
|
| - "../logging:rtc_event_log_parser",
|
| - ]
|
| + group("force_mic_volume_max") {
|
| + public_deps = [ "../rtc_tools:force_mic_volume_max" ]
|
| }
|
| -}
|
| -
|
| -# Exclude tools depending on gflags since that's not available in Chromium.
|
| -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",
|
| - "../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 = [
|
| - "../base:rtc_base_approved",
|
| - "../modules:module_api",
|
| - "../modules/audio_processing",
|
| - "../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",
|
| - "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",
|
| - "../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) {
|
| + group("chart_proto") {
|
| + public_deps = [ "../rtc_tools:chart_proto" ]
|
| }
|
|
|
| - 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",
|
| - ]
|
| - }
|
| + group("event_log_visualizer_utils") {
|
| + public_deps = [ "../rtc_tools:event_log_visualizer_utils" ]
|
| }
|
| }
|
|
|