Split out dscp option from VideoOptions to new struct MediaChannelOptions.

webrtc/media/base/mediaengine.h

Index: webrtc/media/base/mediaengine.h
diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
index 017e7b6af5de520081afbabc1851335d694f8c74..3579ad8c2d9c18c97d3c8612d729c8aa5c58eefb 100644
--- a/webrtc/media/base/mediaengine.h
+++ b/webrtc/media/base/mediaengine.h
@@ -81,12 +81,14 @@ class MediaEngineInterface {
   // Creates a voice media channel. Returns NULL on failure.
   virtual VoiceMediaChannel* CreateChannel(
       webrtc::Call* call,
-      const AudioOptions& options) = 0;
+      const MediaChannelOptions& options,
+      const AudioOptions& audio_options) = 0;
   // Creates a video media channel, paired with the specified voice channel.
   // Returns NULL on failure.
   virtual VideoMediaChannel* CreateVideoChannel(
       webrtc::Call* call,
-      const VideoOptions& options) = 0;
+      const MediaChannelOptions& options,
+      const VideoOptions& video_options) = 0;
 
   // Device configuration
   // Gets the current speaker volume, as a value between 0 and 255.
@@ -155,13 +157,17 @@ class CompositeMediaEngine : public MediaEngineInterface {
   virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const {
     return voice_.GetAudioState();
   }
-  virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
-                                           const AudioOptions& options) {
-    return voice_.CreateChannel(call, options);
+  virtual VoiceMediaChannel* CreateChannel(
+      webrtc::Call* call,
+      const MediaChannelOptions& options,
+      const AudioOptions& audio_options) {
+    return voice_.CreateChannel(call, options, audio_options);
   }
-  virtual VideoMediaChannel* CreateVideoChannel(webrtc::Call* call,
-                                                const VideoOptions& options) {
-    return video_.CreateChannel(call, options);
+  virtual VideoMediaChannel* CreateVideoChannel(
+      webrtc::Call* call,
+      const MediaChannelOptions& options,
+      const VideoOptions& video_options) {
+    return video_.CreateChannel(call, options, video_options);
   }
 
   virtual bool GetOutputVolume(int* level) {