Cast: Reshuffle files under media/cast

media/cast/sender/video_sender.cc

Index: media/cast/sender/video_sender.cc
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/sender/video_sender.cc
similarity index 96%
rename from media/cast/video_sender/video_sender.cc
rename to media/cast/sender/video_sender.cc
index df69969db61118b4ca98281403b6b7e77e2aa4e1..8c99da9e403c28ae6a690e59a6a67f6b42040728 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/sender/video_sender.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cast/video_sender/video_sender.h"
+#include "media/cast/sender/video_sender.h"
 
 #include <algorithm>
 #include <cstring>
@@ -12,10 +12,10 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/rtcp/rtcp_defines.h"
-#include "media/cast/transport/cast_transport_config.h"
-#include "media/cast/video_sender/external_video_encoder.h"
-#include "media/cast/video_sender/video_encoder_impl.h"
+#include "media/cast/net/cast_transport_config.h"
+#include "media/cast/net/rtcp/rtcp_defines.h"
+#include "media/cast/sender/external_video_encoder.h"
+#include "media/cast/sender/video_encoder_impl.h"
 
 namespace media {
 namespace cast {
@@ -28,7 +28,7 @@ VideoSender::VideoSender(
     const VideoSenderConfig& video_config,
     const CreateVideoEncodeAcceleratorCallback& create_vea_cb,
     const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb,
-    transport::CastTransportSender* const transport_sender)
+    CastTransportSender* const transport_sender)
     : cast_environment_(cast_environment),
       target_playout_delay_(video_config.target_playout_delay),
       transport_sender_(transport_sender),
@@ -74,7 +74,7 @@ VideoSender::VideoSender(
   }
   cast_initialization_status_ = STATUS_VIDEO_INITIALIZED;
 
-  media::cast::transport::CastTransportRtpConfig transport_config;
+  media::cast::CastTransportRtpConfig transport_config;
   transport_config.ssrc = video_config.ssrc;
   transport_config.rtp_payload_type = video_config.rtp_payload_type;
   transport_config.stored_frames = max_unacked_frames_;
@@ -141,7 +141,7 @@ void VideoSender::InsertRawVideoFrame(
 
 void VideoSender::SendEncodedVideoFrame(
     int requested_bitrate_before_encode,
-    scoped_ptr<transport::EncodedFrame> encoded_frame) {
+    scoped_ptr<EncodedFrame> encoded_frame) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 
   DCHECK_GT(frames_in_encoder_, 0);
@@ -160,13 +160,13 @@ void VideoSender::SendEncodedVideoFrame(
     ScheduleNextResendCheck();
   }
 
-  VLOG_IF(1, encoded_frame->dependency == transport::EncodedFrame::KEY)
+  VLOG_IF(1, encoded_frame->dependency == EncodedFrame::KEY)
       << "Send encoded key frame; frame_id: " << frame_id;
 
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       last_send_time_, FRAME_ENCODED, VIDEO_EVENT, encoded_frame->rtp_timestamp,
       frame_id, static_cast<int>(encoded_frame->data.size()),
-      encoded_frame->dependency == transport::EncodedFrame::KEY,
+      encoded_frame->dependency == EncodedFrame::KEY,
       requested_bitrate_before_encode);
   // Only use lowest 8 bits as key.
   frame_id_to_rtp_timestamp_[frame_id & 0xff] = encoded_frame->rtp_timestamp;