diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h index 546014d39d..fd540fb9b6 100644 --- a/call/fake_network_pipe.h +++ b/call/fake_network_pipe.h @@ -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. diff --git a/call/simulated_packet_receiver.h b/call/simulated_packet_receiver.h index 6630427b1a..3137ba1b1b 100644 --- a/call/simulated_packet_receiver.h +++ b/call/simulated_packet_receiver.h @@ -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. diff --git a/test/direct_transport.cc b/test/direct_transport.cc index 351210ee5c..16416ef980 100644 --- a/test/direct_transport.cc +++ b/test/direct_transport.cc @@ -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); } diff --git a/test/direct_transport.h b/test/direct_transport.h index c5c2d94322..eabaa94e89 100644 --- a/test/direct_transport.h +++ b/test/direct_transport.h @@ -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(); diff --git a/video/end_to_end_tests/receive_time_tests.cc b/video/end_to_end_tests/receive_time_tests.cc index c676d666b6..f3572e404b 100644 --- a/video/end_to_end_tests/receive_time_tests.cc +++ b/video/end_to_end_tests/receive_time_tests.cc @@ -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( + 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 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 jumps_;