admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate SetClockOffset() from DirectTransport.

Browse Source 
Eliminate SetClockOffset() from DirectTransport and
SimulatedPacketReceiverInterface.

Bug: webrtc:9630
Change-Id: Ia9b6aafeb1a9e7bf52d8e1ba46848c66a07143c2
Reviewed-on: https://webrtc-review.googlesource.com/94764
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24341}
This commit is contained in:
Artem Titov 2018-08-20 10:03:22 +02:00 committed by Commit Bot
parent 0320348237
commit c02df81a22
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
call/fake_network_pipe.h
View File

@ -136,8 +136,7 @@ class FakeNetworkPipe : public webrtc::SimulatedPacketReceiverInterface,
~FakeNetworkPipe() override;
// Deprecated. DO NOT USE. Will be removed soon.
void SetClockOffset(int64_t offset_ms) override;
void SetClockOffset(int64_t offset_ms);
// Deprecated. DO NOT USE. Hold direct reference on NetworkSimulationInterface
// instead and call SetConfig on that object directly. Will be removed soon.

5
call/simulated_packet_receiver.h
View File

@ -28,11 +28,6 @@ class SimulatedPacketReceiverInterface : public PacketReceiver, public Module {
// Reports average packet delay.
virtual int AverageDelay() = 0;
// Deprecated. DO NOT USE. Temporary added to be able to introduce
// SimulatedPacketReceiverInterface into DirectTransport instead of
// FakeNetworkPipe, will be removed soon.
virtual void SetClockOffset(int64_t offset_ms) = 0;
// Deprecated. DO NOT USE. Temporary added to be able to introduce
// SimulatedPacketReceiverInterface into DirectTransport instead of
// FakeNetworkPipe, will be removed soon.

4
test/direct_transport.cc
View File

@ -78,10 +78,6 @@ DirectTransport::~DirectTransport() {
task_queue_->CancelTask(next_scheduled_task_);
}
void DirectTransport::SetClockOffset(int64_t offset_ms) {
fake_network_->SetClockOffset(offset_ms);
}
void DirectTransport::SetConfig(const DefaultNetworkSimulationConfig& config) {
fake_network_->SetConfig(config);
}

2
test/direct_transport.h
View File

@ -58,8 +58,6 @@ class DirectTransport : public Transport {
~DirectTransport() override;
void SetClockOffset(int64_t offset_ms);
void SetConfig(const DefaultNetworkSimulationConfig& config);
RTC_DEPRECATED void StopSending();

10
video/end_to_end_tests/receive_time_tests.cc
View File

@ -9,6 +9,7 @@
*/
#include "api/test/simulated_network.h"
#include "call/fake_network_pipe.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/timeutils.h"
#include "test/call_test.h"
@ -84,7 +85,7 @@ class ReportedReceiveTimeTester : public test::EndToEndTest {
return SEND_PACKET;
}
clock_offset_ms_ += jumps_.front().add_offset_ms;
send_transport_->SetClockOffset(clock_offset_ms_);
send_pipe_->SetClockOffset(clock_offset_ms_);
jumps_.pop();
}
return SEND_PACKET;
@ -92,10 +93,12 @@ class ReportedReceiveTimeTester : public test::EndToEndTest {
test::PacketTransport* CreateSendTransport(
test::SingleThreadedTaskQueueForTesting* task_queue,
Call* sender_call) override {
auto pipe = absl::make_unique<FakeNetworkPipe>(
Clock::GetRealTimeClock(), DefaultNetworkSimulationConfig());
send_pipe_ = pipe.get();
return send_transport_ = new test::PacketTransport(
task_queue, sender_call, this, test::PacketTransport::kSender,
test::CallTest::payload_type_map_,
DefaultNetworkSimulationConfig());
test::CallTest::payload_type_map_, std::move(pipe));
}
void PerformTest() override {
observation_complete_.Wait(test::CallTest::kDefaultTimeoutMs);
@ -109,6 +112,7 @@ class ReportedReceiveTimeTester : public test::EndToEndTest {
rtc::CriticalSection send_times_crit_;
std::deque<int64_t> send_times_us_ RTC_GUARDED_BY(send_times_crit_);
bool jump_in_reported_times_ = false;
FakeNetworkPipe* send_pipe_;
test::PacketTransport* send_transport_;
int64_t clock_offset_ms_ = 0;
std::queue<TimeJump> jumps_;