Apply VideoOptions per stream.

talk/media/webrtc/webrtcvideoengine2.h

Index: talk/media/webrtc/webrtcvideoengine2.h
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h
index e6a078bc922a498c1cdfb2982bfb682d901b3258..4bd3a6638d703db53172aba25707a5fffe0299bd 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/talk/media/webrtc/webrtcvideoengine2.h
@@ -203,7 +203,8 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
   bool SetSendRtpHeaderExtensions(
       const std::vector<RtpHeaderExtension>& extensions);
   bool SetMaxSendBandwidth(int bps);
-  bool SetOptions(const VideoOptions& options);
+  void SetSharedOptions(const VideoOptions& options);
+  bool SetOptions(uint32_t ssrc, const VideoOptions& options);
   bool SetRecvCodecs(const std::vector<VideoCodec>& codecs);
   bool SetRecvRtpHeaderExtensions(
       const std::vector<RtpHeaderExtension>& extensions);
@@ -468,7 +469,7 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
   };
 
   void Construct(webrtc::Call* call, WebRtcVideoEngine2* engine);
-  void SetDefaultOptions();
+  static void SetDefaultOptions(VideoOptions *options);
 
   bool SendRtp(const uint8_t* data,
                size_t len,
@@ -525,7 +526,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
   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_;