Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1014)

Unified Diff: webrtc/modules/congestion_controller/transport_feedback_adapter.cc

Issue 2822153002: Remove rtcp::TransportFeedback::GetStatusVector/GetReceiveDeltas (Closed)
Patch Set: Rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/congestion_controller/transport_feedback_adapter.cc
diff --git a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
index 9fb1af59a2cdea6990ef0f4e430835bbf2c4813e..88caad41d667eff09844478788b653a325a940cf 100644
--- a/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
+++ b/webrtc/modules/congestion_controller/transport_feedback_adapter.cc
@@ -122,20 +122,12 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
}
last_timestamp_us_ = timestamp_us;
- auto received_packets = feedback.GetReceivedPackets();
std::vector<PacketFeedback> packet_feedback_vector;
- if (received_packets.empty()) {
+ if (feedback.GetPacketStatusCount() == 0) {
LOG(LS_INFO) << "Empty transport feedback packet received.";
return packet_feedback_vector;
}
- const uint16_t last_sequence_number =
- received_packets.back().sequence_number();
- const size_t packet_count =
- 1 + ForwardDiff(feedback.GetBaseSequence(), last_sequence_number);
- packet_feedback_vector.reserve(packet_count);
- // feedback.GetStatusVector().size() is a less efficient way to reach what
- // should be the same value.
- RTC_DCHECK_EQ(packet_count, feedback.GetStatusVector().size());
+ packet_feedback_vector.reserve(feedback.GetPacketStatusCount());
{
rtc::CritScope cs(&lock_);
@@ -143,7 +135,7 @@ std::vector<PacketFeedback> TransportFeedbackAdapter::GetPacketFeedbackVector(
int64_t offset_us = 0;
int64_t timestamp_ms = 0;
uint16_t seq_num = feedback.GetBaseSequence();
- for (const auto& packet : received_packets) {
+ for (const auto& packet : feedback.GetReceivedPackets()) {
// Insert into the vector those unreceived packets which precede this
// iteration's received packet.
for (; seq_num != packet.sequence_number(); ++seq_num) {
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698