Convert Vp9 Rtp headers to frame references.

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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 
 #include <array>
+#include <utility>
 #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/include/module_common_types.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/modules/video_coding/sequence_number_util.h"
 
 namespace webrtc {
 namespace video_coding {
 
 class FrameObject;
 class RtpFrameObject;
 
 class OnCompleteFrameCallback {
@@ skipping 12 matching lines @@
   bool InsertPacket(const VCMPacket& packet);
   void ClearTo(uint16_t seq_num);
   void Flush();
 
  private:
   static const uint16_t kPicIdLength = 1 << 7;
   static const uint8_t kMaxTemporalLayer = 5;
   static const int kMaxStashedFrames = 10;
   static const int kMaxLayerInfo = 10;
   static const int kMaxNotYetReceivedFrames = 20;
+  static const int kMaxGofSaved = 5;

[stefan-webrtc, 2016/04/26 08:15:12]

This constant seems to only be used in the .cc file. Move it there in that case.
Maybe other constants can be moved too?

[stefan-webrtc, 2016/04/26 08:15:12]

I wonder if 5 GOFs will actually be enough... It can happen that we get several
key frames in a short period of time if we're unlucky. 5 within 1 second could
happen. I'd be more comfortable with maybe 15?

[philipel, 2016/04/28 09:40:42]

Increased to 15.

[philipel, 2016/04/28 09:40:42]

This is used on line 193 in the .h file.

 
   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.
@@ skipping 43 matching lines @@
   // Find references for Vp8 frames
   void ManageFrameVp8(std::unique_ptr<RtpFrameObject> frame)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Updates all necessary state used to determine frame references
   // for Vp8 and then calls the |frame_callback| callback with the
   // completed frame.
   void CompletedFrameVp8(std::unique_ptr<RtpFrameObject> frame)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
+  // Find references for Vp9 frames
+  void ManageFrameVp9(std::unique_ptr<RtpFrameObject> frame)
+      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+  // Unwrap the picture id and the frame references  and then call the
+  // |frame_callback| callback with the completed frame.
+  void CompletedFrameVp9(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_;
 
@@ skipping 37 matching lines @@
 
   // Frames that have been fully received but didn't have all the information
   // needed to determine their 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>,
           DescendingSeqNumComp<uint8_t>> layer_info_ GUARDED_BY(crit_);
+
+  // Where the current scalability structure is in the
+  // |scalability_structures_| array.
+  uint8_t current_ss_idx_;
+
+  // Holds received scalability structures.
+  std::array<GofInfoVP9, kMaxGofSaved>
+    scalability_structures_ GUARDED_BY(crit_);
+
+  // Holds the picture id and the Gof information for a given TL0 picture index.
+  std::map<uint8_t,
+          std::pair<uint16_t, GofInfoVP9*>,
+          DescendingSeqNumComp<uint8_t>> gof_info_ GUARDED_BY(crit_);
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_