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

webrtc/modules/video_coding/packet_buffer_unittest.cc

Index: webrtc/modules/video_coding/packet_buffer_unittest.cc
diff --git a/webrtc/modules/video_coding/packet_buffer_unittest.cc b/webrtc/modules/video_coding/packet_buffer_unittest.cc
index b50074d8f60d87ef34cd93b001111f213f996366..f496cb1fcd821c1dadd677cbefd37ac876e6e6a6 100644
--- a/webrtc/modules/video_coding/packet_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/packet_buffer_unittest.cc
@@ -265,12 +265,58 @@ TEST_F(TestPacketBuffer, InsertDuplicatePacket) {
   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);
   }
 }