Convert Vp8 Rtp headers to frame references.

webrtc/modules/video_coding/packet_buffer.h

Index: webrtc/modules/video_coding/packet_buffer.h
diff --git a/webrtc/modules/video_coding/packet_buffer.h b/webrtc/modules/video_coding/packet_buffer.h
index 6ca514536ef942fe1c1c454db7036e19ba4d485e..f48d50571e854515626fdd460be1c51a2eda105d 100644
--- a/webrtc/modules/video_coding/packet_buffer.h
+++ b/webrtc/modules/video_coding/packet_buffer.h
@@ -11,12 +11,17 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 
+#include <array>
 #include <vector>
+#include <map>
+#include <set>
+#include <queue>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/video_coding/packet.h"
+#include "webrtc/modules/video_coding/sequence_number_util.h"
 
 namespace webrtc {
 namespace video_coding {
@@ -32,6 +37,8 @@ class OnCompleteFrameCallback {
 
 class PacketBuffer {
  public:
+  static const uint16_t kPicIdLength = 1 << 7;
+
   // 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,
@@ -42,37 +49,126 @@ class PacketBuffer {
   void Flush();
 
  private:
+  static const uint8_t kMaxTemporalLayer = 5;

[pbos-webrtc, 2016/04/01 14:24:45]

I believe this can give linker errors since kMaxTemporalLayer won't be put into
all objects. I think this triggers gtest macros, but it may not be a problem for
you.

[philipel, 2016/04/05 12:40:50]

Acknowledged.

+
   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 determin whether a sequence of packets is continuous or not.

[pbos-webrtc, 2016/04/01 14:24:44]

determine

[philipel, 2016/04/05 12:40:50]

Done.

   struct ContinuityInfo {
+    // The sequence number of the packet/

[pbos-webrtc, 2016/04/01 14:24:44]

Replace / with .

[philipel, 2016/04/05 12:40:50]

Done.

     uint16_t seq_num = 0;
+
+    // If this is the first packet of the frame.

[pbos-webrtc, 2016/04/01 14:24:45]

rename first_packet_of_frame maybe?

[philipel, 2016/04/05 12:40:50]

Seems a bit to long, and I think |frame_begin| accurately describes what the
flag represents.

     bool frame_begin = false;
+
+    // If this is the last packet of the frame.

[pbos-webrtc, 2016/04/01 14:24:45]

last_packet_of_frame

[philipel, 2016/04/05 12:40:49]

Ditto

     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;

[pbos-webrtc, 2016/04/01 14:24:45]

should this be in_use?

   };
 
+  // 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_);
-  void FindCompleteFrames(uint16_t seq_num) 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.
+  void FindFrames(uint16_t seq_num) EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Copy the bitstream for |frame| to |destination|.
   bool GetBitstream(const RtpFrameObject& frame, uint8_t* destination);
+
+  // Mark all slots used by |frame| as not used.

[pbos-webrtc, 2016/04/01 14:24:44]

s/used/previously used/

   void ReturnFrame(RtpFrameObject* frame);
 
+  // Find the references for this frame.
+  void FindReferences(std::unique_ptr<RtpFrameObject> frame)
+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Retry to find the references for all frames that previously didn't have

[pbos-webrtc, 2016/04/01 14:24:45]

Retry finding references

[philipel, 2016/04/05 12:40:50]

Done.

+  // all information needed.
+  void RetryStashedFrames() EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Find references for generic frames.
+  void FindReferencesGeneric(std::unique_ptr<RtpFrameObject> frame)

[pbos-webrtc, 2016/04/01 14:24:45]

All of these FindReferences sound like they'd be const and return a list of
references. Can you find a better name that indicates that it modifies state of
frame/this object/both?


..HandleFrameReferences? Anything better?

[philipel, 2016/04/05 12:40:49]

Renamed them to ManageFrameXXX.

+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Find references for Vp8 frames
+  void FindReferencesVp8(std::unique_ptr<RtpFrameObject> frame)
+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Updates all necessary state used to determin frame references

[pbos-webrtc, 2016/04/01 14:24:45]

determine

[philipel, 2016/04/05 12:40:50]

Done.

+  // for Vp8 and then calls the |frame_callback| callback with the
+  // completed frame.
+  void CompletedFrameVp8(std::unique_ptr<RtpFrameObject> frame)
+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // All picture ids are unwrapped to 16 bits.
+  uint16_t UnwrapPictureId(uint16_t picture_id)
+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
   rtc::CriticalSection crit_;
 
   // Buffer size_ and max_size_ must always be a power of two.
   size_t size_ GUARDED_BY(crit_);
   const size_t max_size_;
 
-  uint16_t last_seq_num_ GUARDED_BY(crit_);
+  // The fist sequence number currently in the buffer.
   uint16_t first_seq_num_ GUARDED_BY(crit_);
-  bool initialized_ GUARDED_BY(crit_);
+
+  // The last sequence number currently in the buffer.
+  uint16_t last_seq_num_ GUARDED_BY(crit_);
+
+  // Buffer that holds the inserted packets.
   std::vector<VCMPacket> data_buffer_ GUARDED_BY(crit_);
+
+  // Buffer that holds the information about which slot that is currently in use
+  // and information needed to determin the continuity between packets.
   std::vector<ContinuityInfo> sequence_buffer_ GUARDED_BY(crit_);
 
+  // The callback that is called when a frame has been created and all its
+  // references has been found.
   OnCompleteFrameCallback* const frame_callback_;
+
+  // Holds the last sequence number of the last frame that has been created
+  // given the last sequence number of a given keyframe.
+  std::map<uint16_t, uint16_t, DescendingSeqNumComp<uint16_t>>
+    last_seq_num_for_kf_ GUARDED_BY(crit_);
+
+  // Save the last picture id in order to detect when there is a gap in frames
+  // that has not yet been fully received.
+  int last_picture_id_ GUARDED_BY(crit_);
+
+  // The last unwrapped picture id. Used to unwrap the picture id from a length
+  // of |kPicIdLength| to 16 bits.
+  int last_unwrap_ GUARDED_BY(crit_);
+
+  // Frames earlier than the last received frame that has not yet been
+  // fully received.
+  std::set<uint8_t, DescendingSeqNumComp<uint8_t>>
+    not_yet_received_frames_ GUARDED_BY(crit_);
+
+  // Frames that has been fully received but didn't have all the information
+  // needed to determin its references.
+  std::queue<std::unique_ptr<RtpFrameObject>> stashed_frames_ GUARDED_BY(crit_);
+
+  // Holds the information about the last completed frame for a given temporal
+  // layer given a Tl0 picture index.
+  std::map<uint8_t,
+          std::array<int16_t, kMaxTemporalLayer>,

[pbos-webrtc, 2016/04/01 14:24:45]

pref vector if this is not high-performance code (per
https://chromium-cpp.appspot.com/), since vector is more widely in use

And if it's high-performance, consider replacing std::map with a flat array that
holds 0-255

same with not_yet_fully_received_

[philipel, 2016/04/05 12:40:50]

I think map is the correct datastructure to use here since I want to use a
custom comparator to find elements.

+          DescendingSeqNumComp<uint8_t>> layer_info_ GUARDED_BY(crit_);
+
+  bool initialized_ GUARDED_BY(crit_);

[pbos-webrtc, 2016/04/01 14:24:45]

Pref putting this closer to the sequence numbers which is what it's used with.
Should we rename it has_received_first_packet, contains_first_packet or anything
like that?

[philipel, 2016/04/05 12:40:49]

Done.

 };
 
 }  // namespace video_coding