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..d2e7e250993edacf9832dd06f1347dd07eca39ef 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -2331,6 +2331,20 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::CreateOrReuseVideoDecoder(
       webrtc::kVideoCodecUnknown, false);
 }
 
+void ConfigureDecoderSpecifics(webrtc::VideoReceiveStream::Decoder* decoder,
+                               const cricket::VideoCodec& recv_video_codec) {
+  if (recv_video_codec.name.compare("H264") == 0) {
+    auto it = recv_video_codec.params.find("sprop-parameter-sets");
+    if (it != recv_video_codec.params.end()) {
+      decoder->decoder_specific.h264_extra_settings =
+          rtc::Optional<webrtc::VideoDecoderH264Settings>(
+              webrtc::VideoDecoderH264Settings());
+      decoder->decoder_specific.h264_extra_settings->sprop_parameter_sets =
+          it->second;
+    }
+  }
+}
+
 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ConfigureCodecs(
     const std::vector<VideoCodecSettings>& recv_codecs,
     std::vector<AllocatedDecoder>* old_decoders) {
@@ -2346,6 +2360,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);
   }