Bugfix for Vp9 GOF and missing frames.

webrtc/modules/video_coding/rtp_frame_reference_finder.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 26 matching lines @@
 
  private:
   static const uint16_t kPicIdLength = 1 << 7;
   static const uint8_t kMaxTemporalLayers = 5;
   static const int kMaxLayerInfo = 10;
   static const int kMaxStashedFrames = 10;
   static const int kMaxNotYetReceivedFrames = 20;
   static const int kMaxGofSaved = 15;
   static const int kMaxPaddingAge = 100;
 
+
+  struct GofInfo {
+    GofInfo(GofInfoVP9* gof, uint16_t last_picture_id)
+        : gof(gof), last_picture_id(last_picture_id) {}
+    GofInfoVP9* gof;
+    uint16_t last_picture_id;
+  };
+
   rtc::CriticalSection crit_;
 
   // Find the relevant group of pictures and update its "last-picture-id-with
   // padding" sequence number.
   void UpdateLastPictureIdWithPadding(uint16_t seq_num)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Retry finding references for all frames that previously didn't have
   // all information needed.
   void RetryStashedFrames() EXCLUSIVE_LOCKS_REQUIRED(crit_);
@@ skipping 18 matching lines @@
   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_);
 
   // Check if we are missing a frame necessary to determine the references
   // for this frame.
-  bool MissingRequiredFrameVp9(uint16_t picture_id, const GofInfoVP9& gof)
+  bool MissingRequiredFrameVp9(uint16_t picture_id, const GofInfo& info)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Updates which frames that have been received. If there is a gap,
   // missing frames will be added to |missing_frames_for_layer_| or
   // if this is an already missing frame then it will be removed.
-  void FrameReceivedVp9(uint16_t picture_id, const GofInfoVP9& gof)
+  void FrameReceivedVp9(uint16_t picture_id, GofInfo* info)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Check if there is a frame with the up-switch flag set in the interval
   // (|pid_ref|, |picture_id|) with temporal layer smaller than |temporal_idx|.
   bool UpSwitchInIntervalVp9(uint16_t picture_id,
                              uint8_t temporal_idx,
                              uint16_t pid_ref) EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // All picture ids are unwrapped to 16 bits.
   uint16_t UnwrapPictureId(uint16_t picture_id) EXCLUSIVE_LOCKS_REQUIRED(crit_);
@@ skipping 38 matching lines @@
       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_);
+  // Holds the the Gof information for a given TL0 picture index.
+  std::map<uint8_t, GofInfo, DescendingSeqNumComp<uint8_t>> gof_info_
+      GUARDED_BY(crit_);
 
   // Keep track of which picture id and which temporal layer that had the
   // up switch flag set.
-  std::map<uint16_t, uint8_t> up_switch_ GUARDED_BY(crit_);
+  std::map<uint16_t, uint8_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>
+      up_switch_ GUARDED_BY(crit_);
 
   // For every temporal layer, keep a set of which frames that are missing.
   std::array<std::set<uint16_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>,
              kMaxTemporalLayers>
       missing_frames_for_layer_ GUARDED_BY(crit_);
 
   OnCompleteFrameCallback* frame_callback_;
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_