Split out dscp option from VideoOptions to new struct MediaChannelOptions.

talk/media/webrtc/webrtcvideoengine2.h

 /*
  * libjingle
  * Copyright 2014 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 96 matching lines @@
 // WebRtcVideoEngine2 is used for the new native WebRTC Video API (webrtc:1667).
 class WebRtcVideoEngine2 {
  public:
   WebRtcVideoEngine2();
   ~WebRtcVideoEngine2();
 
   // Basic video engine implementation.
   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;
 
   // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
   // not take the ownership of |decoder_factory|. The caller needs to make sure
   // that |decoder_factory| outlives the video engine.
   void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory);
   // Set a WebRtcVideoEncoderFactory for external encoding. Video engine does
   // not take the ownership of |encoder_factory|. The caller needs to make sure
@@ skipping 16 matching lines @@
   WebRtcVideoEncoderFactory* external_encoder_factory_;
   rtc::scoped_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_;
 };
 
 class WebRtcVideoChannel2 : public rtc::MessageHandler,
                             public VideoMediaChannel,
                             public webrtc::Transport,
                             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 DscpValue() const override;
   bool SetSendParameters(const VideoSendParameters& params) override;
   bool SetRecvParameters(const VideoRecvParameters& params) override;
   bool GetSendCodec(VideoCodec* send_codec) override;
   bool SetSendStreamFormat(uint32_t ssrc, const VideoFormat& format) override;
   bool SetSend(bool send) override;
   bool SetVideoSend(uint32_t ssrc,
                     bool mute,
                     const VideoOptions* options) override;
   bool AddSendStream(const StreamParams& sp) override;
   bool RemoveSendStream(uint32_t ssrc) override;
@@ skipping 361 matching lines @@
   VideoOptions options_;
   // TODO(deadbeef): Don't duplicate information between
   // send_params/recv_params, rtp_extensions, options, etc.
   VideoSendParameters send_params_;
   VideoRecvParameters recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_