Unit test out of band H264 SPS,PPS within RtpStreamReceiver.

webrtc/video/rtp_stream_receiver.cc

 /*
  *  Copyright (c) 2012 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 203 matching lines @@
 }
 
 RtpStreamReceiver::~RtpStreamReceiver() {
   process_thread_->DeRegisterModule(rtp_rtcp_.get());
 
   if (jitter_buffer_experiment_)
     process_thread_->DeRegisterModule(nack_module_.get());
 
   packet_router_->RemoveRtpModule(rtp_rtcp_.get());
   rtp_rtcp_->SetREMBStatus(false);
-  remb_->RemoveReceiveChannel(rtp_rtcp_.get());
+  if (config_.rtp.remb) {
+    remb_->RemoveReceiveChannel(rtp_rtcp_.get());
+  }
   UpdateHistograms();
 }
 
 bool RtpStreamReceiver::AddReceiveCodec(
     const VideoCodec& video_codec,
     const std::map<std::string, std::string>& codec_params) {
   pt_codec_params_.insert(make_pair(video_codec.plType, codec_params));
   return AddReceiveCodec(video_codec);
 }
 
@@ skipping 15 matching lines @@
 }
 
 RtpReceiver* RtpStreamReceiver::GetRtpReceiver() const {
   return rtp_receiver_.get();
 }
 
 int32_t RtpStreamReceiver::OnReceivedPayloadData(
     const uint8_t* payload_data,
     size_t payload_size,
     const WebRtcRTPHeader* rtp_header) {
-  RTC_DCHECK(video_receiver_);
   WebRtcRTPHeader rtp_header_with_ntp = *rtp_header;
   rtp_header_with_ntp.ntp_time_ms =
       ntp_estimator_.Estimate(rtp_header->header.timestamp);
   if (jitter_buffer_experiment_) {
     VCMPacket packet(payload_data, payload_size, rtp_header_with_ntp);
     timing_->IncomingTimestamp(packet.timestamp, clock_->TimeInMilliseconds());
     packet.timesNacked = nack_module_->OnReceivedPacket(packet);
 
     if (packet.codec == kVideoCodecH264) {
       // Only when we start to receive packets will we know what payload type
@@ skipping 14 matching lines @@
           break;
       }
     } else {
       uint8_t* data = new uint8_t[packet.sizeBytes];
       memcpy(data, packet.dataPtr, packet.sizeBytes);
       packet.dataPtr = data;
     }
 
     packet_buffer_->InsertPacket(&packet);
   } else {
+    RTC_DCHECK(video_receiver_);
     if (video_receiver_->IncomingPacket(payload_data, payload_size,
                                         rtp_header_with_ntp) != 0) {
       // Check this...
       return -1;
     }
   }
   return 0;
 }
 
 bool RtpStreamReceiver::OnRecoveredPacket(const uint8_t* rtp_packet,
@@ skipping 360 matching lines @@
   RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
       StringToRtpExtensionType(extension), id));
 }
 
 void RtpStreamReceiver::InsertSpsPpsIntoTracker(uint8_t payload_type) {
   auto codec_params_it = pt_codec_params_.find(payload_type);
   if (codec_params_it == pt_codec_params_.end())
     return;
 
   LOG(LS_INFO) << "Found out of band supplied codec parameters for"
-               << " payload type: " << payload_type;
+               << " payload type: " << (uint32_t)payload_type;
 
   H264SpropParameterSets sprop_decoder;
   auto sprop_base64_it =
       codec_params_it->second.find(cricket::kH264FmtpSpropParameterSets);
 
   if (sprop_base64_it == codec_params_it->second.end())
     return;
 
-  if (!sprop_decoder.DecodeSprop(sprop_base64_it->second))
+  if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
     return;
 
-  tracker_.InsertSpsPps(sprop_decoder.sps_nalu(), sprop_decoder.pps_nalu());
+  tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
+                             sprop_decoder.pps_nalu());
 }
 
 }  // namespace webrtc