Move webrtc/{tools => rtc_tools}
Leaving compatibility script in webrtc/tools/compare_videos.py to avoid breaking our video quality tests in Chromium. Forwarding GN targets are left in webrtc/tools/BUILD.gn. BUG=webrtc:7855 NOTRY=True NOPRESUBMIT=True Review-Url: https://codereview.webrtc.org/2965593002 Cr-Commit-Position: refs/heads/master@{#18848}
8
.gitignore
vendored
|
@ -57,9 +57,9 @@
|
|||
/tools_webrtc/video_quality_toolchain/mac/zxing
|
||||
/tools_webrtc/video_quality_toolchain/win/*.dll
|
||||
/tools_webrtc/video_quality_toolchain/win/*.exe
|
||||
/webrtc/tools/testing/*.zip
|
||||
/webrtc/tools/testing/*.gz
|
||||
/webrtc/tools/testing/golang/*/*.gz
|
||||
/webrtc/tools/testing/golang/*/*.zip
|
||||
/webrtc/rtc_tools/testing/*.zip
|
||||
/webrtc/rtc_tools/testing/*.gz
|
||||
/webrtc/rtc_tools/testing/golang/*/*.gz
|
||||
/webrtc/rtc_tools/testing/golang/*/*.zip
|
||||
/x86-generic_out/
|
||||
/xcodebuild
|
||||
|
|
2
BUILD.gn
|
@ -13,7 +13,7 @@ group("default") {
|
|||
deps = [
|
||||
"//webrtc",
|
||||
"//webrtc/examples",
|
||||
"//webrtc/tools",
|
||||
"//webrtc/rtc_tools",
|
||||
]
|
||||
if (rtc_include_tests) {
|
||||
deps += [ "//webrtc:webrtc_tests" ]
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
"type": "console_test_launcher",
|
||||
},
|
||||
"tools_unittests": {
|
||||
"label": "//webrtc/tools:tools_unittests",
|
||||
"label": "//webrtc/rtc_tools:tools_unittests",
|
||||
"type": "console_test_launcher",
|
||||
},
|
||||
"video_engine_tests": {
|
||||
|
|
|
@ -23,7 +23,7 @@ include_rules = [
|
|||
"+webrtc/modules/include",
|
||||
"+webrtc/rtc_base",
|
||||
"+webrtc/test",
|
||||
"+webrtc/tools",
|
||||
"+webrtc/rtc_tools",
|
||||
]
|
||||
|
||||
# The below rules will be removed when webrtc:4243 is fixed.
|
||||
|
|
|
@ -549,7 +549,7 @@ if (is_linux || is_win) {
|
|||
deps = [
|
||||
"//webrtc:webrtc_common",
|
||||
"//webrtc/base:rtc_base_approved",
|
||||
"//webrtc/tools:command_line_parser",
|
||||
"//webrtc/rtc_tools:command_line_parser",
|
||||
]
|
||||
if (!build_with_chromium && is_clang) {
|
||||
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include "webrtc/examples/peerconnection/server/data_socket.h"
|
||||
#include "webrtc/examples/peerconnection/server/peer_channel.h"
|
||||
#include "webrtc/examples/peerconnection/server/utils.h"
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
static const size_t kMaxConnections = (FD_SETSIZE - 2);
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ include_rules = [
|
|||
|
||||
specific_include_rules = {
|
||||
".*test\.cc": [
|
||||
"+webrtc/tools",
|
||||
"+webrtc/rtc_tools",
|
||||
# Android platform build has different paths.
|
||||
"+gtest",
|
||||
"+external/webrtc",
|
||||
|
|
|
@ -6,7 +6,7 @@ include_rules = [
|
|||
"+webrtc/common_video",
|
||||
"+webrtc/media/base",
|
||||
"+webrtc/system_wrappers",
|
||||
"+webrtc/tools",
|
||||
"+webrtc/rtc_tools",
|
||||
]
|
||||
|
||||
specific_include_rules = {
|
||||
|
|
350
webrtc/rtc_tools/BUILD.gn
Normal file
|
@ -0,0 +1,350 @@
|
|||
# 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
|
||||
|
||||
public_deps = [
|
||||
":command_line_parser",
|
||||
":frame_analyzer",
|
||||
":frame_editor",
|
||||
":psnr_ssim_analyzer",
|
||||
":rgba_to_i420_converter",
|
||||
]
|
||||
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",
|
||||
]
|
||||
}
|
||||
|
||||
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",
|
||||
]
|
||||
}
|
||||
|
||||
rtc_executable("frame_analyzer") {
|
||||
sources = [
|
||||
"frame_analyzer/frame_analyzer.cc",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":command_line_parser",
|
||||
":video_quality_analysis",
|
||||
"//build/win:default_exe_manifest",
|
||||
]
|
||||
}
|
||||
|
||||
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",
|
||||
]
|
||||
}
|
||||
|
||||
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",
|
||||
]
|
||||
}
|
||||
|
||||
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 = "webrtc/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",
|
||||
]
|
||||
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",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
# 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) {
|
||||
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",
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
|
@ -9,7 +9,7 @@ This script depends on:
|
|||
|
||||
To automatically download Zxing for the encoder script, checkout this directory
|
||||
as a separate gclient solution, like this:
|
||||
gclient config http://webrtc.googlecode.com/svn/trunk/webrtc/tools/barcode_tools
|
||||
gclient config http://webrtc.googlecode.com/svn/trunk/webrtc/rtc_tools/barcode_tools
|
||||
gclient sync
|
||||
Then the Zxing Java source code will be put in third_party/zxing.
|
||||
|
|
@ -260,7 +260,7 @@ def main():
|
|||
"""The main function.
|
||||
|
||||
A simple invocation is:
|
||||
./webrtc/tools/barcode_tools/barcode_decoder.py
|
||||
./webrtc/rtc_tools/barcode_tools/barcode_decoder.py
|
||||
--yuv_file=<path_and_name_of_overlaid_yuv_video>
|
||||
--yuv_frame_width=640 --yuv_frame_height=480
|
||||
--stats_file=<path_and_name_to_stats_file>
|
|
@ -324,7 +324,7 @@ def main():
|
|||
"""The main function.
|
||||
|
||||
A simple invocation will be:
|
||||
./webrtc/tools/barcode_tools/barcode_encoder.py --barcode_height=32
|
||||
./webrtc/rtc_tools/barcode_tools/barcode_encoder.py --barcode_height=32
|
||||
--base_frame_width=352 --base_frame_height=288
|
||||
--base_yuv=<path_and_name_of_base_file>
|
||||
--output_yuv=<path and name_of_output_file>
|
174
webrtc/rtc_tools/compare_videos.py
Executable file
|
@ -0,0 +1,174 @@
|
|||
#!/usr/bin/env python
|
||||
# Copyright (c) 2013 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 optparse
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
# Chrome browsertests will throw away stderr; avoid that output gets lost.
|
||||
sys.stderr = sys.stdout
|
||||
|
||||
|
||||
def _ParseArgs():
|
||||
"""Registers the command-line options."""
|
||||
usage = 'usage: %prog [options]'
|
||||
parser = optparse.OptionParser(usage=usage)
|
||||
|
||||
parser.add_option('--label', type='string', default='MY_TEST',
|
||||
help=('Label of the test, used to identify different '
|
||||
'tests. Default: %default'))
|
||||
parser.add_option('--ref_video', type='string',
|
||||
help='Reference video to compare with (YUV).')
|
||||
parser.add_option('--test_video', type='string',
|
||||
help=('Test video to be compared with the reference '
|
||||
'video (YUV).'))
|
||||
parser.add_option('--frame_analyzer', type='string',
|
||||
help='Path to the frame analyzer executable.')
|
||||
parser.add_option('--barcode_decoder', type='string',
|
||||
help=('Path to the barcode decoder script. By default, we '
|
||||
'will assume we can find it in barcode_tools/'
|
||||
'relative to this directory.'))
|
||||
parser.add_option('--ffmpeg_path', type='string',
|
||||
help=('The path to where the ffmpeg executable is located. '
|
||||
'If omitted, it will be assumed to be present in the '
|
||||
'PATH with the name ffmpeg[.exe].'))
|
||||
parser.add_option('--zxing_path', type='string',
|
||||
help=('The path to where the zxing executable is located. '
|
||||
'If omitted, it will be assumed to be present in the '
|
||||
'PATH with the name zxing[.exe].'))
|
||||
parser.add_option('--stats_file_ref', type='string', default='stats_ref.txt',
|
||||
help=('Path to the temporary stats file to be created and '
|
||||
'used for the reference video file. '
|
||||
'Default: %default'))
|
||||
parser.add_option('--stats_file_test', type='string',
|
||||
default='stats_test.txt',
|
||||
help=('Path to the temporary stats file to be created and '
|
||||
'used for the test video file. Default: %default'))
|
||||
parser.add_option('--stats_file', type='string',
|
||||
help=('DEPRECATED'))
|
||||
parser.add_option('--yuv_frame_width', type='int', default=640,
|
||||
help='Width of the YUV file\'s frames. Default: %default')
|
||||
parser.add_option('--yuv_frame_height', type='int', default=480,
|
||||
help='Height of the YUV file\'s frames. Default: %default')
|
||||
options, _ = parser.parse_args()
|
||||
|
||||
if options.stats_file:
|
||||
options.stats_file_test = options.stats_file
|
||||
print ('WARNING: Using deprecated switch --stats_file. '
|
||||
'The new flag is --stats_file_test.')
|
||||
|
||||
if not options.ref_video:
|
||||
parser.error('You must provide a path to the reference video!')
|
||||
if not os.path.exists(options.ref_video):
|
||||
parser.error('Cannot find the reference video at %s' % options.ref_video)
|
||||
|
||||
if not options.test_video:
|
||||
parser.error('You must provide a path to the test video!')
|
||||
if not os.path.exists(options.test_video):
|
||||
parser.error('Cannot find the test video at %s' % options.test_video)
|
||||
|
||||
if not options.frame_analyzer:
|
||||
parser.error('You must provide the path to the frame analyzer executable!')
|
||||
if not os.path.exists(options.frame_analyzer):
|
||||
parser.error('Cannot find frame analyzer executable at %s!' %
|
||||
options.frame_analyzer)
|
||||
return options
|
||||
|
||||
def _DevNull():
|
||||
"""On Windows, sometimes the inherited stdin handle from the parent process
|
||||
fails. Workaround this by passing null to stdin to the subprocesses commands.
|
||||
This function can be used to create the null file handler.
|
||||
"""
|
||||
return open(os.devnull, 'r')
|
||||
|
||||
def DecodeBarcodesInVideo(options, path_to_decoder, video, stat_file):
|
||||
# Run barcode decoder on the test video to identify frame numbers.
|
||||
png_working_directory = tempfile.mkdtemp()
|
||||
cmd = [
|
||||
sys.executable,
|
||||
path_to_decoder,
|
||||
'--yuv_file=%s' % video,
|
||||
'--yuv_frame_width=%d' % options.yuv_frame_width,
|
||||
'--yuv_frame_height=%d' % options.yuv_frame_height,
|
||||
'--stats_file=%s' % stat_file,
|
||||
'--png_working_dir=%s' % png_working_directory,
|
||||
]
|
||||
if options.zxing_path:
|
||||
cmd.append('--zxing_path=%s' % options.zxing_path)
|
||||
if options.ffmpeg_path:
|
||||
cmd.append('--ffmpeg_path=%s' % options.ffmpeg_path)
|
||||
|
||||
|
||||
barcode_decoder = subprocess.Popen(cmd, stdin=_DevNull(),
|
||||
stdout=sys.stdout, stderr=sys.stderr)
|
||||
barcode_decoder.wait()
|
||||
|
||||
shutil.rmtree(png_working_directory)
|
||||
if barcode_decoder.returncode != 0:
|
||||
print 'Failed to run barcode decoder script.'
|
||||
return 1
|
||||
return 0
|
||||
|
||||
def main():
|
||||
"""The main function.
|
||||
|
||||
A simple invocation is:
|
||||
./webrtc/rtc_tools/barcode_tools/compare_videos.py
|
||||
--ref_video=<path_and_name_of_reference_video>
|
||||
--test_video=<path_and_name_of_test_video>
|
||||
--frame_analyzer=<path_and_name_of_the_frame_analyzer_executable>
|
||||
|
||||
Notice that the prerequisites for barcode_decoder.py also applies to this
|
||||
script. The means the following executables have to be available in the PATH:
|
||||
* zxing
|
||||
* ffmpeg
|
||||
"""
|
||||
options = _ParseArgs()
|
||||
|
||||
if options.barcode_decoder:
|
||||
path_to_decoder = options.barcode_decoder
|
||||
else:
|
||||
path_to_decoder = os.path.join(SCRIPT_DIR, 'barcode_tools',
|
||||
'barcode_decoder.py')
|
||||
|
||||
if DecodeBarcodesInVideo(options, path_to_decoder,
|
||||
options.ref_video, options.stats_file_ref) != 0:
|
||||
return 1
|
||||
if DecodeBarcodesInVideo(options, path_to_decoder,
|
||||
options.test_video, options.stats_file_test) != 0:
|
||||
return 1
|
||||
|
||||
# Run frame analyzer to compare the videos and print output.
|
||||
cmd = [
|
||||
options.frame_analyzer,
|
||||
'--label=%s' % options.label,
|
||||
'--reference_file=%s' % options.ref_video,
|
||||
'--test_file=%s' % options.test_video,
|
||||
'--stats_file_ref=%s' % options.stats_file_ref,
|
||||
'--stats_file_test=%s' % options.stats_file_test,
|
||||
'--width=%d' % options.yuv_frame_width,
|
||||
'--height=%d' % options.yuv_frame_height,
|
||||
]
|
||||
frame_analyzer = subprocess.Popen(cmd, stdin=_DevNull(),
|
||||
stdout=sys.stdout, stderr=sys.stderr)
|
||||
frame_analyzer.wait()
|
||||
if frame_analyzer.returncode != 0:
|
||||
print 'Failed to run frame analyzer.'
|
||||
return 1
|
||||
|
||||
return 0
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
|
@ -14,7 +14,7 @@
|
|||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
#include "webrtc/tools/converter/converter.h"
|
||||
#include "webrtc/rtc_tools/converter/converter.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#define SEPARATOR '\\'
|
|
@ -8,8 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TOOLS_CONVERTER_CONVERTER_H_
|
||||
#define WEBRTC_TOOLS_CONVERTER_CONVERTER_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_
|
||||
#define WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
|
@ -106,4 +106,4 @@ class Converter {
|
|||
} // namespace test
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_CONVERTER_CONVERTER_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_CONVERTER_CONVERTER_H_
|
|
@ -15,8 +15,8 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/tools/converter/converter.h"
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/converter/converter.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
/*
|
||||
* A command-line tool based on libyuv to convert a set of RGBA files to a YUV
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/event_log_visualizer/analyzer.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <limits>
|
|
@ -8,8 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
||||
#define WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
||||
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
@ -23,7 +23,7 @@
|
|||
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
|
||||
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
#include "webrtc/tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace plotting {
|
||||
|
@ -203,4 +203,4 @@ class EventLogAnalyzer {
|
|||
} // namespace plotting
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
#include "webrtc/base/flags.h"
|
||||
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h"
|
||||
#include "webrtc/test/field_trial.h"
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/tools/event_log_visualizer/analyzer.h"
|
||||
#include "webrtc/tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/tools/event_log_visualizer/plot_python.h"
|
||||
|
||||
DEFINE_bool(incoming, true, "Plot statistics for incoming packets.");
|
||||
DEFINE_bool(outgoing, true, "Plot statistics for outgoing packets.");
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
|
@ -7,8 +7,8 @@
|
|||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
||||
#define WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
||||
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
@ -137,4 +137,4 @@ class PlotCollection {
|
|||
} // namespace plotting
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/event_log_visualizer/plot_protobuf.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h"
|
||||
|
||||
#include <memory>
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
||||
#define WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
||||
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
||||
|
||||
#include "webrtc/base/ignore_wundef.h"
|
||||
RTC_PUSH_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/event_log_visualizer/chart.pb.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h"
|
||||
RTC_POP_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace plotting {
|
||||
|
@ -39,4 +39,4 @@ class ProtobufPlotCollection final : public PlotCollection {
|
|||
} // namespace plotting
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/event_log_visualizer/plot_python.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
||||
#define WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
||||
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
||||
|
||||
#include "webrtc/tools/event_log_visualizer/plot_base.h"
|
||||
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace plotting {
|
||||
|
@ -33,4 +33,4 @@ class PythonPlotCollection final : public PlotCollection {
|
|||
} // namespace plotting
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
|
|
@ -15,8 +15,8 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
/*
|
||||
* A command line tool running PSNR and SSIM on a reference video and a test
|
|
@ -11,8 +11,8 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "webrtc/tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
// This captures the freezing metrics for reference less video analysis.
|
|
@ -14,8 +14,8 @@
|
|||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h"
|
||||
|
||||
#define STATS_LINE_LENGTH 28
|
||||
#define PSNR_FREEZE_THRESHOLD 47
|
||||
|
@ -90,7 +90,7 @@ void print_freezing_metrics(const std::vector<double>& psnr_per_frame,
|
|||
* 5) Total different identical frames found.
|
||||
*
|
||||
* Sample output:
|
||||
* Printing metrics for file: /src/webrtc/tools/test_3.y4m
|
||||
* Printing metrics for file: /src/webrtc/rtc_tools/test_3.y4m
|
||||
=============================
|
||||
Total number of frames received: 74
|
||||
Total identical frames: 5
|
|
@ -8,8 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
||||
#define WEBRTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
||||
#define WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -47,4 +47,4 @@ bool check_file_extension(const std::string& video_file_name);
|
|||
// for a list of video files.
|
||||
int run_analysis(const std::string& video_file);
|
||||
|
||||
#endif // WEBRTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_FRAME_ANALYZER_REFERENCE_LESS_VIDEO_ANALYSIS_LIB_H_
|
|
@ -13,9 +13,9 @@
|
|||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
#include "webrtc/test/gtest.h"
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/tools/frame_analyzer/reference_less_video_analysis_lib.h"
|
||||
|
||||
class ReferenceLessVideoAnalysisTest : public ::testing::Test {
|
||||
public:
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
|
@ -8,8 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
||||
#define WEBRTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
||||
#define WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
@ -147,4 +147,4 @@ bool ExtractFrameFromY4mFile(const char* i420_file_name,
|
|||
} // namespace test
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_FRAME_ANALYZER_VIDEO_QUALITY_ANALYSIS_H_
|
|
@ -15,9 +15,9 @@
|
|||
#include <fstream>
|
||||
#include <string>
|
||||
|
||||
#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/test/gtest.h"
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace test {
|
|
@ -8,13 +8,13 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/frame_editing/frame_editing_lib.h"
|
||||
#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
// A command-line tool to edit a YUV-video (I420 sub-sampled).
|
||||
int main(int argc, char** argv) {
|
|
@ -15,7 +15,7 @@
|
|||
#include <string>
|
||||
|
||||
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
||||
#include "webrtc/tools/frame_editing/frame_editing_lib.h"
|
||||
#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
namespace webrtc {
|
|
@ -8,8 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
||||
#define WEBRTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
||||
#ifndef WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
||||
#define WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
|
@ -36,4 +36,4 @@ int EditFrames(const std::string& in_path, int width, int height,
|
|||
int last_frame_to_process, const std::string& out_path);
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
||||
#endif // WEBRTC_RTC_TOOLS_FRAME_EDITING_FRAME_EDITING_LIB_H_
|
|
@ -15,9 +15,9 @@
|
|||
#include <memory>
|
||||
|
||||
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
||||
#include "webrtc/rtc_tools/frame_editing/frame_editing_lib.h"
|
||||
#include "webrtc/test/gtest.h"
|
||||
#include "webrtc/test/testsupport/fileutils.h"
|
||||
#include "webrtc/tools/frame_editing/frame_editing_lib.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace test {
|
|
@ -14,14 +14,14 @@ if (rtc_enable_protobuf) {
|
|||
sources = [
|
||||
"network_tester_config.proto",
|
||||
]
|
||||
proto_out_dir = "webrtc/tools/network_tester"
|
||||
proto_out_dir = "webrtc/rtc_tools/network_tester"
|
||||
}
|
||||
|
||||
proto_library("network_tester_packet_proto") {
|
||||
sources = [
|
||||
"network_tester_packet.proto",
|
||||
]
|
||||
proto_out_dir = "webrtc/tools/network_tester"
|
||||
proto_out_dir = "webrtc/rtc_tools/network_tester"
|
||||
}
|
||||
|
||||
rtc_static_library("network_tester") {
|
||||
|
@ -75,7 +75,7 @@ if (rtc_enable_protobuf) {
|
|||
# gets additional generated targets which would require many lines here to
|
||||
# cover (which would be confusing to read and hard to maintain).
|
||||
if (!is_android && !is_ios) {
|
||||
visibility = [ "//webrtc/tools:tools_unittests" ]
|
||||
visibility = [ "//webrtc/rtc_tools:tools_unittests" ]
|
||||
}
|
||||
sources = [
|
||||
"network_tester_unittest.cc",
|
||||
|
@ -134,7 +134,7 @@ if (is_android) {
|
|||
"//webrtc/rtc_base:base_java",
|
||||
]
|
||||
|
||||
shared_libraries = [ "//webrtc/tools/network_tester:network_tester_so" ]
|
||||
shared_libraries = [ "//webrtc/rtc_tools/network_tester:network_tester_so" ]
|
||||
}
|
||||
|
||||
android_library("NetworkTesterMobile_javalib") {
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 7.5 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
@ -7,7 +7,7 @@
|
|||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#include "webrtc/tools/network_tester/config_reader.h"
|
||||
#include "webrtc/rtc_tools/network_tester/config_reader.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#ifdef WEBRTC_NETWORK_TESTER_PROTO
|
||||
RTC_PUSH_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/network_tester/network_tester_config.pb.h"
|
||||
#include "webrtc/rtc_tools/network_tester/network_tester_config.pb.h"
|
||||
RTC_POP_IGNORING_WUNDEF()
|
||||
using webrtc::network_tester::config::NetworkTesterAllConfigs;
|
||||
#else
|
|
@ -13,7 +13,7 @@
|
|||
#define JNIEXPORT __attribute__((visibility("default")))
|
||||
#include <string>
|
||||
|
||||
#include "webrtc/tools/network_tester/test_controller.h"
|
||||
#include "webrtc/rtc_tools/network_tester/test_controller.h"
|
||||
|
||||
extern "C" JNIEXPORT jlong JNICALL
|
||||
Java_com_google_media_networktester_NetworkTester_CreateTestController(
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#ifdef WEBRTC_NETWORK_TESTER_TEST_ENABLED
|
||||
|
||||
#include "webrtc/tools/network_tester/test_controller.h"
|
||||
#include "webrtc/rtc_tools/network_tester/test_controller.h"
|
||||
|
||||
#include "webrtc/base/gunit.h"
|
||||
#include "webrtc/test/gtest.h"
|
|
@ -7,7 +7,7 @@
|
|||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#include "webrtc/tools/network_tester/packet_logger.h"
|
||||
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
|
||||
|
||||
#include "webrtc/base/checks.h"
|
||||
#include "webrtc/base/protobuf_utils.h"
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#ifdef WEBRTC_NETWORK_TESTER_PROTO
|
||||
RTC_PUSH_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/network_tester/network_tester_packet.pb.h"
|
||||
#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h"
|
||||
RTC_POP_IGNORING_WUNDEF()
|
||||
using webrtc::network_tester::packet::NetworkTesterPacket;
|
||||
#else
|
|
@ -8,15 +8,15 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/network_tester/packet_sender.h"
|
||||
#include "webrtc/rtc_tools/network_tester/packet_sender.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
#include "webrtc/base/timeutils.h"
|
||||
#include "webrtc/tools/network_tester/config_reader.h"
|
||||
#include "webrtc/tools/network_tester/test_controller.h"
|
||||
#include "webrtc/rtc_tools/network_tester/config_reader.h"
|
||||
#include "webrtc/rtc_tools/network_tester/test_controller.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#ifdef WEBRTC_NETWORK_TESTER_PROTO
|
||||
RTC_PUSH_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/network_tester/network_tester_packet.pb.h"
|
||||
#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h"
|
||||
RTC_POP_IGNORING_WUNDEF()
|
||||
using webrtc::network_tester::packet::NetworkTesterPacket;
|
||||
#else
|
|
@ -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.
|
||||
|
||||
# To run this script please copy "out/<build_name>/pyproto/webrtc/tools/
|
||||
# To run this script please copy "out/<build_name>/pyproto/webrtc/rtc_tools/
|
||||
# network_tester/network_tester_packet_pb2.py" next to this script.
|
||||
# The you can run this script with:
|
||||
# "python parse_packet_log.py -f packet_log.dat"
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/network_tester/test_controller.h"
|
||||
#include "webrtc/rtc_tools/network_tester/test_controller.h"
|
||||
|
||||
int main() {
|
||||
webrtc::TestController server(9090, 9090, "server_config.dat",
|
|
@ -8,7 +8,7 @@
|
|||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/tools/network_tester/test_controller.h"
|
||||
#include "webrtc/rtc_tools/network_tester/test_controller.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
|
@ -21,12 +21,12 @@
|
|||
#include "webrtc/base/ignore_wundef.h"
|
||||
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
|
||||
#include "webrtc/p2p/base/udptransport.h"
|
||||
#include "webrtc/tools/network_tester/packet_logger.h"
|
||||
#include "webrtc/tools/network_tester/packet_sender.h"
|
||||
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
|
||||
#include "webrtc/rtc_tools/network_tester/packet_sender.h"
|
||||
|
||||
#ifdef WEBRTC_NETWORK_TESTER_PROTO
|
||||
RTC_PUSH_IGNORING_WUNDEF()
|
||||
#include "webrtc/tools/network_tester/network_tester_packet.pb.h"
|
||||
#include "webrtc/rtc_tools/network_tester/network_tester_packet.pb.h"
|
||||
RTC_POP_IGNORING_WUNDEF()
|
||||
using webrtc::network_tester::packet::NetworkTesterPacket;
|
||||
#else
|
|
@ -16,8 +16,8 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
#include "webrtc/rtc_tools/frame_analyzer/video_quality_analysis.h"
|
||||
#include "webrtc/rtc_tools/simple_command_line_parser.h"
|
||||
|
||||
#define MAX_NUM_FRAMES_PER_FILE INT_MAX
|
||||
|