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

webrtc/modules/video_coding/packet_buffer.h

 /*
  *  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 21 matching lines @@
   virtual void OnCompleteFrame(std::unique_ptr<FrameObject> frame) = 0;
 };
 
 class PacketBuffer {
  public:
   // Both |start_buffer_size| and |max_buffer_size| must be a power of 2.
   PacketBuffer(size_t start_buffer_size,
                size_t max_buffer_size,
                OnCompleteFrameCallback* frame_callback);
 
-  bool InsertPacket(const VCMPacket& packet);
+  bool InsertPacket(const VCMPacket& packet, int times_nacked = -1);

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

Avoid default arguments. Maybe add a nacked member to the VCMPacket class
instead?

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

Done.

   void ClearTo(uint16_t seq_num);
   void Clear();
 
  private:
   friend RtpFrameObject;
   // Since we want the packet buffer to be as packet type agnostic
   // as possible we extract only the information needed in order
   // to determine whether a sequence of packets is continuous or not.
   struct ContinuityInfo {
     // The sequence number of the packet.
     uint16_t seq_num = 0;
 
     // If this is the first packet of the frame.
     bool frame_begin = false;
 
     // If this is the last packet of the frame.
     bool frame_end = false;
 
     // If this slot is currently used.
     bool used = false;
 
     // If all its previous packets have been inserted into the packet buffer.
     bool continuous = false;
 
     // If this packet has been used to create a frame already.
     bool frame_created = false;
+
+    // How many times this packet has been Nacked.
+    uint8_t times_nacked = 0;
   };
 
   // Tries to expand the buffer.
   bool ExpandBufferSize() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Test if all previous packets has arrived for the given sequence number.
   bool IsContinuous(uint16_t seq_num) const EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Test if all packets of a frame has arrived, and if so, creates a frame.
   // May create multiple frames per invocation.
@@ skipping 32 matching lines @@
 
   // Frames that have received all their packets are handed off to the
   // |reference_finder_| which finds the dependencies between the frames.
   RtpFrameReferenceFinder reference_finder_;
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_