Cast: move net->transport

media/cast/transport/rtp_sender/rtp_sender.cc

 // Copyright 2013 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/rtp_sender/rtp_sender.h"
+#include "media/cast/transport/rtp_sender/rtp_sender.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/net/pacing/paced_sender.h"
 #include "media/cast/rtcp/rtcp_defines.h"
+#include "media/cast/transport/pacing/paced_sender.h"
 #include "net/base/big_endian.h"
 
 namespace media {
 namespace cast {
+namespace transport {
 
 RtpSender::RtpSender(scoped_refptr<CastEnvironment> cast_environment,
                      const AudioSenderConfig* audio_config,
                      const VideoSenderConfig* video_config,
                      PacedPacketSender* transport)
     : cast_environment_(cast_environment),
       config_(),
       transport_(transport) {
   // Store generic cast config and create packetizer config.
   DCHECK(audio_config || video_config) << "Invalid argument";
@@ skipping 84 matching lines @@
 }
 
 void RtpSender::UpdateSequenceNumber(Packet* packet) {
   uint16 new_sequence_number = packetizer_->NextSequenceNumber();
   int index = 2;
   (*packet)[index] = (static_cast<uint8>(new_sequence_number));
   (*packet)[index + 1] =(static_cast<uint8>(new_sequence_number >> 8));
 }
 
 void RtpSender::RtpStatistics(const base::TimeTicks& now,
-                              RtcpSenderInfo* sender_info) {
+                              media::cast::RtcpSenderInfo* sender_info) {
   // The timestamp of this Rtcp packet should be estimated as the timestamp of
   // the frame being captured at this moment. We are calculating that
   // timestamp as the last frame's timestamp + the time since the last frame
   // was captured.
   uint32 ntp_seconds = 0;
   uint32 ntp_fraction = 0;
   ConvertTimeTicksToNtp(now, &ntp_seconds, &ntp_fraction);
   sender_info->ntp_seconds = ntp_seconds;
   sender_info->ntp_fraction = ntp_fraction;
 
   base::TimeTicks time_sent;
   uint32 rtp_timestamp;
   if (packetizer_->LastSentTimestamp(&time_sent, &rtp_timestamp)) {
     base::TimeDelta time_since_last_send = now - time_sent;
     sender_info->rtp_timestamp = rtp_timestamp +
         time_since_last_send.InMilliseconds() * (config_.frequency / 1000);
   } else {
     sender_info->rtp_timestamp = 0;
   }
   sender_info->send_packet_count = packetizer_->send_packets_count();
   sender_info->send_octet_count = packetizer_->send_octet_count();
 }
 
+}  // namespace transport
 }  //  namespace cast
 }  // namespace media