Removes OnPacketAdded callback from feedback adapter.
The code path it calls is no longer actually used and will be cleaned
up in a follow-up CL.
This prepares for simplifying the transport feedback adapter and moving
it to run on a task queue.
Bug: webrtc:9883
Change-Id: I750398069414ffa782067d021c0a3837049d98eb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158621
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29638}
diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h
index 88d7ab8..1568bd9 100644
--- a/call/rtp_video_sender.h
+++ b/call/rtp_video_sender.h
@@ -148,7 +148,6 @@
rtc::ArrayView<const uint16_t> sequence_numbers) const override;
// From PacketFeedbackObserver.
- void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) override {}
void OnPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector) override;
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.cc b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
index 1b667ae..20a8566 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
@@ -100,14 +100,6 @@
}
history_.insert(std::make_pair(packet.long_sequence_number, packet));
}
-
- {
- rtc::CritScope cs(&observers_lock_);
- for (auto* observer : observers_) {
- observer->OnPacketAdded(packet_info.ssrc,
- packet_info.transport_sequence_number);
- }
- }
}
absl::optional<SentPacket> TransportFeedbackAdapter::ProcessSentPacket(
const rtc::SentPacket& sent_packet) {
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
index 593c994..ff08cea 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
@@ -42,7 +42,6 @@
class MockPacketFeedbackObserver : public webrtc::PacketFeedbackObserver {
public:
- MOCK_METHOD2(OnPacketAdded, void(uint32_t ssrc, uint16_t seq_num));
MOCK_METHOD1(OnPacketFeedbackVector,
void(const std::vector<PacketFeedback>& packet_feedback_vector));
};
@@ -99,7 +98,6 @@
packets[0].arrival_time_ms * 1000);
for (const PacketFeedback& packet : packets) {
- EXPECT_CALL(mock, OnPacketAdded(kSsrc, packet.sequence_number)).Times(1);
OnSentPacket(packet);
EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
packet.arrival_time_ms * 1000));
@@ -111,8 +109,6 @@
adapter_->DeRegisterPacketFeedbackObserver(&mock);
- // After deregistration, the observer no longers gets indications.
- EXPECT_CALL(mock, OnPacketAdded(_, _)).Times(0);
const PacketFeedback new_packet(130, 230, 3, 4000, kPacingInfo0);
OnSentPacket(new_packet);
diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index db6f53c..8181e9b 100644
--- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -324,7 +324,9 @@
public:
virtual ~PacketFeedbackObserver() = default;
- virtual void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) = 0;
+ // DEPRECATED: OnPacketAdded will not actually be called.
+ // TODO(srte): Remove when all overrides have been removed.
+ virtual void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) {}
virtual void OnPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector) = 0;
};
