admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move frame_generator_capture.{cc, h} and video_capturer.h to video_test_common.

Browse Source 
Remove video_capture as a dependency of test_common and add it as a dependency of modules_unittests, as it was before the refactor in https://codereview.webrtc.org/2629923002

BUG=webrtc:7037
NOTRY=True

Review-Url: https://codereview.webrtc.org/2666113003
Cr-Commit-Position: refs/heads/master@{#16439}
This commit is contained in:
ehmaldonado 2017-02-06 02:21:11 -08:00 committed by Commit bot
parent a7111eb45a
commit 656610fbe7
9 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/BUILD.gn
View File

@ -416,6 +416,7 @@ if (rtc_include_tests) {
"modules/video_capture",
"test:test_common",
"test:test_main",
"test:video_test_common",
"video:video_tests",
]
data = video_engine_tests_resources

1
webrtc/common_video/BUILD.gn
View File

@ -119,6 +119,7 @@ if (rtc_include_tests) {
deps = [
":common_video",
"../modules/video_capture:video_capture",
"../system_wrappers:system_wrappers",
"../test:test_main",
"../test:video_test_common",

2
webrtc/modules/BUILD.gn
View File

@ -52,6 +52,7 @@ if (rtc_include_tests) {
deps = [
"../test:test_main",
"../test:video_test_common",
"audio_coding:audio_coding_modules_tests",
"desktop_capture:desktop_capture_modules_tests",
"rtp_rtcp:rtp_rtcp_modules_tests",
@ -225,6 +226,7 @@ if (rtc_include_tests) {
"remote_bitrate_estimator:remote_bitrate_estimator_unittests",
"rtp_rtcp:rtp_rtcp_unittests",
"utility:utility_unittests",
"video_capture",
"video_coding:video_coding_unittests",
"video_processing:video_processing_unittests",
]

1
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -46,6 +46,7 @@ if (rtc_include_tests) {
"../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"../../test:video_test_support",
]
sources += [
"screen_capturer_integration_test.cc",

1
webrtc/modules/remote_bitrate_estimator/BUILD.gn
View File

@ -199,6 +199,7 @@ if (rtc_include_tests) {
"../../base:rtc_base_approved",
"../../test:test_common",
"../../test:test_main",
"../../test:video_test_common",
"../video_capture",
"//testing/gmock",
"//testing/gtest",

1
webrtc/modules/video_capture/BUILD.gn
View File

@ -31,7 +31,6 @@ rtc_static_library("video_capture_module") {
"../../base:rtc_base_approved",
"../../common_video",
"../../system_wrappers",
"../utility",
]
if (!build_with_chromium && is_clang) {

7
webrtc/modules/video_coding/BUILD.gn
View File

@ -303,6 +303,9 @@ if (rtc_include_tests) {
"../../system_wrappers:metrics_default",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
"../video_capture",
"//third_party/gflags",
]
} # video_quality_measurement
@ -334,6 +337,7 @@ if (rtc_include_tests) {
"../../common_video:common_video",
"../../system_wrappers:system_wrappers",
"../../test:test_support",
"../../test:video_test_support",
]
}
@ -356,6 +360,8 @@ if (rtc_include_tests) {
"../../media:rtc_media_base",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
"../video_capture",
]
if (rtc_use_h264) {
defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ]
@ -431,6 +437,7 @@ if (rtc_include_tests) {
"../../test:field_trial",
"../../test:test_support",
"../../test:video_test_common",
"../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp",
"//testing/gmock",
]

69
webrtc/test/BUILD.gn
View File

@ -37,8 +37,13 @@ rtc_source_set("video_test_common") {
"fake_texture_frame.h",
"frame_generator.cc",
"frame_generator.h",
"frame_generator_capturer.cc",
"frame_generator_capturer.h",
"frame_utils.cc",
"frame_utils.h",
"vcm_capturer.cc",
"vcm_capturer.h",
"video_capturer.h",
]
if (!build_with_chromium && is_clang) {
@ -47,7 +52,9 @@ rtc_source_set("video_test_common") {
}
deps = [
":video_test_support",
"../common_video",
"../modules/video_capture:video_capture_module",
]
}
@ -118,22 +125,59 @@ rtc_source_set("fileutils") {
}
}
rtc_source_set("video_test_support") {
testonly = true
sources = [
"testsupport/frame_reader.cc",
"testsupport/frame_reader.h",
"testsupport/frame_writer.cc",
"testsupport/frame_writer.h",
"testsupport/metrics/video_metrics.cc",
"testsupport/metrics/video_metrics.h",
"testsupport/mock/mock_frame_reader.h",
"testsupport/mock/mock_frame_writer.h",
]
deps = [
"../base:rtc_base_approved",
"../common_video",
"../system_wrappers",
"//testing/gmock",
"//testing/gtest",
"//third_party/gflags",
]
public_deps = [
":fileutils",
]
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" ]
}
if (is_android) {
deps += [ "//base:base" ]
}
if (is_ios) {
deps += [ "//webrtc/sdk:rtc_sdk_common_objc" ]
}
if (rtc_use_memcheck) {
data = valgrind_webrtc_dependencies
}
}
rtc_source_set("test_support") {
testonly = true
sources = [
"gmock.h",
"gtest.h",
"testsupport/frame_reader.cc",
"testsupport/frame_reader.h",
"testsupport/frame_writer.cc",
"testsupport/frame_writer.h",
"testsupport/isolated_output.cc",
"testsupport/isolated_output.h",
"testsupport/metrics/video_metrics.cc",
"testsupport/metrics/video_metrics.h",
"testsupport/mock/mock_frame_reader.h",
"testsupport/mock/mock_frame_writer.h",
"testsupport/packet_reader.cc",
"testsupport/packet_reader.h",
"testsupport/perf_test.cc",
@ -144,7 +188,6 @@ rtc_source_set("test_support") {
]
deps = [
":video_test_common",
"../base:gtest_prod",
"../base:rtc_base_approved",
"../common_video",
@ -250,6 +293,7 @@ rtc_test("test_support_unittests") {
":fileutils_unittests",
":test_common",
":test_main",
":video_test_common",
"../modules/video_capture",
"//testing/gmock",
"//testing/gtest",
@ -292,8 +336,6 @@ rtc_source_set("test_common") {
"fake_network_pipe.cc",
"fake_network_pipe.h",
"fake_videorenderer.h",
"frame_generator_capturer.cc",
"frame_generator_capturer.h",
"layer_filtering_transport.cc",
"layer_filtering_transport.h",
"mock_transport.h",
@ -304,9 +346,6 @@ rtc_source_set("test_common") {
"rtp_rtcp_observer.h",
"statistics.cc",
"statistics.h",
"vcm_capturer.cc",
"vcm_capturer.h",
"video_capturer.h",
"win/run_loop_win.cc",
]
if (!is_win) {
@ -332,8 +371,6 @@ rtc_source_set("test_common") {
"../modules/audio_device:mock_audio_device",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/audio_processing",
"../modules/video_capture:video_capture",
"../modules/video_capture:video_capture_module",
"../video",
"//testing/gmock",
"//testing/gtest",

1
webrtc/voice_engine/BUILD.gn
View File

@ -348,6 +348,7 @@ if (rtc_include_tests) {
"//webrtc/system_wrappers/:system_wrappers_default",
"//webrtc/test/:test_common",
"//webrtc/test/:test_support",
"//webrtc/test/:video_test_common",
]
sources = [