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

Revert "Using simulated rtc::Thread for peer connection scenario tests."

Browse Source 
This reverts commit b70c5c5ce97e7dcf2e1d8453f5ea0639d4b60453.

Reason for revert: Interferes with other tests in same binary.

Original change's description:
> Using simulated rtc::Thread for peer connection scenario tests.
> 
> Bug: webrtc:11255
> Change-Id: I5d29e997a7209ffc64595082358cca9b2115d07a
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165689
> Commit-Queue: Sebastian Jansson <srte@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30258}

TBR=steveanton@webrtc.org,srte@webrtc.org

Change-Id: If2e60edae264a4bb0dee3abf66ba2078fd85f493
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:11255
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166045
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30259}
This commit is contained in:
Sebastian Jansson
2020-01-15 10:09:54 +00:00
committed by Commit Bot
parent b70c5c5ce9
commit f1173f46e5
20 changed files with 33 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
test/peer_scenario/peer_scenario_client.cc
View File

@ -19,7 +19,6 @@
#include "api/task_queue/default_task_queue_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "call/call.h"
#include "media/engine/webrtc_media_engine.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "p2p/client/basic_port_allocator.h"
@ -113,51 +112,22 @@ class LambdaPeerConnectionObserver final : public PeerConnectionObserver {
private:
PeerScenarioClient::CallbackHandlers* handlers_;
};
// Used to supply a unique_ptr for an unowned TaskQueueFactory.
class TaskQueueFactoryWrapper final : public TaskQueueFactory {
public:
explicit TaskQueueFactoryWrapper(TaskQueueFactory* inner_factory)
: inner_factory_(inner_factory) {}
std::unique_ptr<TaskQueueBase, TaskQueueDeleter> CreateTaskQueue(
absl::string_view name,
Priority priority) const override {
return inner_factory_->CreateTaskQueue(name, priority);
}
private:
TaskQueueFactory* const inner_factory_;
};
class TimeControllerBasedCallFactory : public CallFactoryInterface {
public:
explicit TimeControllerBasedCallFactory(TimeController* time_controller)
: time_controller_(time_controller) {}
Call* CreateCall(const Call::Config& config) override {
return Call::Create(config, time_controller_->GetClock(),
time_controller_->CreateProcessThread("CallModules"),
time_controller_->CreateProcessThread("Pacer"));
}
private:
TimeController* time_controller_;
};
} // namespace
PeerScenarioClient::PeerScenarioClient(
NetworkEmulationManager* net,
TimeController* time_controller,
rtc::Thread* signaling_thread,
std::unique_ptr<LogWriterFactoryInterface> log_writer_factory,
PeerScenarioClient::Config config)
: endpoints_(CreateEndpoints(net, config.endpoints)),
task_queue_factory_(time_controller->GetTaskQueueFactory()),
signaling_thread_(signaling_thread),
log_writer_factory_(std::move(log_writer_factory)),
worker_thread_(time_controller->CreateThread("worker")),
worker_thread_(rtc::Thread::Create()),
handlers_(config.handlers),
observer_(new LambdaPeerConnectionObserver(&handlers_)) {
worker_thread_->SetName("worker", this);
worker_thread_->Start();
handlers_.on_track.push_back(
[this](rtc::scoped_refptr<RtpTransceiverInterface> transceiver) {
auto track = transceiver->receiver()->track().get();
@ -190,10 +160,9 @@ PeerScenarioClient::PeerScenarioClient(
pcf_deps.network_thread = manager->network_thread();
pcf_deps.signaling_thread = signaling_thread_;
pcf_deps.worker_thread = worker_thread_.get();
pcf_deps.call_factory =
std::make_unique<TimeControllerBasedCallFactory>(time_controller);
pcf_deps.task_queue_factory =
std::make_unique<TaskQueueFactoryWrapper>(task_queue_factory_);
pcf_deps.call_factory = CreateCallFactory();
pcf_deps.task_queue_factory = CreateDefaultTaskQueueFactory();
task_queue_factory_ = pcf_deps.task_queue_factory.get();
pcf_deps.event_log_factory =
std::make_unique<RtcEventLogFactory>(task_queue_factory_);