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

Move test utilities into more specific build targets

Browse Source 
Move audio- and video-specific utilities to audio_test_common (newly
added target) and video_test_common.

Bug: webrtc:10198
Change-Id: Ia10fa5c0a51d9b1f37db4964984d22fc5b269bb1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268980
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37570}
This commit is contained in:
Niels Möller
2022-07-20 10:20:33 +02:00
committed by WebRTC LUCI CQ
parent 866caeb62c
commit 07d80675e2
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/audio_coding/BUILD.gn
View File

@ -1557,7 +1557,7 @@ if (rtc_include_tests) {
":neteq_test_tools", ":neteq_test_tools",
"../../api/audio_codecs:builtin_audio_decoder_factory", "../../api/audio_codecs:builtin_audio_decoder_factory",
"../../api/neteq:neteq_api", "../../api/neteq:neteq_api",
"../../test:audio_codec_mocks", "../../test:audio_test_common",
"../../test:field_trial", "../../test:field_trial",
"../../test:test_support", "../../test:test_support",
] ]
@ -2111,6 +2111,7 @@ if (rtc_include_tests) {
"../../rtc_base/system:arch", "../../rtc_base/system:arch",
"../../system_wrappers", "../../system_wrappers",
"../../test:audio_codec_mocks", "../../test:audio_codec_mocks",
"../../test:audio_test_common",
"../../test:field_trial", "../../test:field_trial",
"../../test:fileutils", "../../test:fileutils",
"../../test:rtc_expect_death", "../../test:rtc_expect_death",

28
test/BUILD.gn
View File

@ -97,6 +97,7 @@ rtc_library("video_test_common") {
sources = [ sources = [
"fake_texture_frame.cc", "fake_texture_frame.cc",
"fake_texture_frame.h", "fake_texture_frame.h",
"fake_videorenderer.h",
"frame_forwarder.cc", "frame_forwarder.cc",
"frame_forwarder.h", "frame_forwarder.h",
"frame_generator_capturer.cc", "frame_generator_capturer.cc",
@ -106,6 +107,9 @@ rtc_library("video_test_common") {
"test_video_capturer.cc", "test_video_capturer.cc",
"test_video_capturer.h", "test_video_capturer.h",
"video_codec_settings.h", "video_codec_settings.h",
"video_decoder_proxy_factory.h",
"video_encoder_nullable_proxy_factory.h",
"video_encoder_proxy_factory.h",
] ]
deps = [ deps = [
@ -139,6 +143,20 @@ rtc_library("video_test_common") {
] ]
} }
rtc_library("audio_test_common") {
visibility = [ "*" ]
testonly = true
sources = [
"audio_decoder_proxy_factory.h",
"function_audio_decoder_factory.h",
]
deps = [
"../api/audio_codecs:audio_codecs_api",
"../rtc_base:checks",
]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
}
if (!build_with_chromium) { if (!build_with_chromium) {
if (is_mac || is_ios) { if (is_mac || is_ios) {
rtc_library("video_test_mac") { rtc_library("video_test_mac") {
@ -919,13 +937,9 @@ rtc_library("test_common") {
"call_test.h", "call_test.h",
"drifting_clock.cc", "drifting_clock.cc",
"drifting_clock.h", "drifting_clock.h",
"fake_videorenderer.h",
"layer_filtering_transport.cc", "layer_filtering_transport.cc",
"layer_filtering_transport.h", "layer_filtering_transport.h",
"rtp_rtcp_observer.h", "rtp_rtcp_observer.h",
"video_decoder_proxy_factory.h",
"video_encoder_nullable_proxy_factory.h",
"video_encoder_proxy_factory.h",
] ]
deps = [ deps = [
@ -1100,10 +1114,6 @@ rtc_library("test_renderer_generic") {
rtc_library("audio_codec_mocks") { rtc_library("audio_codec_mocks") {
testonly = true testonly = true
sources = [ sources = [
# TODO(nisse): Move these factories to their own target, to avoid
# unnecessary dependencies on gmock and gtest.
"audio_decoder_proxy_factory.h",
"function_audio_decoder_factory.h",
"mock_audio_decoder.cc", "mock_audio_decoder.cc",
"mock_audio_decoder.h", "mock_audio_decoder.h",
"mock_audio_decoder_factory.h", "mock_audio_decoder_factory.h",
@ -1119,9 +1129,7 @@ rtc_library("audio_codec_mocks") {
"../api:scoped_refptr", "../api:scoped_refptr",
"../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:audio_codecs_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../rtc_base:checks",
] ]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
} }
rtc_library("copy_to_file_audio_capturer") { rtc_library("copy_to_file_audio_capturer") {