New jitter buffer experiment.

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 39 matching lines @@
   void ManageFrame(std::unique_ptr<RtpFrameObject> frame);
 
   // Notifies that padding has been received, which the reference finder
   // might need to calculate the references of a frame.
   void PaddingReceived(uint16_t seq_num);
 
   // Clear all stashed frames that include packets older than |seq_num|.
   void ClearTo(uint16_t seq_num);
 
  private:
-  static const uint16_t kPicIdLength = 1 << 7;
+  static const uint16_t kPicIdLength = 1 << 15;
   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 kMaxLayerInfo = 50;
+  static const int kMaxStashedFrames = 50;
+  static const int kMaxNotYetReceivedFrames = 100;
+  static const int kMaxGofSaved = 50;
   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;
   };
 
@@ skipping 46 matching lines @@
 
   // 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_);
 
+  // Returns true if the frame is old and should be dropped.
+  // TODO(philipel): Remove when VP9 PID does not jump mid-stream.

[stefan-webrtc, 2016/11/14 12:00:26]

M59 timeframe?

[philipel, 2016/11/14 15:31:04]

Added comment.

+  bool Vp9PidTl0Fix(const RtpFrameObject& frame,
+                    int16_t* picture_id,
+                    int16_t* tl0_pic_idx) EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // For every group of pictures, hold two sequence numbers. The first being
   // the sequence number of the last packet of the last completed frame, and
   // the second being the sequence number of the last packet of the last
   // completed frame advanced by any potential continuous packets of padding.
   std::map<uint16_t,
            std::pair<uint16_t, uint16_t>,
            DescendingSeqNumComp<uint16_t>>
       last_seq_num_gop_ GUARDED_BY(crit_);
 
@@ skipping 47 matching lines @@
   std::array<std::set<uint16_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>,
              kMaxTemporalLayers>
       missing_frames_for_layer_ GUARDED_BY(crit_);
 
   // How far frames have been cleared by sequence number. A frame will be
   // cleared if it contains a packet with a sequence number older than
   // |cleared_to_seq_num_|.
   int cleared_to_seq_num_ GUARDED_BY(crit_);
 
   OnCompleteFrameCallback* frame_callback_;
+
+  // Vp9PidFix variables
+  // TODO(philipel): Remove when VP9 PID does not jump mid-stream.
+  int vp9_fix_last_timestamp_ = -1;
+  int vp9_fix_jump_timestamp_ = -1;
+  int vp9_fix_last_picture_id_ = -1;
+  int vp9_fix_pid_offset_ = 0;
+  int vp9_fix_last_tl0_pic_idx_ = -1;
+  int vp9_fix_tl0_pic_idx_offset_ = 0;
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_RTP_FRAME_REFERENCE_FINDER_H_