Split out dscp option from VideoOptions to new struct MediaChannelOptions.

webrtc/media/base/rtpdataengine.cc

 /*
  * libjingle
  * Copyright 2012 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 60 matching lines @@
   std::vector<DataCodec>::const_iterator iter;
   for (iter = codecs.begin(); iter != codecs.end(); ++iter) {
     if (iter->name == name) {
       *codec_out = *iter;
       return true;
     }
   }
   return false;
 }
 
-RtpDataMediaChannel::RtpDataMediaChannel(rtc::Timing* timing) {
+RtpDataMediaChannel::RtpDataMediaChannel(rtc::Timing* timing)
+    : DataMediaChannel(MediaChannelOptions()) {
   Construct(timing);
 }
 
-RtpDataMediaChannel::RtpDataMediaChannel() {
+RtpDataMediaChannel::RtpDataMediaChannel()
+    : DataMediaChannel(MediaChannelOptions()) {
   Construct(NULL);
 }
 
 void RtpDataMediaChannel::Construct(rtc::Timing* timing) {
   sending_ = false;
   receiving_ = false;
   timing_ = timing;
   send_limiter_.reset(new rtc::RateLimiter(kDataMaxBandwidth / 8, 1.0));
 }
 
@@ skipping 265 matching lines @@
 
   MediaChannel::SendPacket(&packet, rtc::PacketOptions());
   send_limiter_->Use(packet_len, now);
   if (result) {
     *result = SDR_SUCCESS;
   }
   return true;
 }
 
 }  // namespace cricket