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

webrtc/video/rtp_stream_receiver.cc

Index: webrtc/video/rtp_stream_receiver.cc
diff --git a/webrtc/video/rtp_stream_receiver.cc b/webrtc/video/rtp_stream_receiver.cc
index d2360858729993b3432006b746bc0c54516d729b..c153729be964e8912df41ab49b187ee0008e25ff 100644
--- a/webrtc/video/rtp_stream_receiver.cc
+++ b/webrtc/video/rtp_stream_receiver.cc
@@ -221,7 +221,9 @@ RtpStreamReceiver::~RtpStreamReceiver() {
 
   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();
 }
 
@@ -257,7 +259,6 @@ 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);
@@ -292,6 +293,7 @@ int32_t RtpStreamReceiver::OnReceivedPayloadData(
 
     packet_buffer_->InsertPacket(&packet);
   } else {
+    RTC_DCHECK(video_receiver_);
     if (video_receiver_->IncomingPacket(payload_data, payload_size,
                                         rtp_header_with_ntp) != 0) {
       // Check this...
@@ -672,7 +674,7 @@ void RtpStreamReceiver::InsertSpsPpsIntoTracker(uint8_t payload_type) {
     return;
 
   LOG(LS_INFO) << "Found out of band supplied codec parameters for"
-               << " payload type: " << payload_type;
+               << " payload type: " << (unsigned int)payload_type;

[sprang_webrtc, 2017/01/18 10:05:10]

nit: prefer uint32_t alias to unsigned int

[johan, 2017/01/18 12:38:29]

This one makes the LOG ostream interpret 'payload_type' as number instead of
char. It's a hack anyway. But ok, going with uint32_t. 

[sprang_webrtc, 2017/01/23 12:57:08]

Right, so int would work as well.
Also, style guide says to use static_cast instead of c style :/

 
   H264SpropParameterSets sprop_decoder;
   auto sprop_base64_it =
@@ -681,10 +683,11 @@ void RtpStreamReceiver::InsertSpsPpsIntoTracker(uint8_t payload_type) {
   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