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

webrtc/modules/video_coding/h264_sps_pps_tracker.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 27 matching lines @@
   const RTPVideoHeaderH264& codec_header = video_header.codecHeader.H264;
 
   // Packets that only contains SPS/PPS are not decodable by themselves, and
   // to avoid frames being created containing only these two nalus we don't
   // insert them into the PacketBuffer. Instead we save the SPS/PPS and
   // prepend the bitstream of first packet of an IDR referring to the
   // corresponding SPS/PPS id.
   bool insert_packet = codec_header.nalus_length == 0 ? true : false;
 
   int pps_id = -1;
+  int sps_id = -1;
   size_t required_size = 0;
   for (size_t i = 0; i < codec_header.nalus_length; ++i) {
     const NaluInfo& nalu = codec_header.nalus[i];
     switch (nalu.type) {
       case H264::NaluType::kSps: {
         // Save SPS.
         sps_data_[nalu.sps_id].size = nalu.size;
         sps_data_[nalu.sps_id].data.reset(new uint8_t[nalu.size]);
         memcpy(sps_data_[nalu.sps_id].data.get(), data + nalu.offset,
                nalu.size);
+        sps_data_[nalu.sps_id].width = packet->width;
+        sps_data_[nalu.sps_id].height = packet->height;
         break;
       }
       case H264::NaluType::kPps: {
         // Save PPS.
         pps_data_[nalu.pps_id].sps_id = nalu.sps_id;
         pps_data_[nalu.pps_id].size = nalu.size;
         pps_data_[nalu.pps_id].data.reset(new uint8_t[nalu.size]);
         memcpy(pps_data_[nalu.pps_id].data.get(), data + nalu.offset,
                nalu.size);
         break;
       }
       case H264::NaluType::kIdr: {
         // If this is the first packet of an IDR, make sure we have the required
         // SPS/PPS and also calculate how much extra space we need in the buffer
         // to prepend the SPS/PPS to the bitstream with start codes.
         if (video_header.is_first_packet_in_frame) {
           if (nalu.pps_id == -1) {
             LOG(LS_WARNING) << "No PPS id in IDR nalu.";
             return kRequestKeyframe;
           }
 
           auto pps = pps_data_.find(nalu.pps_id);
           if (pps == pps_data_.end()) {
             LOG(LS_WARNING) << "No PPS with id << " << nalu.pps_id
                             << " received";
             return kRequestKeyframe;
           }
 
-          auto sps = sps_data_.find(pps->second.sps_id);
+          sps_id = pps->second.sps_id;
+          auto sps = sps_data_.find(sps_id);
           if (sps == sps_data_.end()) {
             LOG(LS_WARNING) << "No SPS with id << "
                             << pps_data_[nalu.pps_id].sps_id << " received";
             return kRequestKeyframe;
           }
 
           pps_id = nalu.pps_id;
           required_size += pps->second.size + sizeof(start_code_h264);
           required_size += sps->second.size + sizeof(start_code_h264);
         }
@@ skipping 73 matching lines @@
       nalu_ptr += segment_length;
     }
   } else {
     if (video_header.is_first_packet_in_frame) {
       memcpy(insert_at, start_code_h264, sizeof(start_code_h264));
       insert_at += sizeof(start_code_h264);
     }
     memcpy(insert_at, data, data_size);
   }
 
+  if (sps_id != -1) {
+    packet->width = sps_data_[sps_id].width;
+    packet->height = sps_data_[sps_id].height;
+  }
+
   packet->dataPtr = buffer;
   packet->sizeBytes = required_size;
   return kInsert;
 }
 
 void H264SpsPpsTracker::InsertSpsPpsNalus(const std::vector<uint8_t>& sps,
                                           const std::vector<uint8_t>& pps) {
   constexpr size_t kNaluHeaderOffset = 1;
   if (sps.size() < kNaluHeaderOffset) {
     LOG(LS_WARNING) << "SPS size  " << sps.size() << " is smaller than "
@@ skipping 25 matching lines @@
   if (!parsed_pps) {
     LOG(LS_WARNING) << "Failed to parse PPS.";
   }
 
   if (!parsed_pps || !parsed_sps) {
     return;
   }
 
   SpsInfo sps_info;
   sps_info.size = sps.size();
+  sps_info.width = parsed_sps->width;
+  sps_info.height = parsed_sps->height;
   uint8_t* sps_data = new uint8_t[sps_info.size];
   memcpy(sps_data, sps.data(), sps_info.size);
   sps_info.data.reset(sps_data);
   sps_data_[parsed_sps->id] = std::move(sps_info);
 
   PpsInfo pps_info;
   pps_info.size = pps.size();
   pps_info.sps_id = parsed_pps->sps_id;
   uint8_t* pps_data = new uint8_t[pps_info.size];
   memcpy(pps_data, pps.data(), pps_info.size);
   pps_info.data.reset(pps_data);
   pps_data_[parsed_pps->id] = std::move(pps_info);
 
   LOG(LS_INFO) << "Inserted SPS id " << parsed_sps->id << " and PPS id "
                << parsed_pps->id << " (referencing SPS " << parsed_pps->sps_id
                << ")";
 }
 
 }  // namespace video_coding
 }  // namespace webrtc