Drop VideoOptions from VideoSendParameters.

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 715 matching lines @@
   }
 
   // Handle max bitrate.
   if (params.max_bandwidth_bps != bitrate_config_.max_bitrate_bps &&
       params.max_bandwidth_bps >= 0) {
     // 0 uncaps max bitrate (-1).
     changed_params->max_bandwidth_bps = rtc::Optional<int>(
         params.max_bandwidth_bps == 0 ? -1 : params.max_bandwidth_bps);
   }
 
-  // Handle options.
-  // TODO(pbos): Require VideoSendParameters to contain a full set of options
-  // and check if params.options != options_ instead of applying a delta.
-  VideoOptions new_options = options_;
-  new_options.SetAll(params.options);
-  if (!(new_options == options_)) {
-    changed_params->options = rtc::Optional<VideoOptions>(new_options);
-  }
-
   // Handle RTCP mode.
   if (params.rtcp.reduced_size != send_params_.rtcp.reduced_size) {
     changed_params->rtcp_mode = rtc::Optional<webrtc::RtcpMode>(
         params.rtcp.reduced_size ? webrtc::RtcpMode::kReducedSize
                                  : webrtc::RtcpMode::kCompound);
   }
 
   return true;
 }
 
@@ skipping 38 matching lines @@
         bitrate_config_.min_bitrate_bps > max_bitrate_bps) {
       bitrate_config_.min_bitrate_bps = max_bitrate_bps;
     }
     bitrate_config_changed = true;
   }
 
   if (bitrate_config_changed) {
     call_->SetBitrateConfig(bitrate_config_);
   }
 
-  if (changed_params.options)
-    options_.SetAll(*changed_params.options);
-
   {
     rtc::CritScope stream_lock(&stream_crit_);
     for (auto& kv : send_streams_) {
       kv.second->SetSendParameters(changed_params);
     }
     if (changed_params.codec) {
       // Update receive feedback parameters from new codec.
       LOG(LS_INFO)
           << "SetFeedbackOptions on all the receive streams because the send "
              "codec has changed.";
@@ skipping 127 matching lines @@
   LOG(LS_INFO) << "SetVideoSend (ssrc= " << ssrc << ", enable = " << enable
                << "options: " << (options ? options->ToString() : "nullptr")
                << ").";
 
   // TODO(solenberg): The state change should be fully rolled back if any one of
   //                  these calls fail.
   if (!MuteStream(ssrc, !enable)) {
     return false;
   }
   if (enable && options) {
-    VideoSendParameters new_params = send_params_;
-    new_params.options.SetAll(*options);
-    SetSendParameters(send_params_);
+    SetOptions(ssrc, *options);
   }
   return true;
 }
 
 bool WebRtcVideoChannel2::ValidateSendSsrcAvailability(
     const StreamParams& sp) const {
   for (uint32_t ssrc : sp.ssrcs) {
     if (send_ssrcs_.find(ssrc) != send_ssrcs_.end()) {
       LOG(LS_ERROR) << "Send stream with SSRC '" << ssrc << "' already exists.";
       return false;
@@ skipping 403 matching lines @@
   if (send_streams_.find(ssrc) == send_streams_.end()) {
     LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
     return false;
   }
 
   send_streams_[ssrc]->MuteStream(mute);
   return true;
 }
 
 // TODO(pbos): Remove SetOptions in favor of SetSendParameters.
-void WebRtcVideoChannel2::SetOptions(const VideoOptions& options) {
-  VideoSendParameters new_params = send_params_;
-  new_params.options.SetAll(options);
-  SetSendParameters(send_params_);
+void WebRtcVideoChannel2::SetOptions(uint32_t ssrc,
+                                     const VideoOptions& options) {
+  LOG(LS_INFO) << "SetOptions: ssrc " << ssrc << ": " << options.ToString();
+
+  rtc::CritScope stream_lock(&stream_crit_);
+  if (send_streams_.find(ssrc) == send_streams_.end()) {
+    return;
+  }
+  send_streams_[ssrc]->SetOptions(options);
 }
 
 void WebRtcVideoChannel2::SetInterface(NetworkInterface* iface) {
   MediaChannel::SetInterface(iface);
   // Set the RTP recv/send buffer to a bigger size
   MediaChannel::SetOption(NetworkInterface::ST_RTP,
                           rtc::Socket::OPT_RCVBUF,
                           kVideoRtpBufferSize);
 
   // Speculative change to increase the outbound socket buffer size.
@@ skipping 394 matching lines @@
     recreate_stream = true;
   }
   if (params.max_bandwidth_bps) {
     // Max bitrate has changed, reconfigure encoder settings on the next frame
     // or stream recreation.
     parameters_.max_bitrate_bps = *params.max_bandwidth_bps;
     pending_encoder_reconfiguration_ = true;
   }
   // Set codecs and options.
   if (params.codec) {
-    SetCodecAndOptions(*params.codec,
-                       params.options ? *params.options : parameters_.options);
+    SetCodecAndOptions(*params.codec, parameters_.options);
     return;
-  } else if (params.options) {
-    // Reconfigure if codecs are already set.
-    if (parameters_.codec_settings) {
-      SetCodecAndOptions(*parameters_.codec_settings, *params.options);
-      return;
-    } else {
-      parameters_.options = *params.options;
-    }
   }
   if (recreate_stream) {
     LOG(LS_INFO) << "RecreateWebRtcStream (send) because of SetSendParameters";
     RecreateWebRtcStream();
   }
 }
 
 webrtc::VideoEncoderConfig
 WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig(
     const Dimensions& dimensions,
@@ skipping 665 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