Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/media/base/fakemediaengine.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 714 matching lines @@
     // sanity checks against that.
     codecs_.push_back(AudioCodec(101, "fake_audio_codec", 0, 0, 1, 0));
   }
   bool Init(rtc::Thread* worker_thread) { return true; }
   void Terminate() {}
   rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const {
     return rtc::scoped_refptr<webrtc::AudioState>();
   }
 
   VoiceMediaChannel* CreateChannel(webrtc::Call* call,
-                                   const AudioOptions& options) {
+                                   const MediaChannelOptions& options,
+                                   const AudioOptions& audio_options) {
     if (fail_create_channel_) {
       return nullptr;
     }
 
-    FakeVoiceMediaChannel* ch = new FakeVoiceMediaChannel(this, options);
+    FakeVoiceMediaChannel* ch = new FakeVoiceMediaChannel(this, audio_options);
     channels_.push_back(ch);
     return ch;
   }
   FakeVoiceMediaChannel* GetChannel(size_t index) {
     return (channels_.size() > index) ? channels_[index] : NULL;
   }
   void UnregisterChannel(VoiceMediaChannel* channel) {
     channels_.erase(std::find(channels_.begin(), channels_.end(), channel));
   }
 
@@ skipping 37 matching lines @@
     codecs_.push_back(VideoCodec(0, "fake_video_codec", 0, 0, 0, 0));
   }
   void Init() {}
   bool SetOptions(const VideoOptions& options) {
     options_ = options;
     options_changed_ = true;
     return true;
   }
 
   VideoMediaChannel* CreateChannel(webrtc::Call* call,
-                                   const VideoOptions& options) {
+                                   const MediaChannelOptions& options,
+                                   const VideoOptions& video_options) {
     if (fail_create_channel_) {
       return NULL;
     }
 
-    FakeVideoMediaChannel* ch = new FakeVideoMediaChannel(this, options);
+    FakeVideoMediaChannel* ch = new FakeVideoMediaChannel(this, video_options);
     channels_.push_back(ch);
     return ch;
   }
   FakeVideoMediaChannel* GetChannel(size_t index) {
     return (channels_.size() > index) ? channels_[index] : NULL;
   }
   void UnregisterChannel(VideoMediaChannel* channel) {
     channels_.erase(std::find(channels_.begin(), channels_.end(), channel));
   }
 
@@ skipping 127 matching lines @@
 
  private:
   std::vector<FakeDataMediaChannel*> channels_;
   std::vector<DataCodec> data_codecs_;
   DataChannelType last_channel_type_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_