Add decoder-specific settings with proper lifetime.

webrtc/media/engine/webrtcvideoengine2.cc

 /*
  *  Copyright (c) 2014 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 2313 matching lines @@
   if (type == webrtc::kVideoCodecH264) {
     return AllocatedDecoder(
         webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kH264), type, false);
   }
 
   return AllocatedDecoder(
       webrtc::VideoDecoder::Create(webrtc::VideoDecoder::kUnsupportedCodec),
       webrtc::kVideoCodecUnknown, false);
 }
 
+void configureDecoderSpecifics(webrtc::VideoReceiveStream::Decoder* decoder,
+                               const cricket::VideoCodec& recvVideoCodec) {
+  if (recvVideoCodec.name.compare("H264")) {
+    rtc::scoped_refptr<webrtc::DecoderSpecificSettings> decoder_specifics =
+        new rtc::RefCountedObject<webrtc::DecoderSpecificSettings>();

[sprang_webrtc, 2016/07/27 08:37:25]

No need to create this instance if props not found below.

+    cricket::CodecParameterMap::const_iterator found =
+        recvVideoCodec.params.find("sprop-parameter-sets");
+    if (found != recvVideoCodec.params.end()) {
+      decoder_specifics->h264_extra_settings->spropParameterSets =
+          found->second;
+    }
+    decoder->decoder_specific = decoder_specifics;
+  }
+}
+
 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ConfigureCodecs(
     const std::vector<VideoCodecSettings>& recv_codecs,
     std::vector<AllocatedDecoder>* old_decoders) {
   *old_decoders = allocated_decoders_;
   allocated_decoders_.clear();
   config_.decoders.clear();
   for (size_t i = 0; i < recv_codecs.size(); ++i) {
     AllocatedDecoder allocated_decoder =
         CreateOrReuseVideoDecoder(old_decoders, recv_codecs[i].codec);
     allocated_decoders_.push_back(allocated_decoder);
 
     webrtc::VideoReceiveStream::Decoder decoder;
     decoder.decoder = allocated_decoder.decoder;
     decoder.payload_type = recv_codecs[i].codec.id;
     decoder.payload_name = recv_codecs[i].codec.name;
+    configureDecoderSpecifics(&decoder, recv_codecs[i].codec);
     config_.decoders.push_back(decoder);
   }
 
   // TODO(pbos): Reconfigure RTX based on incoming recv_codecs.
   config_.rtp.fec = recv_codecs.front().fec;
   config_.rtp.nack.rtp_history_ms =
       HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0;
 }
 
 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetLocalSsrc(
@@ skipping 292 matching lines @@
         rtx_mapping[video_codecs[i].codec.id] !=
             fec_settings.red_payload_type) {
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket