diff --git a/call/fake_network_pipe.cc b/call/fake_network_pipe.cc index 3695e620ef..3c7207bd84 100644 --- a/call/fake_network_pipe.cc +++ b/call/fake_network_pipe.cc @@ -106,34 +106,13 @@ FakeNetworkPipe::FakeNetworkPipe( : clock_(clock), network_behavior_(std::move(network_behavior)), receiver_(receiver), - global_transport_(nullptr), clock_offset_ms_(0), dropped_packets_(0), sent_packets_(0), total_packet_delay_us_(0), last_log_time_us_(clock_->TimeInMicroseconds()) {} -FakeNetworkPipe::FakeNetworkPipe( - Clock* clock, - std::unique_ptr network_behavior, - Transport* transport) - : clock_(clock), - network_behavior_(std::move(network_behavior)), - receiver_(nullptr), - global_transport_(transport), - clock_offset_ms_(0), - dropped_packets_(0), - sent_packets_(0), - total_packet_delay_us_(0), - last_log_time_us_(clock_->TimeInMicroseconds()) { - RTC_DCHECK(global_transport_); - AddActiveTransport(global_transport_); -} - FakeNetworkPipe::~FakeNetworkPipe() { - if (global_transport_) { - RemoveActiveTransport(global_transport_); - } RTC_DCHECK(active_transports_.empty()); } @@ -156,21 +135,6 @@ void FakeNetworkPipe::RemoveActiveTransport(Transport* transport) { } } -bool FakeNetworkPipe::SendRtp(rtc::ArrayView packet, - const PacketOptions& options) { - RTC_DCHECK(global_transport_); - EnqueuePacket(rtc::CopyOnWriteBuffer(packet.data(), packet.size()), options, - false, global_transport_); - return true; -} - -bool FakeNetworkPipe::SendRtcp(rtc::ArrayView packet) { - RTC_DCHECK(global_transport_); - EnqueuePacket(rtc::CopyOnWriteBuffer(packet), absl::nullopt, true, - global_transport_); - return true; -} - bool FakeNetworkPipe::SendRtp(rtc::ArrayView packet, const PacketOptions& options, Transport* transport) { diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h index d58352621d..7bc7e0f060 100644 --- a/call/fake_network_pipe.h +++ b/call/fake_network_pipe.h @@ -113,11 +113,6 @@ class FakeNetworkPipe : public SimulatedPacketReceiverInterface { PacketReceiver* receiver, uint64_t seed); - // Use this constructor if you plan to insert packets using SendRt[c?]p(). - FakeNetworkPipe(Clock* clock, - std::unique_ptr network_behavior, - Transport* transport); - ~FakeNetworkPipe() override; FakeNetworkPipe(const FakeNetworkPipe&) = delete; @@ -134,14 +129,6 @@ class FakeNetworkPipe : public SimulatedPacketReceiverInterface { void AddActiveTransport(Transport* transport); void RemoveActiveTransport(Transport* transport); - // Implements Transport interface. When/if packets are delivered, they will - // be passed to the transport instance given in SetReceiverTransport(). These - // methods should only be called if a Transport instance was provided in the - // constructor. - bool SendRtp(rtc::ArrayView packet, - const PacketOptions& options); - bool SendRtcp(rtc::ArrayView packet); - // Methods for use with Transport interface. When/if packets are delivered, // they will be passed to the instance specified by the `transport` parameter. // Note that that instance must be in the map of active transports. @@ -216,7 +203,6 @@ class FakeNetworkPipe : public SimulatedPacketReceiverInterface { mutable Mutex config_lock_; const std::unique_ptr network_behavior_; PacketReceiver* receiver_ RTC_GUARDED_BY(config_lock_); - Transport* const global_transport_; // `process_lock` guards the data structures involved in delay and loss // processes, such as the packet queues.