Introduce struct MediaConfig, with construction-time settings.

webrtc/media/webrtc/webrtcvideoengine2.h

Index: webrtc/media/webrtc/webrtcvideoengine2.h
diff --git a/webrtc/media/webrtc/webrtcvideoengine2.h b/webrtc/media/webrtc/webrtcvideoengine2.h
index 70caef1e1cf46367707c4b67fd8305a5e74fd27f..bf14f65bbf8a6db83caab8947638fb1cb583c0cc 100644
--- a/webrtc/media/webrtc/webrtcvideoengine2.h
+++ b/webrtc/media/webrtc/webrtcvideoengine2.h
@@ -51,6 +51,7 @@
 namespace webrtc {
 class VideoDecoder;
 class VideoEncoder;
+struct MediaConfig;
 }
 
 namespace rtc {
@@ -115,6 +116,7 @@ class WebRtcVideoEngine2 {
   void Init();
 
   WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,
+                                     const MediaConfig& config,
                                      const VideoOptions& options);
 
   const std::vector<VideoCodec>& codecs() const;
@@ -147,6 +149,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
                             public webrtc::LoadObserver {
  public:
   WebRtcVideoChannel2(webrtc::Call* call,
+                      const MediaConfig& config,
                       const VideoOptions& options,
                       const std::vector<VideoCodec>& recv_codecs,
                       WebRtcVideoEncoderFactory* external_encoder_factory,
@@ -154,6 +157,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
   ~WebRtcVideoChannel2() override;
 
   // VideoMediaChannel implementation
+  rtc::DiffServCodePoint PreferredDscp() const override;
+
   bool SetSendParameters(const VideoSendParameters& params) override;
   bool SetRecvParameters(const VideoRecvParameters& params) override;
   bool GetSendCodec(VideoCodec* send_codec) override;
@@ -495,11 +500,13 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
   DefaultUnsignalledSsrcHandler default_unsignalled_ssrc_handler_;
   UnsignalledSsrcHandler* const unsignalled_ssrc_handler_;
 
+  bool signal_cpu_adaptation_;

[perkj_webrtc, 2016/02/09 15:35:37]

const ?

[nisse-webrtc, 2016/02/10 08:53:00]

Done. And similarly for MediaChannel::enable_dscp_.

+  bool disable_prerenderer_smoothing_;
+
   // Separate list of set capturers used to signal CPU adaptation. These should
   // not be locked while calling methods that take other locks to prevent
   // lock-order inversions.
   rtc::CriticalSection capturer_crit_;
-  bool signal_cpu_adaptation_ GUARDED_BY(capturer_crit_);
   std::map<uint32_t, VideoCapturer*> capturers_ GUARDED_BY(capturer_crit_);
 
   rtc::CriticalSection stream_crit_;