Don't recalculate Tl0PicIdx when the VP9 frame has no Tl0PicIdx.

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 1267 matching lines @@
   CheckReferencesVp9(pid + 5, 1, pid + 4);
   CheckReferencesVp9(pid + 6, 0, pid + 4);
   CheckReferencesVp9(pid + 6, 1, pid + 5);
   CheckReferencesVp9(pid + 7, 1, pid + 6);
   CheckReferencesVp9(pid + 8, 0, pid + 6);
   CheckReferencesVp9(pid + 8, 1, pid + 7);
 }
 
 // TODO(philipel): Remove when VP9 PID/TL0 does not jump mid-stream (should be
 //                 around M59).
+TEST_F(TestRtpFrameReferenceFinder, Vp9PidFix_PidJumpsForwardNoTl0PicIdx) {
+  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 = kNoTemporalIdx;
+  packet.video_header.codecHeader.VP9.spatial_idx = kNoSpatialIdx;
+  packet.video_header.codecHeader.VP9.tl0_pic_idx = kNoTl0PicIdx;
+  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);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
+
+  packet.timestamp = 1;
+  packet.video_header.codecHeader.VP9.picture_id = 5000;
+
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
+
+  ASSERT_EQ(2UL, frames_from_callback_.size());
+  CheckReferencesVp9(0, 0);
+  CheckReferencesVp9(128, 0);
+}
+
+// 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;
 
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   // Timestamp goes forward but pid goes backwards.
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 0;
 
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 5000;
 
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   ASSERT_EQ(3UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(129, 0);
   CheckReferencesVp9(257, 0);
 }
 
 // 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);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 0;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 2;
   packet.frameType = kVideoFrameDelta;
   packet.video_header.codecHeader.VP9.picture_id = 2;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 3;
   packet.frameType = kVideoFrameKey;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 129;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   ASSERT_EQ(4UL, frames_from_callback_.size());
   CheckReferencesVp9(0, 0);
   CheckReferencesVp9(128, 0);
   CheckReferencesVp9(129, 0, 128);
   CheckReferencesVp9(257, 0);
 }
 
 // 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);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 2;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 4;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   ASSERT_EQ(4UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(2, 0);
   CheckReferencesVp9(3, 0);
   CheckReferencesVp9(131, 0);
 }
 
 // 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);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   packet.timestamp = 0;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
-  {
-    ref_packet_buffer_->InsertPacket(&packet);
-    std::unique_ptr<RtpFrameObject> frame(
-        new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
-    reference_finder_->ManageFrame(std::move(frame));
-  }
+  ref_packet_buffer_->InsertPacket(&packet);
+  reference_finder_->ManageFrame(std::unique_ptr<RtpFrameObject>(
+      new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0)));
 
   ASSERT_EQ(2UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(129, 0);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc