Move frame_generator_capturer.h|cc to the new target
Bug: b/272350185
Change-Id: I3b04e374acb626bec16df22bb63f198b45b790dd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/300963
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39831}
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 32e5ca6..19dd5d6 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -525,13 +525,13 @@
"../test:explicit_key_value_config",
"../test:fake_video_codecs",
"../test:field_trial",
+ "../test:frame_generator_capturer",
"../test:mock_frame_transformer",
"../test:mock_transport",
"../test:run_loop",
"../test:scoped_key_value_config",
"../test:test_common",
"../test:test_support",
- "../test:video_test_common",
"../test/scenario",
"../test/time_controller:time_controller",
"../video",
@@ -601,6 +601,7 @@
"../test:fake_video_codecs",
"../test:field_trial",
"../test:fileutils",
+ "../test:frame_generator_capturer",
"../test:null_transport",
"../test:test_common",
"../test:test_support",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index f93b339..0bdaa27 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -2834,9 +2834,9 @@
"../rtc_base/synchronization:mutex",
"../rtc_base/task_utils:repeating_task",
"../rtc_base/third_party/sigslot",
+ "../test:frame_generator_capturer",
"../test:scoped_key_value_config",
"../test:test_support",
- "../test:video_test_common",
]
absl_deps = [
"//third_party/abseil-cpp/absl/algorithm:container",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index ad02233..d9b7379 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -190,14 +190,6 @@
]
deps = [
- "../api:create_frame_generator",
- "../api:rtp_parameters",
- "../api:transport_api",
- "../api/rtc_event_log",
- "../api/task_queue:default_task_queue_factory",
- "../api/task_queue:task_queue",
- "../api/video:builtin_video_bitrate_allocator_factory",
- "../api/video_codecs:video_codecs_api",
"..//api/video_codecs:video_decoder_factory_template",
"..//api/video_codecs:video_decoder_factory_template_dav1d_adapter",
"..//api/video_codecs:video_decoder_factory_template_libvpx_vp8_adapter",
@@ -208,6 +200,14 @@
"..//api/video_codecs:video_encoder_factory_template_libvpx_vp8_adapter",
"..//api/video_codecs:video_encoder_factory_template_libvpx_vp9_adapter",
"..//api/video_codecs:video_encoder_factory_template_open_h264_adapter",
+ "../api:create_frame_generator",
+ "../api:rtp_parameters",
+ "../api:transport_api",
+ "../api/rtc_event_log",
+ "../api/task_queue:default_task_queue_factory",
+ "../api/task_queue:task_queue",
+ "../api/video:builtin_video_bitrate_allocator_factory",
+ "../api/video_codecs:video_codecs_api",
"../call",
"../call:call_interfaces",
"../call:fake_network",
@@ -223,8 +223,8 @@
"../rtc_base:threading",
"../rtc_base/system:file_wrapper",
"../test:fileutils",
+ "../test:frame_generator_capturer",
"../test:rtp_test_utils",
- "../test:video_test_common",
"../video/config:encoder_config",
"../video/config:streams_config",
"//third_party/abseil-cpp/absl/flags:flag",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index f3be88a..6e04015 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -129,8 +129,27 @@
rtc_library("frame_generator_capturer") {
visibility = [ "*" ]
testonly = true
- sources = [ "frame_generator_capturer_tmp.h" ]
- deps = [ ":video_test_common" ]
+ sources = [
+ "frame_generator_capturer.cc",
+ "frame_generator_capturer.h",
+ "frame_generator_capturer_tmp.h",
+ ]
+ deps = [
+ ":fileutils",
+ ":test_video_capturer",
+ "../api:create_frame_generator",
+ "../api:frame_generator_api",
+ "../api/task_queue",
+ "../api/video:video_frame",
+ "../rtc_base:checks",
+ "../rtc_base:logging",
+ "../rtc_base:rtc_task_queue",
+ "../rtc_base:timeutils",
+ "../rtc_base/synchronization:mutex",
+ "../rtc_base/task_utils:repeating_task",
+ "../system_wrappers",
+ ]
+ absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
}
rtc_library("video_test_common") {
@@ -142,8 +161,6 @@
"fake_videorenderer.h",
"frame_forwarder.cc",
"frame_forwarder.h",
- "frame_generator_capturer.cc",
- "frame_generator_capturer.h",
"mappable_native_buffer.cc",
"mappable_native_buffer.h",
"video_codec_settings.h",
@@ -667,6 +684,7 @@
":fileutils",
":fileutils_unittests",
":fixed_fps_video_frame_writer_adapter_test",
+ ":frame_generator_capturer",
":frame_generator_impl",
":perf_test",
":rtc_expect_death",
@@ -1036,6 +1054,7 @@
":encoder_settings",
":fake_video_codecs",
":fileutils",
+ ":frame_generator_capturer",
":mock_transport",
":run_loop",
":scoped_key_value_config",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 0d5d13d..e49b0107 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -142,8 +142,8 @@
":test_peer",
":test_video_capturer_video_track_source",
"../..:fileutils",
+ "../..:frame_generator_capturer",
"../..:platform_video_capturer",
- "../..:video_test_common",
"../../../api:create_frame_generator",
"../../../api:frame_generator_api",
"../../../api:media_stream_interface",
diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn
index 80a0ad9..93bed3e 100644
--- a/test/peer_scenario/BUILD.gn
+++ b/test/peer_scenario/BUILD.gn
@@ -24,8 +24,8 @@
deps = [
"..:fake_video_codecs",
"..:fileutils",
+ "..:frame_generator_capturer",
"..:test_support",
- "../:video_test_common",
"../../api:candidate",
"../../api:create_time_controller",
"../../api:libjingle_peerconnection_api",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 5f3b087..7051b34 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -69,6 +69,7 @@
]
deps = [
":column_printer",
+ "..:frame_generator_capturer",
"..:test_video_capturer",
"../:fake_video_codecs",
"../:fileutils",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 4f5490d..544f2c5 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -903,6 +903,7 @@
"../test:fake_video_codecs",
"../test:field_trial",
"../test:fileutils",
+ "../test:frame_generator_capturer",
"../test:frame_utils",
"../test:mock_frame_transformer",
"../test:mock_transport",
