Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/media/base/mediaengine.h

Index: talk/media/base/mediaengine.h
diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index 3f7eec239b4b5b0c9228ce424c1abf9f0ec40f7e..c5c34744860dabb545a175846fdb0e849008f54f 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/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.
@@ -156,12 +158,15 @@ class CompositeMediaEngine : public MediaEngineInterface {
     return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
-                                           const AudioOptions& options) {
-    return voice_.CreateChannel(call, options);
+                                           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) {