H264SpsPpsTracker now return PacketAction on CopyAndFixBitstream.

webrtc/modules/video_coding/h264_sps_pps_tracker_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 69 matching lines @@
   H264SpsPpsTracker tracker_;
 };
 
 TEST_F(TestH264SpsPpsTracker, NoNalus) {
   uint8_t data[] = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.codecHeader.H264.packetization_type = kH264FuA;
   packet.dataPtr = data;
   packet.sizeBytes = sizeof(data);
 
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert, tracker_.CopyAndFixBitstream(&packet));
   EXPECT_EQ(memcmp(packet.dataPtr, data, sizeof(data)), 0);
   delete[] packet.dataPtr;
 }
 
 TEST_F(TestH264SpsPpsTracker, FuAFirstPacket) {
   uint8_t data[] = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.codecHeader.H264.packetization_type = kH264FuA;
   packet.video_header.isFirstPacket = true;
   packet.dataPtr = data;
   packet.sizeBytes = sizeof(data);
 
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert, tracker_.CopyAndFixBitstream(&packet));
   std::vector<uint8_t> expected;
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {1, 2, 3});
   EXPECT_EQ(memcmp(packet.dataPtr, expected.data(), expected.size()), 0);
   delete[] packet.dataPtr;
 }
 
 TEST_F(TestH264SpsPpsTracker, StapAIncorrectSegmentLength) {
   uint8_t data[] = {0, 0, 2, 0};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.codecHeader.H264.packetization_type = kH264StapA;
   packet.video_header.isFirstPacket = true;
   packet.dataPtr = data;
   packet.sizeBytes = sizeof(data);
 
-  EXPECT_FALSE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kDrop, tracker_.CopyAndFixBitstream(&packet));
 }
 
 TEST_F(TestH264SpsPpsTracker, NoNalusFirstPacket) {
   uint8_t data[] = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.isFirstPacket = true;
   packet.dataPtr = data;
   packet.sizeBytes = sizeof(data);
 
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert, tracker_.CopyAndFixBitstream(&packet));
   std::vector<uint8_t> expected;
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {1, 2, 3});
   EXPECT_EQ(memcmp(packet.dataPtr, expected.data(), expected.size()), 0);
   delete[] packet.dataPtr;
 }
 
 TEST_F(TestH264SpsPpsTracker, IdrNoSpsPpsInserted) {
   std::vector<uint8_t> data = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.codecHeader.H264.packetization_type = kH264FuA;
 
   AddIdr(&packet, 0);
   packet.dataPtr = data.data();
   packet.sizeBytes = data.size();
 
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert, tracker_.CopyAndFixBitstream(&packet));
   EXPECT_EQ(memcmp(packet.dataPtr, data.data(), data.size()), 0);
   delete[] packet.dataPtr;
 }
 
 TEST_F(TestH264SpsPpsTracker, IdrFirstPacketNoSpsPpsInserted) {
   std::vector<uint8_t> data = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.isFirstPacket = true;
 
   AddIdr(&packet, 0);
   packet.dataPtr = data.data();
   packet.sizeBytes = data.size();
 
-  EXPECT_FALSE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kRequestKeyframe,
+            tracker_.CopyAndFixBitstream(&packet));
 }
 
 TEST_F(TestH264SpsPpsTracker, IdrFirstPacketNoPpsInserted) {
   std::vector<uint8_t> data = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.isFirstPacket = true;
 
   AddSps(&packet, 0, &data);
   AddIdr(&packet, 0);
   packet.dataPtr = data.data();
   packet.sizeBytes = data.size();
 
-  EXPECT_FALSE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kRequestKeyframe,
+            tracker_.CopyAndFixBitstream(&packet));
 }
 
 TEST_F(TestH264SpsPpsTracker, IdrFirstPacketNoSpsInserted) {
   std::vector<uint8_t> data = {1, 2, 3};
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.isFirstPacket = true;
 
   AddPps(&packet, 0, 0, &data);
   AddIdr(&packet, 0);
   packet.dataPtr = data.data();
   packet.sizeBytes = data.size();
 
-  EXPECT_FALSE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kRequestKeyframe,
+            tracker_.CopyAndFixBitstream(&packet));
 }
 
 TEST_F(TestH264SpsPpsTracker, SpsPpsPacketThenIdrFirstPacket) {
   std::vector<uint8_t> data;
   VCMPacket sps_pps_packet = GetDefaultPacket();
 
   // Insert SPS/PPS
   AddSps(&sps_pps_packet, 0, &data);
   AddPps(&sps_pps_packet, 0, 1, &data);
   sps_pps_packet.dataPtr = data.data();
   sps_pps_packet.sizeBytes = data.size();
-  EXPECT_FALSE(tracker_.CopyAndFixBitstream(&sps_pps_packet));
+  EXPECT_EQ(H264SpsPpsTracker::kDrop,
+            tracker_.CopyAndFixBitstream(&sps_pps_packet));
   data.clear();
 
   // Insert first packet of the IDR
   VCMPacket idr_packet = GetDefaultPacket();
   idr_packet.video_header.isFirstPacket = true;
   AddIdr(&idr_packet, 1);
   data.insert(data.end(), {1, 2, 3});
   idr_packet.dataPtr = data.data();
   idr_packet.sizeBytes = data.size();
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&idr_packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert,
+            tracker_.CopyAndFixBitstream(&idr_packet));
 
   std::vector<uint8_t> expected;
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kSps, 0});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kPps, 1});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {1, 2, 3});
   EXPECT_EQ(memcmp(idr_packet.dataPtr, expected.data(), expected.size()), 0);
   delete[] idr_packet.dataPtr;
 }
 
 TEST_F(TestH264SpsPpsTracker, SpsPpsIdrInStapA) {
   std::vector<uint8_t> data;
   VCMPacket packet = GetDefaultPacket();
   packet.video_header.codecHeader.H264.packetization_type = kH264StapA;
   packet.video_header.isFirstPacket = true;  // Always true for StapA
 
   data.insert(data.end(), {0});     // First byte is ignored
   data.insert(data.end(), {0, 2});  // Length of segment
   AddSps(&packet, 13, &data);
   data.insert(data.end(), {0, 2});  // Length of segment
   AddPps(&packet, 13, 27, &data);
   data.insert(data.end(), {0, 5});  // Length of segment
   AddIdr(&packet, 27);
   data.insert(data.end(), {1, 2, 3, 2, 1});
 
   packet.dataPtr = data.data();
   packet.sizeBytes = data.size();
-  EXPECT_TRUE(tracker_.CopyAndFixBitstream(&packet));
+  EXPECT_EQ(H264SpsPpsTracker::kInsert, tracker_.CopyAndFixBitstream(&packet));
 
   std::vector<uint8_t> expected;
   // The SPS/PPS is repeated because this packet both contains the SPS/PPS
   // and it is the first packet of an IDR, which will cause the SPS/PPS to be
   // prepended to the bitstream.
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kSps, 13});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kPps, 27});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kSps, 13});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {H264::NaluType::kPps, 27});
   expected.insert(expected.end(), start_code, start_code + sizeof(start_code));
   expected.insert(expected.end(), {1, 2, 3, 2, 1});
 
   EXPECT_EQ(memcmp(packet.dataPtr, expected.data(), expected.size()), 0);
   delete[] packet.dataPtr;
 }
 
 }  // namespace video_coding
 }  // namespace webrtc