Add decoder-specific settings with proper lifetime.

webrtc/media/engine/webrtcvideoengine2.cc

Index: webrtc/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index 5da8e33e1e0d784ab4e5b879a1b19cb5cc2fbeb8..abb73784db1648b2a5ecb73885f020dd4009d007 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -2331,6 +2331,18 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::CreateOrReuseVideoDecoder(
       webrtc::kVideoCodecUnknown, false);
 }
 
+void configureDecoderSpecifics(webrtc::VideoReceiveStream::Decoder* decoder,

[stefan-webrtc, 2016/08/01 10:58:09]

No camel case

[johan, 2016/08/01 12:08:04]

Style in this file seems to be camel case for function names, but starting upper
case. Changed name to this style for consistence. See lines 150..367 for
reference.

+                               const cricket::VideoCodec& recvVideoCodec) {

[stefan-webrtc, 2016/08/01 10:58:09]

same here

[johan, 2016/08/01 12:08:04]

Done.

+  if (recvVideoCodec.name.compare("H264")) {
+    cricket::CodecParameterMap::const_iterator found =

[sprang_webrtc, 2016/07/28 12:42:48]

nit: "auto" would be easier on the eye :)

[stefan-webrtc, 2016/08/01 10:58:09]

rename found it instead, that's what is typically used in the code.

[johan, 2016/08/01 12:08:04]

Went for "auto it".

+        recvVideoCodec.params.find("sprop-parameter-sets");
+    if (found != recvVideoCodec.params.end()) {
+      decoder->decoder_specific.h264_extra_settings->spropParameterSets =
+          found->second;
+    }
+  }
+}
+
 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ConfigureCodecs(
     const std::vector<VideoCodecSettings>& recv_codecs,
     std::vector<AllocatedDecoder>* old_decoders) {
@@ -2346,6 +2358,7 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ConfigureCodecs(
     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);
   }