Apply VideoOptions per stream.

webrtc/media/engine/webrtcvideoengine2.h

Index: webrtc/media/engine/webrtcvideoengine2.h
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
index 16b7cc51577f306433e353df2565a1e700459a13..69a32c37f43e4858026fdb408fcba1a8c1db169e 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -211,7 +211,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
   bool MuteStream(uint32_t ssrc, bool mute);
 
   void SetMaxSendBandwidth(int bps);
-  void SetOptions(const VideoOptions& options);
+  void SetOptions(uint32_t ssrc, const VideoOptions& options);
 
   void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config,
                             const StreamParams& sp) const;
@@ -236,7 +236,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
         const StreamParams& sp,
         const webrtc::VideoSendStream::Config& config,
         WebRtcVideoEncoderFactory* external_encoder_factory,
-        const VideoOptions& options,
         int max_bitrate_bps,
         const rtc::Optional<VideoCodecSettings>& codec_settings,
         const std::vector<webrtc::RtpExtension>& rtp_extensions,
@@ -455,7 +454,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
   };
 
   void Construct(webrtc::Call* call, WebRtcVideoEngine2* engine);
-  void SetDefaultOptions();
 
   bool SendRtp(const uint8_t* data,
                size_t len,
@@ -514,7 +512,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
   std::vector<VideoCodecSettings> recv_codecs_;
   std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
   webrtc::Call::Config::BitrateConfig bitrate_config_;
-  VideoOptions options_;
   // TODO(deadbeef): Don't duplicate information between
   // send_params/recv_params, rtp_extensions, options, etc.
   VideoSendParameters send_params_;