Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/media/webrtc/webrtcvoiceengine.h

Index: talk/media/webrtc/webrtcvoiceengine.h
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h
index 556d8c080fb583f798cc798992917648e7bac009..52598242dd51f9bf2def5420d44c3a7f81146c34 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -69,7 +69,8 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback  {
 
   rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const;
   VoiceMediaChannel* CreateChannel(webrtc::Call* call,
-                                   const AudioOptions& options);
+                                   const MediaChannelOptions& options,
+                                   const AudioOptions& audio_options);
 
   bool GetOutputVolume(int* level);
   bool SetOutputVolume(int level);
@@ -157,12 +158,14 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
                                       public webrtc::Transport {
  public:
   WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine,
-                          const AudioOptions& options,
+                          const MediaChannelOptions& options,
+                          const AudioOptions& audio_options,
                           webrtc::Call* call);
   ~WebRtcVoiceMediaChannel() override;
 
   const AudioOptions& options() const { return options_; }
 
+  rtc::DiffServCodePoint DscpValue() const override;
   bool SetSendParameters(const AudioSendParameters& params) override;
   bool SetRecvParameters(const AudioRecvParameters& params) override;
   bool SetPlayout(bool playout) override;