Keep all codec parameters in VideoReceiveStream::Decoder

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 2255 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& 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) {
   *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);
+    decoder.codec_params = recv_codecs[i].codec.params;
     config_.decoders.push_back(decoder);
   }
 
   // TODO(pbos): Reconfigure RTX based on incoming recv_codecs.
   config_.rtp.ulpfec = recv_codecs.front().ulpfec;
   flexfec_config_.flexfec_payload_type =
       recv_codecs.front().flexfec.flexfec_payload_type;
   config_.rtp.nack.rtp_history_ms =
       HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0;
 }
@@ skipping 299 matching lines @@
         rtx_mapping[video_codecs[i].codec.id] !=
             ulpfec_config.red_payload_type) {
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket