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

webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.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 <limits>
 #include <memory>
 #include <numeric>
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
 
 namespace webrtc {
 
 namespace {
 
 constexpr int64_t kDefaultSendIntervalMs = 10;
 constexpr int64_t kDefaultMaxWindowSizeMs = 500 * kDefaultSendIntervalMs;
 
 class TransportFeedbackPacketLossTrackerTest
     : public ::testing::TestWithParam<uint16_t> {
-  using TransportFeedback = webrtc::rtcp::TransportFeedback;
-
  public:
   TransportFeedbackPacketLossTrackerTest() = default;
   virtual ~TransportFeedbackPacketLossTrackerTest() = default;
 
  protected:
   void SendPackets(TransportFeedbackPacketLossTracker* tracker,
                    const std::vector<uint16_t>& sequence_numbers,
                    int64_t send_time_interval_ms,
                    bool validate_all = true) {
     RTC_CHECK_GE(send_time_interval_ms, 0);
@@ skipping 25 matching lines @@
 
   void AdvanceClock(int64_t time_delta_ms) {
     RTC_CHECK_GT(time_delta_ms, 0);
     time_ms_ += time_delta_ms;
   }
 
   void AddTransportFeedbackAndValidate(
       TransportFeedbackPacketLossTracker* tracker,
       uint16_t base_sequence_num,
       const std::vector<bool>& reception_status_vec) {
-    const int64_t kBaseTimeUs = 1234;  // Irrelevant to this test.
-    TransportFeedback test_feedback;
-    test_feedback.SetBase(base_sequence_num, kBaseTimeUs);
-    uint16_t sequence_num = base_sequence_num;
-    for (bool status : reception_status_vec) {
-      if (status)
-        test_feedback.AddReceivedPacket(sequence_num, kBaseTimeUs);
-      ++sequence_num;
+    // Any positive integer signals reception. kNotReceived signals loss.
+    // Other values are just illegal.
+    constexpr int64_t kArrivalTimeMs = 1234;
+
+    std::vector<PacketFeedback> packet_feedback_vector;
+    uint16_t seq_num = base_sequence_num;
+    for (bool received : reception_status_vec) {
+      packet_feedback_vector.emplace_back(PacketFeedback(
+          received ? kArrivalTimeMs : PacketFeedback::kNotReceived, seq_num));
+      ++seq_num;
     }
 
-    // TransportFeedback imposes some limitations on what constitutes a legal
-    // status vector. For instance, the vector cannot terminate in a lost
-    // packet. Make sure all limitations are abided by.
-    RTC_CHECK_EQ(base_sequence_num, test_feedback.GetBaseSequence());
-    const auto& vec = test_feedback.GetStatusVector();
-    RTC_CHECK_EQ(reception_status_vec.size(), vec.size());
-    for (size_t i = 0; i < reception_status_vec.size(); i++) {
-      RTC_CHECK_EQ(reception_status_vec[i],
-                   vec[i] != TransportFeedback::StatusSymbol::kNotReceived);
-    }
-
-    tracker->OnReceivedTransportFeedback(test_feedback);
+    tracker->OnNewTransportFeedbackVector(packet_feedback_vector);
     tracker->Validate();
   }
 
   // Checks that validty is as expected. If valid, checks also that
   // value is as expected.
   void ValidatePacketLossStatistics(
       const TransportFeedbackPacketLossTracker& tracker,
       rtc::Optional<float> expected_plr,
       rtc::Optional<float> expected_rplr) {
     // TODO(elad.alon): Comparing the rtc::Optional<float> directly would have
@@ skipping 491 matching lines @@
 
 // All tests are run multiple times with various baseline sequence number,
 // to weed out potential bugs with wrap-around handling.
 constexpr uint16_t kBases[] = {0x0000, 0x3456, 0xc032, 0xfffe};
 
 INSTANTIATE_TEST_CASE_P(_,
                         TransportFeedbackPacketLossTrackerTest,
                         testing::ValuesIn(kBases));
 
 }  // namespace webrtc