PacketBuffer now can save how many times a packet has been nacked.

webrtc/modules/video_coding/packet_buffer_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
@@ skipping 247 matching lines @@
 
 TEST_F(TestPacketBuffer, InsertDuplicatePacket) {
   VCMPacket packet;
   packet.seqNum = Rand();
   EXPECT_TRUE(packet_buffer_->InsertPacket(packet));
   ++packet.seqNum;
   EXPECT_TRUE(packet_buffer_->InsertPacket(packet));
   EXPECT_TRUE(packet_buffer_->InsertPacket(packet));
 }
 
+TEST_F(TestPacketBuffer, NackCount) {
+  uint16_t seq_num = Rand();
+
+  VCMPacket packet;
+  packet.codec = kVideoCodecGeneric;
+  packet.seqNum = seq_num;
+  packet.frameType = kVideoFrameKey;
+  packet.isFirstPacket = true;
+  packet.markerBit = false;
+  packet.sizeBytes = 0;
+  packet.dataPtr = nullptr;
+
+  packet_buffer_->InsertPacket(packet, 0);
+
+  packet.seqNum++;
+  packet.isFirstPacket = false;
+  packet_buffer_->InsertPacket(packet, 1);
+
+  packet.seqNum++;
+  packet_buffer_->InsertPacket(packet, 3);
+
+  packet.seqNum++;
+  packet.markerBit = true;
+  packet_buffer_->InsertPacket(packet, 0);
+
+
+  ASSERT_EQ(1UL, frames_from_callback_.size());
+  FrameObject* frame = frames_from_callback_.begin()->second.get();
+  RtpFrameObject* rtpFrame = static_cast<RtpFrameObject*>(frame);

[stefan-webrtc, 2016/05/20 13:10:23]

rtp_frame

[philipel, 2016/05/23 09:19:22]

Done.

+  EXPECT_EQ(3, rtpFrame->max_nack_count());
+}
+
+TEST_F(TestPacketBuffer, FrameSize) {
+  uint16_t seq_num = Rand();
+  uint8_t data[] = {1, 2, 3, 4, 5};
+
+  //            seq_num    , kf, frst, lst, size, data

[stefan-webrtc, 2016/05/20 13:10:23]

Not very nicely aligned with the calls below :) Maybe simply remove it?

[philipel, 2016/05/23 09:19:22]

Aligned!

+  InsertGeneric(seq_num    , kT, kT, kF, 5, data);
+  InsertGeneric(seq_num + 1, kT, kF, kF, 5, data);
+  InsertGeneric(seq_num + 2, kT, kF, kF, 5, data);
+  InsertGeneric(seq_num + 3, kT, kF, kT, 5, data);
+
+  ASSERT_EQ(1UL, frames_from_callback_.size());
+  EXPECT_EQ(20UL, frames_from_callback_.begin()->second->size);
+}
+
 TEST_F(TestPacketBuffer, ExpandBuffer) {
   uint16_t seq_num = Rand();
 
   for (int i = 0; i < kStartSize + 1; ++i) {
     //            seq_num    , kf, frst, lst
-    InsertGeneric(seq_num + i, kT    , kT, kT);
+    InsertGeneric(seq_num + i, kT, kT  , kT);
   }
 }
 
 TEST_F(TestPacketBuffer, ExpandBufferOverflow) {
   uint16_t seq_num = Rand();
 
   for (int i = 0; i < kMaxSize; ++i) {
     //            seq_num    , kf, frst, lst
     InsertGeneric(seq_num + i, kT, kT  , kT);
   }
@@ skipping 1114 matching lines @@
   CheckReferencesVp9(pid + 5, 1, pid + 4);
   CheckReferencesVp9(pid + 6, 0, pid + 4);
   CheckReferencesVp9(pid + 6, 1, pid + 5);
   CheckReferencesVp9(pid + 7, 1, pid + 6);
   CheckReferencesVp9(pid + 8, 0, pid + 6);
   CheckReferencesVp9(pid + 8, 1, pid + 7);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc