Save width/height of SPS nalus and restore them on the first packet of an IDR.

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 247 matching lines @@
   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};
 
   // Generated by "ffmpeg -r 30 -f avfoundation -i "default" out.h264" on macos.
+  // width: 320, height: 240
   const std::vector<uint8_t> sps(
       {0x67, 0x7a, 0x00, 0x0d, 0xbc, 0xd9, 0x41, 0x41, 0xfa, 0x10, 0x00, 0x00,
        0x03, 0x00, 0x10, 0x00, 0x00, 0x03, 0x03, 0xc0, 0xf1, 0x42, 0x99, 0x60});
   const std::vector<uint8_t> pps({0x68, 0xeb, 0xe3, 0xcb, 0x22, 0xc0});
   tracker_.InsertSpsPpsNalus(sps, pps);
 
   // Insert first packet of the IDR.
   VCMPacket idr_packet = GetDefaultPacket();
   idr_packet.video_header.is_first_packet_in_frame = true;
   AddIdr(&idr_packet, 0);
   idr_packet.dataPtr = kData;
   idr_packet.sizeBytes = sizeof(kData);
   EXPECT_EQ(H264SpsPpsTracker::kInsert,
             tracker_.CopyAndFixBitstream(&idr_packet));
+  EXPECT_EQ(320, idr_packet.width);
+  EXPECT_EQ(240, idr_packet.height);
   if (idr_packet.dataPtr != kData) {
     // In case CopyAndFixBitStream() prepends SPS/PPS nalus to the packet, it
     // uses new uint8_t[] to allocate memory. Caller of CopyAndFixBitStream()
     // needs to take care of freeing the memory.
     delete[] idr_packet.dataPtr;
   }
 }
 
 TEST_F(TestH264SpsPpsTracker, SpsPpsOutOfBandWrongNaluHeader) {
   constexpr uint8_t kData[] = {1, 2, 3};
@@ skipping 28 matching lines @@
   // Insert first packet of the IDR.
   VCMPacket idr_packet = GetDefaultPacket();
   idr_packet.video_header.is_first_packet_in_frame = true;
   AddIdr(&idr_packet, 0);
   idr_packet.dataPtr = kData;
   idr_packet.sizeBytes = sizeof(kData);
   EXPECT_EQ(H264SpsPpsTracker::kRequestKeyframe,
             tracker_.CopyAndFixBitstream(&idr_packet));
 }
 
+TEST_F(TestH264SpsPpsTracker, SaveRestoreWidthHeight) {
+  std::vector<uint8_t> data;
+
+  // Insert an SPS/PPS packet with width/height and make sure
+  // that information is set on the first IDR packet.
+  VCMPacket sps_pps_packet1 = GetDefaultPacket();
+  AddSps(&sps_pps_packet1, 0, &data);
+  AddPps(&sps_pps_packet1, 0, 1, &data);
+  sps_pps_packet1.dataPtr = data.data();
+  sps_pps_packet1.sizeBytes = data.size();
+  sps_pps_packet1.width = 320;
+  sps_pps_packet1.height = 240;
+  EXPECT_EQ(H264SpsPpsTracker::kDrop,
+            tracker_.CopyAndFixBitstream(&sps_pps_packet1));
+
+  VCMPacket idr_packet1 = GetDefaultPacket();
+  idr_packet1.video_header.is_first_packet_in_frame = true;
+  AddIdr(&idr_packet1, 1);
+  data.insert(data.end(), {1, 2, 3});
+  idr_packet1.dataPtr = data.data();
+  idr_packet1.sizeBytes = data.size();
+  EXPECT_EQ(H264SpsPpsTracker::kInsert,
+            tracker_.CopyAndFixBitstream(&idr_packet1));
+
+  EXPECT_EQ(320, idr_packet1.width);
+  EXPECT_EQ(240, idr_packet1.height);
+  delete[] idr_packet1.dataPtr;
+}
+
 }  // namespace video_coding
 }  // namespace webrtc