Add proper lifetime of encoder-specific settings.

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 428 matching lines @@
   stream.target_bitrate_bps = stream.max_bitrate_bps = max_bitrate_bps;
 
   int max_qp = kDefaultQpMax;
   codec.GetParam(kCodecParamMaxQuantization, &max_qp);
   stream.max_qp = max_qp;
   std::vector<webrtc::VideoStream> streams;
   streams.push_back(stream);
   return streams;
 }
 
-void* WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings(
+rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings>
+WebRtcVideoChannel2::WebRtcVideoSendStream::ConfigureVideoEncoderSettings(
     const VideoCodec& codec) {
   bool is_screencast = parameters_.options.is_screencast.value_or(false);
   // No automatic resizing when using simulcast or screencast.
   bool automatic_resize =
       !is_screencast && parameters_.config.rtp.ssrcs.size() == 1;
   bool frame_dropping = !is_screencast;
   bool denoising;
   bool codec_default_denoising = false;
   if (is_screencast) {
     denoising = false;
   } else {
     // Use codec default if video_noise_reduction is unset.
     codec_default_denoising = !parameters_.options.video_noise_reduction;
     denoising = parameters_.options.video_noise_reduction.value_or(false);
   }
 
   if (CodecNamesEq(codec.name, kH264CodecName)) {
-    encoder_settings_.h264 = webrtc::VideoEncoder::GetDefaultH264Settings();
-    encoder_settings_.h264.frameDroppingOn = frame_dropping;
-    return &encoder_settings_.h264;
+    webrtc::VideoCodecH264 h264_settings =
+        webrtc::VideoEncoder::GetDefaultH264Settings();
+    h264_settings.frameDroppingOn = frame_dropping;
+    return new rtc::RefCountedObject<
+        webrtc::VideoEncoderConfig::H264EncoderSpecificSettings>(h264_settings);
   }
   if (CodecNamesEq(codec.name, kVp8CodecName)) {
-    encoder_settings_.vp8 = webrtc::VideoEncoder::GetDefaultVp8Settings();
-    encoder_settings_.vp8.automaticResizeOn = automatic_resize;
+    webrtc::VideoCodecVP8 vp8_settings =
+        webrtc::VideoEncoder::GetDefaultVp8Settings();
+    vp8_settings.automaticResizeOn = automatic_resize;
     // VP8 denoising is enabled by default.
-    encoder_settings_.vp8.denoisingOn =
-        codec_default_denoising ? true : denoising;
-    encoder_settings_.vp8.frameDroppingOn = frame_dropping;
-    return &encoder_settings_.vp8;
+    vp8_settings.denoisingOn = codec_default_denoising ? true : denoising;
+    vp8_settings.frameDroppingOn = frame_dropping;
+    return new rtc::RefCountedObject<
+        webrtc::VideoEncoderConfig::Vp8EncoderSpecificSettings>(vp8_settings);
   }
   if (CodecNamesEq(codec.name, kVp9CodecName)) {
-    encoder_settings_.vp9 = webrtc::VideoEncoder::GetDefaultVp9Settings();
+    webrtc::VideoCodecVP9 vp9_settings =
+        webrtc::VideoEncoder::GetDefaultVp9Settings();
     if (is_screencast) {
       // TODO(asapersson): Set to 2 for now since there is a DCHECK in
       // VideoSendStream::ReconfigureVideoEncoder.
-      encoder_settings_.vp9.numberOfSpatialLayers = 2;
+      vp9_settings.numberOfSpatialLayers = 2;
     } else {
-      encoder_settings_.vp9.numberOfSpatialLayers =
-          GetDefaultVp9SpatialLayers();
+      vp9_settings.numberOfSpatialLayers = GetDefaultVp9SpatialLayers();
     }
     // VP9 denoising is disabled by default.
-    encoder_settings_.vp9.denoisingOn =
-        codec_default_denoising ? false : denoising;
-    encoder_settings_.vp9.frameDroppingOn = frame_dropping;
-    return &encoder_settings_.vp9;
+    vp9_settings.denoisingOn = codec_default_denoising ? false : denoising;
+    vp9_settings.frameDroppingOn = frame_dropping;
+    return new rtc::RefCountedObject<
+        webrtc::VideoEncoderConfig::Vp9EncoderSpecificSettings>(vp9_settings);
   }
-  return NULL;
+  return nullptr;
 }
 
 DefaultUnsignalledSsrcHandler::DefaultUnsignalledSsrcHandler()
     : default_recv_ssrc_(0), default_sink_(NULL) {}
 
 UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc(
     WebRtcVideoChannel2* channel,
     uint32_t ssrc) {
   if (default_recv_ssrc_ != 0) {  // Already one default stream.
     LOG(LS_WARNING) << "Unknown SSRC, but default receive stream already set.";
@@ skipping 2159 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