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

Removes OnPacketAdded callback from feedback adapter.

Browse Source 
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}
This commit is contained in:
Sebastian Jansson
2019-10-29 08:28:13 +01:00
committed by Commit Bot
parent 9c71e4936b
commit 05c47926ff
4 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
call/rtp_video_sender.h
View File

@ -148,7 +148,6 @@ class RtpVideoSender : public RtpVideoSenderInterface,
rtc::ArrayView<const uint16_t> sequence_numbers) const override; rtc::ArrayView<const uint16_t> sequence_numbers) const override;
// From PacketFeedbackObserver. // From PacketFeedbackObserver.
void OnPacketAdded(uint32_t ssrc, uint16_t seq_num) override {}
void OnPacketFeedbackVector( void OnPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector) override; const std::vector<PacketFeedback>& packet_feedback_vector) override;

8
modules/congestion_controller/rtp/transport_feedback_adapter.cc
View File

@ -100,14 +100,6 @@ void TransportFeedbackAdapter::AddPacket(const RtpPacketSendInfo& packet_info,
} }
history_.insert(std::make_pair(packet.long_sequence_number, packet)); 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( absl::optional<SentPacket> TransportFeedbackAdapter::ProcessSentPacket(
const rtc::SentPacket& sent_packet) { const rtc::SentPacket& sent_packet) {

4
modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
View File

@ -42,7 +42,6 @@ namespace test {
class MockPacketFeedbackObserver : public webrtc::PacketFeedbackObserver { class MockPacketFeedbackObserver : public webrtc::PacketFeedbackObserver {
public: public:
MOCK_METHOD2(OnPacketAdded, void(uint32_t ssrc, uint16_t seq_num));
MOCK_METHOD1(OnPacketFeedbackVector, MOCK_METHOD1(OnPacketFeedbackVector,
void(const std::vector<PacketFeedback>& packet_feedback_vector)); void(const std::vector<PacketFeedback>& packet_feedback_vector));
}; };
@ -99,7 +98,6 @@ TEST_F(TransportFeedbackAdapterTest, ObserverSanity) {
packets[0].arrival_time_ms * 1000); packets[0].arrival_time_ms * 1000);
for (const PacketFeedback& packet : packets) { for (const PacketFeedback& packet : packets) {
EXPECT_CALL(mock, OnPacketAdded(kSsrc, packet.sequence_number)).Times(1);
OnSentPacket(packet); OnSentPacket(packet);
EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number, EXPECT_TRUE(feedback.AddReceivedPacket(packet.sequence_number,
packet.arrival_time_ms * 1000)); packet.arrival_time_ms * 1000));
@ -111,8 +109,6 @@ TEST_F(TransportFeedbackAdapterTest, ObserverSanity) {
adapter_->DeRegisterPacketFeedbackObserver(&mock); 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); const PacketFeedback new_packet(130, 230, 3, 4000, kPacingInfo0);
OnSentPacket(new_packet); OnSentPacket(new_packet);

4
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -324,7 +324,9 @@ class PacketFeedbackObserver {
public: public:
virtual ~PacketFeedbackObserver() = default; 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( virtual void OnPacketFeedbackVector(
const std::vector<PacketFeedback>& packet_feedback_vector) = 0; const std::vector<PacketFeedback>& packet_feedback_vector) = 0;
}; };