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

Use explicit TaskQueueFactory for FrameGeneratorCapturer in CallTest.

Browse Source 
This replaces the implicit usage of GlobalTaskQueueFactory with an explicitly provided DefaultTaskQueueFactory instance.

Bug: webrtc:10284
Change-Id: I4a97724ca69829c245c3d1c5e69bedf8755ce5f5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133486
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27687}
This commit is contained in:
Danil Chapovalov
2019-04-18 10:58:56 +02:00
committed by Commit Bot
parent ad60afbd0f
commit a92e6249c7
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/BUILD.gn
View File

@ -705,6 +705,8 @@ rtc_source_set("test_common") {
"../api:transport_api", "../api:transport_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory",
"../api/task_queue",
"../api/task_queue:default_task_queue_factory",
"../api/test/video:function_video_factory", "../api/test/video:function_video_factory",
"../api/video:builtin_video_bitrate_allocator_factory", "../api/video:builtin_video_bitrate_allocator_factory",
"../api/video:video_bitrate_allocator_factory", "../api/video:video_bitrate_allocator_factory",

28
test/call_test.cc
View File

@ -15,6 +15,7 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "api/task_queue/default_task_queue_factory.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h" #include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video_codecs/video_encoder_config.h" #include "api/video_codecs/video_encoder_config.h"
#include "call/fake_network_pipe.h" #include "call/fake_network_pipe.h"
@ -30,6 +31,7 @@ namespace test {
CallTest::CallTest() CallTest::CallTest()
: clock_(Clock::GetRealTimeClock()), : clock_(Clock::GetRealTimeClock()),
task_queue_factory_(CreateDefaultTaskQueueFactory()),
send_event_log_(RtcEventLog::CreateNull()), send_event_log_(RtcEventLog::CreateNull()),
recv_event_log_(RtcEventLog::CreateNull()), recv_event_log_(RtcEventLog::CreateNull()),
audio_send_config_(/*send_transport=*/nullptr, audio_send_config_(/*send_transport=*/nullptr,
@ -459,10 +461,15 @@ void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
int width, int width,
int height) { int height) {
video_sources_.clear(); video_sources_.clear();
frame_generator_capturer_ = test::FrameGeneratorCapturer::Create( auto frame_generator_capturer =
width, height, absl::nullopt, absl::nullopt, framerate * speed, clock); absl::make_unique<test::FrameGeneratorCapturer>(
video_sources_.emplace_back( clock,
std::unique_ptr<FrameGeneratorCapturer>(frame_generator_capturer_)); test::FrameGenerator::CreateSquareGenerator(
width, height, absl::nullopt, absl::nullopt),
framerate * speed, *task_queue_factory_);
frame_generator_capturer_ = frame_generator_capturer.get();
frame_generator_capturer->Init();
video_sources_.push_back(std::move(frame_generator_capturer));
ConnectVideoSourcesToStreams(); ConnectVideoSourcesToStreams();
} }
@ -470,10 +477,15 @@ void CallTest::CreateFrameGeneratorCapturer(int framerate,
int width, int width,
int height) { int height) {
video_sources_.clear(); video_sources_.clear();
frame_generator_capturer_ = test::FrameGeneratorCapturer::Create( auto frame_generator_capturer =
width, height, absl::nullopt, absl::nullopt, framerate, clock_); absl::make_unique<test::FrameGeneratorCapturer>(
video_sources_.emplace_back( clock_,
std::unique_ptr<FrameGeneratorCapturer>(frame_generator_capturer_)); test::FrameGenerator::CreateSquareGenerator(
width, height, absl::nullopt, absl::nullopt),
framerate, *task_queue_factory_);
frame_generator_capturer_ = frame_generator_capturer.get();
frame_generator_capturer->Init();
video_sources_.push_back(std::move(frame_generator_capturer));
ConnectVideoSourcesToStreams(); ConnectVideoSourcesToStreams();
} }

2
test/call_test.h
View File

@ -16,6 +16,7 @@
#include <vector> #include <vector>
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/test/video/function_video_decoder_factory.h" #include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h" #include "api/test/video/function_video_encoder_factory.h"
#include "api/video/video_bitrate_allocator_factory.h" #include "api/video/video_bitrate_allocator_factory.h"
@ -174,6 +175,7 @@ class CallTest : public ::testing::Test {
Clock* const clock_; Clock* const clock_;
std::unique_ptr<TaskQueueFactory> task_queue_factory_;
std::unique_ptr<webrtc::RtcEventLog> send_event_log_; std::unique_ptr<webrtc::RtcEventLog> send_event_log_;
std::unique_ptr<webrtc::RtcEventLog> recv_event_log_; std::unique_ptr<webrtc::RtcEventLog> recv_event_log_;
std::unique_ptr<Call> sender_call_; std::unique_ptr<Call> sender_call_;