Avoid using GlobalTaskQueueFactory for TaskQueueForTest
To remove global task factory, rtc::TaskQueue need to loose it's convenient constructor
TaskQueueForTest can be used instead in tests and keep the convenient constructor.
Also cleanup the TaskQueueForTest a bit:
move the class to webrtc namespace
add default constructor
disallow copy using language construct instead of macro
cleanup build dependencies
rename build target (to match move out of the rtc namespace)
Bug: webrtc:10284
Change-Id: I17fddf3f8d4f363df7d495c28a5b0a28abda1ba7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127571
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27193}diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 8f6fa0c..b6314bd 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -585,7 +585,6 @@
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_task_queue",
- "../../rtc_base:rtc_task_queue_for_test",
"../../rtc_base:sequenced_task_checker",
"../../rtc_base/task_utils:to_queued_task",
"../../test:test_support",
@@ -663,7 +662,7 @@
"../../rtc_base:rtc_base_approved",
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:rtc_event",
- "../../rtc_base:rtc_task_queue_for_test",
+ "../../rtc_base:task_queue_for_test",
"../../system_wrappers",
"../../test:fileutils",
"../../test:perf_test",
@@ -849,7 +848,7 @@
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:rtc_numerics",
"../../rtc_base:rtc_task_queue",
- "../../rtc_base:rtc_task_queue_for_test",
+ "../../rtc_base:task_queue_for_test",
"../../rtc_base/experiments:jitter_upper_bound_experiment",
"../../system_wrappers",
"../../system_wrappers:field_trial",
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index e38fcaf..f49b0ce 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -405,7 +405,7 @@
// To emulate operation on a production VideoStreamEncoder, we call the
// codecs on a task queue.
- rtc::test::TaskQueueForTest task_queue("VidProc TQ");
+ TaskQueueForTest task_queue("VidProc TQ");
SetUpAndInitObjects(&task_queue,
static_cast<const int>(rate_profiles[0].target_kbps),
@@ -625,7 +625,7 @@
}
void VideoCodecTestFixtureImpl::SetUpAndInitObjects(
- rtc::test::TaskQueueForTest* task_queue,
+ TaskQueueForTest* task_queue,
int initial_bitrate_kbps,
int initial_framerate_fps) {
config_.codec_settings.minBitrate = 0;
@@ -681,7 +681,7 @@
}
void VideoCodecTestFixtureImpl::ReleaseAndCloseObjects(
- rtc::test::TaskQueueForTest* task_queue) {
+ TaskQueueForTest* task_queue) {
task_queue->SendTask([this]() {
processor_.reset();
// The VideoProcessor must be destroyed before the codecs.
@@ -702,7 +702,7 @@
}
void VideoCodecTestFixtureImpl::PrintSettings(
- rtc::test::TaskQueueForTest* task_queue) const {
+ TaskQueueForTest* task_queue) const {
printf("==> Config\n");
printf("%s\n", config_.ToString().c_str());
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h
index a54f6bd..9f4dbc5 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.h
@@ -62,10 +62,10 @@
void CreateEncoderAndDecoder();
void DestroyEncoderAndDecoder();
- void SetUpAndInitObjects(rtc::test::TaskQueueForTest* task_queue,
+ void SetUpAndInitObjects(TaskQueueForTest* task_queue,
int initial_bitrate_kbps,
int initial_framerate_fps);
- void ReleaseAndCloseObjects(rtc::test::TaskQueueForTest* task_queue);
+ void ReleaseAndCloseObjects(TaskQueueForTest* task_queue);
void ProcessAllFrames(rtc::TaskQueue* task_queue,
const std::vector<RateProfile>& rate_profiles);
@@ -83,7 +83,7 @@
size_t target_bitrate_kbps,
float input_framerate_fps);
- void PrintSettings(rtc::test::TaskQueueForTest* task_queue) const;
+ void PrintSettings(TaskQueueForTest* task_queue) const;
// Codecs.
const std::unique_ptr<VideoEncoderFactory> encoder_factory_;
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index dbf8300..4a9c3aa 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
@@ -77,7 +77,7 @@
EXPECT_CALL(*decoder_mock_, RegisterDecodeCompleteCallback(_)).Times(1);
}
- rtc::test::TaskQueueForTest q_;
+ TaskQueueForTest q_;
VideoCodecTestFixture::Config config_;