Keep all codec parameters in VideoReceiveStream::Decoder

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 8f1d1f1ffc56d9d127fa78fbe3d88917dc07133e..5055c57bc33f12acb9be53859bda6d45cc6a2f79 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -2273,20 +2273,6 @@ 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) {
@@ -2302,7 +2288,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);
+    decoder.codec_params = recv_codecs[i].codec.params;
     config_.decoders.push_back(decoder);
   }