Revert "Revert of Use sps and pps to determine decodability of H.264 frames. (patchset #4 id:60001 …

webrtc/modules/video_coding/jitter_buffer_unittest.cc

 /*
  *  Copyright (c) 2011 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.
  */
 
 #include <string>
 
 #include <list>
 #include <memory>
+#include <vector>
 
+#include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/modules/video_coding/frame_buffer.h"
 #include "webrtc/modules/video_coding/jitter_buffer.h"
 #include "webrtc/modules/video_coding/media_opt_util.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/modules/video_coding/test/stream_generator.h"
 #include "webrtc/modules/video_coding/test/test_util.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
@@ skipping 1127 matching lines @@
 
   EXPECT_EQ(kCompleteSession,
             jitter_buffer_->InsertPacket(*packet_, &retransmitted));
 
   frame_out = DecodeCompleteFrame();
   CheckOutFrame(frame_out, size_ * 2 + 4 * 2, true);
   EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
   jitter_buffer_->ReleaseFrame(frame_out);
 }
 
+TEST_F(TestBasicJitterBuffer, SpsAndPpsHandling) {
+  jitter_buffer_->SetDecodeErrorMode(kNoErrors);
+
+  packet_->timestamp = timestamp_;
+  packet_->frameType = kVideoFrameKey;
+  packet_->isFirstPacket = true;
+  packet_->markerBit = true;
+  packet_->codec = kVideoCodecH264;
+  packet_->video_header.codec = kRtpVideoH264;
+  packet_->video_header.codecHeader.H264.nalu_type = H264::NaluType::kIdr;
+  packet_->video_header.codecHeader.H264.nalus[0].type = H264::NaluType::kIdr;
+  packet_->video_header.codecHeader.H264.nalus[0].sps_id = -1;
+  packet_->video_header.codecHeader.H264.nalus[0].pps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus_length = 1;
+  bool retransmitted = false;
+  EXPECT_EQ(kCompleteSession,
+            jitter_buffer_->InsertPacket(*packet_, &retransmitted));
+  // Not decodable since sps and pps are missing.
+  EXPECT_EQ(nullptr, DecodeCompleteFrame());
+
+  timestamp_ += 3000;
+  packet_->timestamp = timestamp_;
+  ++seq_num_;
+  packet_->seqNum = seq_num_;
+  packet_->frameType = kVideoFrameKey;
+  packet_->isFirstPacket = true;
+  packet_->markerBit = false;
+  packet_->codec = kVideoCodecH264;
+  packet_->video_header.codec = kRtpVideoH264;
+  packet_->video_header.codecHeader.H264.nalu_type = H264::NaluType::kStapA;
+  packet_->video_header.codecHeader.H264.nalus[0].type = H264::NaluType::kSps;
+  packet_->video_header.codecHeader.H264.nalus[0].sps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus[0].pps_id = -1;
+  packet_->video_header.codecHeader.H264.nalus[1].type = H264::NaluType::kPps;
+  packet_->video_header.codecHeader.H264.nalus[1].sps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus[1].pps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus_length = 2;
+  // Not complete since the marker bit hasn't been received.
+  EXPECT_EQ(kIncomplete,
+            jitter_buffer_->InsertPacket(*packet_, &retransmitted));
+
+  ++seq_num_;
+  packet_->seqNum = seq_num_;
+  packet_->frameType = kVideoFrameKey;
+  packet_->isFirstPacket = false;
+  packet_->markerBit = true;
+  packet_->codec = kVideoCodecH264;
+  packet_->video_header.codec = kRtpVideoH264;
+  packet_->video_header.codecHeader.H264.nalu_type = H264::NaluType::kIdr;
+  packet_->video_header.codecHeader.H264.nalus[0].type = H264::NaluType::kIdr;
+  packet_->video_header.codecHeader.H264.nalus[0].sps_id = -1;
+  packet_->video_header.codecHeader.H264.nalus[0].pps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus_length = 1;
+  // Complete and decodable since the pps and sps are received in the first
+  // packet of this frame.
+  EXPECT_EQ(kCompleteSession,
+            jitter_buffer_->InsertPacket(*packet_, &retransmitted));
+  VCMEncodedFrame* frame_out = DecodeCompleteFrame();
+  ASSERT_NE(nullptr, frame_out);
+  jitter_buffer_->ReleaseFrame(frame_out);
+
+  timestamp_ += 3000;
+  packet_->timestamp = timestamp_;
+  ++seq_num_;
+  packet_->seqNum = seq_num_;
+  packet_->frameType = kVideoFrameDelta;
+  packet_->isFirstPacket = true;
+  packet_->markerBit = true;
+  packet_->codec = kVideoCodecH264;
+  packet_->video_header.codec = kRtpVideoH264;
+  packet_->video_header.codecHeader.H264.nalu_type = H264::NaluType::kSlice;
+  packet_->video_header.codecHeader.H264.nalus[0].type = H264::NaluType::kSlice;
+  packet_->video_header.codecHeader.H264.nalus[0].sps_id = -1;
+  packet_->video_header.codecHeader.H264.nalus[0].pps_id = 0;
+  packet_->video_header.codecHeader.H264.nalus_length = 1;
+  // Complete and decodable since sps, pps and key frame has been received.
+  EXPECT_EQ(kCompleteSession,
+            jitter_buffer_->InsertPacket(*packet_, &retransmitted));
+  frame_out = DecodeCompleteFrame();
+  ASSERT_NE(nullptr, frame_out);
+  jitter_buffer_->ReleaseFrame(frame_out);
+}
+
 // Test threshold conditions of decodable state.
 TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) {
   jitter_buffer_->SetDecodeErrorMode(kSelectiveErrors);
   // Always start with a key frame. Use 10 packets to test Decodable State
   // boundaries.
   packet_->frameType = kVideoFrameKey;
   packet_->isFirstPacket = true;
   packet_->markerBit = false;
   packet_->seqNum = seq_num_;
   packet_->timestamp = timestamp_;
@@ skipping 1453 matching lines @@
   nack_list = jitter_buffer_->GetNackList(&extended);
   EXPECT_EQ(0u, nack_list.size());
 
   // Stream should be decodable from this point.
   clock_->AdvanceTimeMilliseconds(kDefaultFramePeriodMs);
   InsertFrame(kVideoFrameDelta);
   EXPECT_TRUE(DecodeCompleteFrame());
   nack_list = jitter_buffer_->GetNackList(&extended);
   EXPECT_EQ(0u, nack_list.size());
 }
-
 }  // namespace webrtc