Only append SPS/PPS to bitstream if supplied out of band.

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 17 matching lines @@
   VCMPacket GetDefaultPacket() {
     VCMPacket packet;
     packet.codec = kVideoCodecH264;
     packet.video_header.codecHeader.H264.nalus_length = 0;
     packet.video_header.is_first_packet_in_frame = false;
     packet.video_header.codecHeader.H264.packetization_type = kH264SingleNalu;
 
     return packet;
   }
 
-  void AddSps(VCMPacket* packet, int sps_id, std::vector<uint8_t>* data) {
+  void AddSps(VCMPacket* packet, uint8_t sps_id, std::vector<uint8_t>* data) {
     NaluInfo info;
     info.type = H264::NaluType::kSps;
     info.sps_id = sps_id;
     info.pps_id = -1;
-    info.offset = data->size();
-    info.size = 2;
     data->push_back(H264::NaluType::kSps);
     data->push_back(sps_id);  // The sps data, just a single byte.
 
     packet->video_header.codecHeader.H264
         .nalus[packet->video_header.codecHeader.H264.nalus_length++] = info;
   }
 
   void AddPps(VCMPacket* packet,
-              int sps_id,
-              int pps_id,
+              uint8_t sps_id,
+              uint8_t pps_id,
               std::vector<uint8_t>* data) {
     NaluInfo info;
     info.type = H264::NaluType::kPps;
     info.sps_id = sps_id;
     info.pps_id = pps_id;
-    info.offset = data->size();
-    info.size = 2;
     data->push_back(H264::NaluType::kPps);
     data->push_back(pps_id);  // The pps data, just a single byte.
 
     packet->video_header.codecHeader.H264
         .nalus[packet->video_header.codecHeader.H264.nalus_length++] = info;
   }
 
   void AddIdr(VCMPacket* packet, int pps_id) {
     NaluInfo info;
     info.type = H264::NaluType::kIdr;
@@ skipping 121 matching lines @@
   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_EQ(H264SpsPpsTracker::kInsert,
             tracker_.CopyAndFixBitstream(&sps_pps_packet));
+  delete[] sps_pps_packet.dataPtr;
   data.clear();
 
   // Insert first packet of the IDR
   VCMPacket idr_packet = GetDefaultPacket();
   idr_packet.video_header.is_first_packet_in_frame = true;
   AddIdr(&idr_packet, 1);
   data.insert(data.end(), {1, 2, 3});
   idr_packet.dataPtr = data.data();
   idr_packet.sizeBytes = data.size();
   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.is_first_packet_in_frame = 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_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;
 }
 
 TEST_F(TestH264SpsPpsTracker, SpsPpsOutOfBand) {
   constexpr uint8_t kData[] = {1, 2, 3};
@@ skipping 71 matching lines @@
   // that information is set on the first IDR packet.
   VCMPacket sps_pps_packet = GetDefaultPacket();
   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();
   sps_pps_packet.width = 320;
   sps_pps_packet.height = 240;
   EXPECT_EQ(H264SpsPpsTracker::kInsert,
             tracker_.CopyAndFixBitstream(&sps_pps_packet));
+  delete[] sps_pps_packet.dataPtr;
 
   VCMPacket idr_packet = GetDefaultPacket();
   idr_packet.video_header.is_first_packet_in_frame = true;
   AddIdr(&idr_packet, 1);
   data.insert(data.end(), {1, 2, 3});
   idr_packet.dataPtr = data.data();
   idr_packet.sizeBytes = data.size();
   EXPECT_EQ(H264SpsPpsTracker::kInsert,
             tracker_.CopyAndFixBitstream(&idr_packet));
 
   EXPECT_EQ(320, idr_packet.width);
   EXPECT_EQ(240, idr_packet.height);
   delete[] idr_packet.dataPtr;
 }
 
 }  // namespace video_coding
 }  // namespace webrtc