Now run EndToEndTest with the WebRTC-NewVideoJitterBuffer experiment.

webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc

 /*
  *  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 65 matching lines @@
         std::make_pair(std::make_pair(pid, sidx), std::move(frame)));
   }
 
   void InsertGeneric(uint16_t seq_num_start,
                      uint16_t seq_num_end,
                      bool keyframe) {
     VCMPacket packet;
     packet.codec = kVideoCodecGeneric;
     packet.seqNum = seq_num_start;
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
+    ref_packet_buffer_->InsertPacket(packet);
 
+    packet.seqNum = seq_num_end;
+    packet.markerBit = true;
     ref_packet_buffer_->InsertPacket(packet);
+
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp8(uint16_t seq_num_start,
                  uint16_t seq_num_end,
                  bool keyframe,
                  int32_t pid = kNoPictureId,
                  uint8_t tid = kNoTemporalIdx,
                  int32_t tl0 = kNoTl0PicIdx,
                  bool sync = false) {
     VCMPacket packet;
     packet.codec = kVideoCodecVP8;
     packet.seqNum = seq_num_start;
+    packet.markerBit = (seq_num_start == seq_num_end);
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.video_header.codecHeader.VP8.pictureId = pid % (1 << 15);
     packet.video_header.codecHeader.VP8.temporalIdx = tid;
     packet.video_header.codecHeader.VP8.tl0PicIdx = tl0;
     packet.video_header.codecHeader.VP8.layerSync = sync;
+    ref_packet_buffer_->InsertPacket(packet);
 
-    ref_packet_buffer_->InsertPacket(packet);
+    if (seq_num_start != seq_num_end) {
+      packet.seqNum = seq_num_end;
+      packet.markerBit = true;
+      ref_packet_buffer_->InsertPacket(packet);
+    }
+
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp9Gof(uint16_t seq_num_start,
                     uint16_t seq_num_end,
                     bool keyframe,
                     int32_t pid = kNoPictureId,
                     uint8_t sid = kNoSpatialIdx,
                     uint8_t tid = kNoTemporalIdx,
                     int32_t tl0 = kNoTl0PicIdx,
                     bool up_switch = false,
                     GofInfoVP9* ss = nullptr) {
     VCMPacket packet;
     packet.timestamp = pid;
     packet.codec = kVideoCodecVP9;
     packet.seqNum = seq_num_start;
+    packet.markerBit = (seq_num_start == seq_num_end);
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.video_header.codecHeader.VP9.flexible_mode = false;
     packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);
     packet.video_header.codecHeader.VP9.temporal_idx = tid;
     packet.video_header.codecHeader.VP9.spatial_idx = sid;
     packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;
     packet.video_header.codecHeader.VP9.temporal_up_switch = up_switch;
     if (ss != nullptr) {
       packet.video_header.codecHeader.VP9.ss_data_available = true;
       packet.video_header.codecHeader.VP9.gof = *ss;
     }
+    ref_packet_buffer_->InsertPacket(packet);
 
-    ref_packet_buffer_->InsertPacket(packet);
+    if (seq_num_start != seq_num_end) {
+      packet.markerBit = true;
+      packet.video_header.codecHeader.VP9.ss_data_available = false;
+      packet.seqNum = seq_num_end;
+      ref_packet_buffer_->InsertPacket(packet);
+    }
+
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp9Flex(uint16_t seq_num_start,
                      uint16_t seq_num_end,
                      bool keyframe,
                      int32_t pid = kNoPictureId,
                      uint8_t sid = kNoSpatialIdx,
                      uint8_t tid = kNoTemporalIdx,
                      int32_t tl0 = kNoTl0PicIdx,
                      bool inter = false,
                      std::vector<uint8_t> refs = std::vector<uint8_t>()) {
     VCMPacket packet;
     packet.timestamp = pid;
     packet.codec = kVideoCodecVP9;
     packet.seqNum = seq_num_start;
+    packet.markerBit = (seq_num_start == seq_num_end);
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.video_header.codecHeader.VP9.inter_layer_predicted = inter;
     packet.video_header.codecHeader.VP9.flexible_mode = true;
     packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);
     packet.video_header.codecHeader.VP9.temporal_idx = tid;
     packet.video_header.codecHeader.VP9.spatial_idx = sid;
     packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;
     packet.video_header.codecHeader.VP9.num_ref_pics = refs.size();
     for (size_t i = 0; i < refs.size(); ++i)
       packet.video_header.codecHeader.VP9.pid_diff[i] = refs[i];
+    ref_packet_buffer_->InsertPacket(packet);
 
-    ref_packet_buffer_->InsertPacket(packet);
+    if (seq_num_start != seq_num_end) {
+      packet.seqNum = seq_num_end;
+      packet.markerBit = true;
+      ref_packet_buffer_->InsertPacket(packet);
+    }
+
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   // Check if a frame with picture id |pid| and spatial index |sidx| has been
   // delivered from the packet buffer, and if so, if it has the references
   // specified by |refs|.
   template <typename... T>
   void CheckReferences(uint16_t pid, uint16_t sidx, T... refs) const {
@@ skipping 1045 matching lines @@
 // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
 //                 around M59).
 TEST_F(TestRtpFrameReferenceFinder, Vp9PidFix_PidJumpsBackwardThenForward) {
   GofInfoVP9 ss;
   ss.SetGofInfoVP9(kTemporalStructureMode1);
 
   VCMPacket packet;
   packet.timestamp = 0;
   packet.codec = kVideoCodecVP9;
   packet.frameType = kVideoFrameKey;
+  packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 0;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
 
   {
@@ skipping 33 matching lines @@
 // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
 //                 around M59).
 TEST_F(TestRtpFrameReferenceFinder, Vp9PidFix_Tl0JumpsBackwardThenForward) {
   GofInfoVP9 ss;
   ss.SetGofInfoVP9(kTemporalStructureMode1);
 
   VCMPacket packet;
   packet.timestamp = 0;
   packet.codec = kVideoCodecVP9;
   packet.frameType = kVideoFrameKey;
+  packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 0;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
     ref_packet_buffer_->InsertPacket(packet);
@@ skipping 45 matching lines @@
 // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
 //                 around M59).
 TEST_F(TestRtpFrameReferenceFinder, Vp9PidFix_PidSmallJumpForward) {
   GofInfoVP9 ss;
   ss.SetGofInfoVP9(kTemporalStructureMode1);
 
   VCMPacket packet;
   packet.timestamp = 0;
   packet.codec = kVideoCodecVP9;
   packet.frameType = kVideoFrameKey;
+  packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
     ref_packet_buffer_->InsertPacket(packet);
@@ skipping 42 matching lines @@
 // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
 //                 around M59).
 TEST_F(TestRtpFrameReferenceFinder, Vp9PidFix_DropOldFrame) {
   GofInfoVP9 ss;
   ss.SetGofInfoVP9(kTemporalStructureMode1);
 
   VCMPacket packet;
   packet.timestamp = 0;
   packet.codec = kVideoCodecVP9;
   packet.frameType = kVideoFrameKey;
+  packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
     ref_packet_buffer_->InsertPacket(packet);
@@ skipping 22 matching lines @@
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   ASSERT_EQ(2UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(129, 0);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc