Cast: Let the extension control if DSCP is on or off.

media/cast/net/cast_transport_sender_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/net/cast_transport_sender_impl.h"
 
 #include "base/single_thread_task_runner.h"
+#include "base/values.h"
 #include "media/cast/net/cast_transport_config.h"
 #include "media/cast/net/cast_transport_defines.h"
 #include "media/cast/net/udp_transport.h"
 #include "net/base/net_util.h"
 
 namespace media {
 namespace cast {
 
 scoped_ptr<CastTransportSender> CastTransportSender::Create(
     net::NetLog* net_log,
     base::TickClock* clock,
     const net::IPEndPoint& remote_end_point,
+    scoped_ptr<base::DictionaryValue> options,
     const CastTransportStatusCallback& status_callback,
     const BulkRawEventsCallback& raw_events_callback,
     base::TimeDelta raw_events_callback_interval,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) {
   return scoped_ptr<CastTransportSender>(
       new CastTransportSenderImpl(net_log,
                                   clock,
                                   remote_end_point,
+                                  options.Pass(),
                                   status_callback,
                                   raw_events_callback,
                                   raw_events_callback_interval,
                                   transport_task_runner.get(),
                                   NULL));
 }
 
 PacketReceiverCallback CastTransportSender::PacketReceiverForTesting() {
   return PacketReceiverCallback();
 }
 
 CastTransportSenderImpl::CastTransportSenderImpl(
     net::NetLog* net_log,
     base::TickClock* clock,
     const net::IPEndPoint& remote_end_point,
+    scoped_ptr<base::DictionaryValue> options,
     const CastTransportStatusCallback& status_callback,
     const BulkRawEventsCallback& raw_events_callback,
     base::TimeDelta raw_events_callback_interval,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
     PacketSender* external_transport)
     : clock_(clock),
       status_callback_(status_callback),
       transport_task_runner_(transport_task_runner),
       transport_(external_transport ? NULL
                                     : new UdpTransport(net_log,
@@ skipping 14 matching lines @@
     DCHECK(raw_events_callback_interval > base::TimeDelta());
     event_subscriber_.reset(new SimpleEventSubscriber);
     logging_.AddRawEventSubscriber(event_subscriber_.get());
     transport_task_runner->PostDelayedTask(
         FROM_HERE,
         base::Bind(&CastTransportSenderImpl::SendRawEvents,
                    weak_factory_.GetWeakPtr()),
         raw_events_callback_interval);
   }
   if (transport_) {
-    // The default DSCP value for cast is AF41. Which gives it a higher
-    // priority over other traffic.
-    transport_->SetDscp(net::DSCP_AF41);
+    if (options->HasKey("DSCP")) {

[Alpha Left Google, 2014/09/09 20:15:12]

I was thinking that we can apply DSCP value from the dictinoary. But this is
good for now. Might consider having this lower case to be consistent with future
option keys.

[hubbe, 2014/09/09 20:45:14]

Since DSCP is an abbreviation, I think it should be upper case.

+      // The default DSCP value for cast is AF41. Which gives it a higher
+      // priority over other traffic.
+      transport_->SetDscp(net::DSCP_AF41);
+    }
     transport_->StartReceiving(
         base::Bind(&CastTransportSenderImpl::OnReceivedPacket,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
 CastTransportSenderImpl::~CastTransportSenderImpl() {
   if (event_subscriber_.get())
     logging_.RemoveRawEventSubscriber(event_subscriber_.get());
 }
@@ skipping 267 matching lines @@
   // 2. Specifies a deduplication window. For video this would be the most
   //    recent RTT. For audio there is no deduplication.
   ResendPackets(ssrc,
                 cast_message.missing_frames_and_packets,
                 true,
                 dedup_info);
 }
 
 }  // namespace cast
 }  // namespace media