TransportFeedbackPacketLossTracker to receive std::vector<PacketFeedback> in place of the entire fe…

webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc

 /*
  *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
 
 #include <limits>
 #include <utility>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/mod_ops.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 
 namespace {
 constexpr uint16_t kSeqNumHalf = 0x8000u;
 void UpdateCounter(size_t* counter, bool increment) {
   if (increment) {
     RTC_DCHECK_LT(*counter, std::numeric_limits<std::size_t>::max());
     ++(*counter);
   } else {
     RTC_DCHECK_GT(*counter, 0);
@@ skipping 62 matching lines @@
 
   SentPacket sent_packet(send_time_ms, PacketStatus::Unacked);
   packet_status_window_.insert(packet_status_window_.end(),
                                std::make_pair(seq_num, sent_packet));
 
   if (packet_status_window_.size() == 1) {
     ref_packet_status_ = packet_status_window_.cbegin();
   }
 }
 
-void TransportFeedbackPacketLossTracker::OnReceivedTransportFeedback(
-    const rtcp::TransportFeedback& feedback) {
-  const auto& status_vector = feedback.GetStatusVector();
-  const uint16_t base_seq_num = feedback.GetBaseSequence();
-
-  uint16_t seq_num = base_seq_num;
-  for (size_t i = 0; i < status_vector.size(); ++i, ++seq_num) {
-    const auto& it = packet_status_window_.find(seq_num);
+void TransportFeedbackPacketLossTracker::OnPacketFeedbacks(
+    const std::vector<PacketFeedback>& packet_feedbacks) {
+  for (const PacketFeedback& packet : packet_feedbacks) {

[minyue-webrtc, 2017/03/20 21:14:35]

nit PacketFeedback -> auto

[stefan-webrtc, 2017/03/21 06:10:56]

I prefer not using auto if the underlying type isn't particularly long (e.g.,
iterator). This is more readable to me as I don't have to look up the type while
reading the code.

I vote for keeping it as is.

[elad.alon_webrtc.org, 2017/03/21 09:22:37]

(That was my reasoning.)

+    const auto& it = packet_status_window_.find(packet.sequence_number);
 
     // Packets which aren't at least marked as unacked either do not belong to
     // this media stream, or have been shifted out of window.
     if (it == packet_status_window_.end())
       continue;
 
-    const bool lost =
-        status_vector[i] ==
-        webrtc::rtcp::TransportFeedback::StatusSymbol::kNotReceived;
+    const bool lost = packet.arrival_time_ms == PacketFeedback::kNotReceived;
     const PacketStatus packet_status =
         lost ? PacketStatus::Lost : PacketStatus::Received;
 
     UpdatePacketStatus(it, packet_status);
   }
 }
 
 rtc::Optional<float>
 TransportFeedbackPacketLossTracker::GetPacketLossRate() const {
   return plr_state_.GetMetric();
@@ skipping 237 matching lines @@
 TransportFeedbackPacketLossTracker::RplrState::GetMetric() const {
   if (num_acked_pairs_ < min_num_acked_pairs_) {
     return rtc::Optional<float>();
   } else {
     return rtc::Optional<float>(
         static_cast<float>(num_recoverable_losses_) / num_acked_pairs_);
   }
 }
 
 }  // namespace webrtc