Split out dscp option from VideoOptions to new struct MediaChannelOptions.

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..9706140c0293fc0b7995e136a84747d8ce358d16 100644
--- a/webrtc/media/webrtc/webrtcvideoengine2.h
+++ b/webrtc/media/webrtc/webrtcvideoengine2.h
@@ -115,7 +115,8 @@ class WebRtcVideoEngine2 {
   void Init();
 
   WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,
-                                     const VideoOptions& options);
+                                     const MediaChannelOptions& options,
+                                     const VideoOptions& video_options);
 
   const std::vector<VideoCodec>& codecs() const;
   RtpCapabilities GetCapabilities() const;
@@ -147,13 +148,16 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
                             public webrtc::LoadObserver {
  public:
   WebRtcVideoChannel2(webrtc::Call* call,
-                      const VideoOptions& options,
+                      const MediaChannelOptions& options,
+                      const VideoOptions& video_options,
                       const std::vector<VideoCodec>& recv_codecs,
                       WebRtcVideoEncoderFactory* external_encoder_factory,
                       WebRtcVideoDecoderFactory* external_decoder_factory);
   ~WebRtcVideoChannel2() override;
 
   // VideoMediaChannel implementation
+  rtc::DiffServCodePoint MediaTypeDscpValue() const override;
+
   bool SetSendParameters(const VideoSendParameters& params) override;
   bool SetRecvParameters(const VideoRecvParameters& params) override;
   bool GetSendCodec(VideoCodec* send_codec) override;