Cast: Reshuffle files under media/cast

media/cast/test/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.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include <queue>
 
 #include "base/at_exit.h"
@@ skipping 12 matching lines @@
 #include "media/base/video_frame.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/cast_sender.h"
 #include "media/cast/logging/encoding_event_subscriber.h"
 #include "media/cast/logging/log_serializer.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/logging/proto/raw_events.pb.h"
 #include "media/cast/logging/receiver_time_offset_estimator_impl.h"
 #include "media/cast/logging/stats_event_subscriber.h"
+#include "media/cast/net/cast_transport_defines.h"
+#include "media/cast/net/cast_transport_sender.h"
+#include "media/cast/net/udp_transport.h"
 #include "media/cast/test/fake_media_source.h"
 #include "media/cast/test/utility/default_config.h"
 #include "media/cast/test/utility/input_builder.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/cast_transport_sender.h"
-#include "media/cast/transport/transport/udp_transport.h"
 
 namespace {
 static const int kAudioChannels = 2;
 static const int kAudioSamplingFrequency = 48000;
 
 // The max allowed size of serialized log.
 const int kMaxSerializedLogBytes = 10 * 1000 * 1000;
 
 // Flags for this program:
 //
@@ skipping 15 matching lines @@
 
 media::cast::AudioSenderConfig GetAudioSenderConfig() {
   media::cast::AudioSenderConfig audio_config;
 
   audio_config.rtcp_c_name = "audio_sender@a.b.c.d";
 
   audio_config.use_external_encoder = false;
   audio_config.frequency = kAudioSamplingFrequency;
   audio_config.channels = kAudioChannels;
   audio_config.bitrate = 0;  // Use Opus auto-VBR mode.
-  audio_config.codec = media::cast::transport::CODEC_AUDIO_OPUS;
+  audio_config.codec = media::cast::CODEC_AUDIO_OPUS;
   audio_config.ssrc = 1;
   audio_config.incoming_feedback_ssrc = 2;
   audio_config.rtp_payload_type = 127;
   // TODO(miu): The default in cast_defines.h is 100.  Should this be 100, and
   // should receiver.cc's config also be 100?
   audio_config.target_playout_delay = base::TimeDelta::FromMilliseconds(300);
   return audio_config;
 }
 
 media::cast::VideoSenderConfig GetVideoSenderConfig() {
   media::cast::VideoSenderConfig video_config;
 
   video_config.rtcp_c_name = "video_sender@a.b.c.d";
   video_config.use_external_encoder = false;
 
   // Resolution.
   video_config.width = 1280;
   video_config.height = 720;
   video_config.max_frame_rate = 30;
 
   // Bitrates.
   video_config.max_bitrate = 2500000;
   video_config.min_bitrate = 100000;
   video_config.start_bitrate = video_config.min_bitrate;
 
   // Codec.
-  video_config.codec = media::cast::transport::CODEC_VIDEO_VP8;
+  video_config.codec = media::cast::CODEC_VIDEO_VP8;
   video_config.max_number_of_video_buffers_used = 1;
   video_config.number_of_encode_threads = 2;
 
   // Quality options.
   video_config.min_qp = 4;
   video_config.max_qp = 40;
 
   // SSRCs and payload type. Don't change them.
   video_config.ssrc = 11;
   video_config.incoming_feedback_ssrc = 12;
   video_config.rtp_payload_type = 96;
   // TODO(miu): The default in cast_defines.h is 100.  Should this be 100, and
   // should receiver.cc's config also be 100?
   video_config.target_playout_delay = base::TimeDelta::FromMilliseconds(300);
   return video_config;
 }
 
 void UpdateCastTransportStatus(
-    media::cast::transport::CastTransportStatus status) {
+    media::cast::CastTransportStatus status) {
   VLOG(1) << "Transport status: " << status;
 }
 
 void LogRawEvents(
     const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
     const std::vector<media::cast::PacketEvent>& packet_events) {
   VLOG(1) << "Got packet events from transport, size: " << packet_events.size();
   for (std::vector<media::cast::PacketEvent>::const_iterator it =
            packet_events.begin();
        it != packet_events.end();
@@ skipping 170 matching lines @@
                          &override_fps)){
     override_fps = 0;
   }
   base::FilePath source_path = cmd->GetSwitchValuePath(kSwitchSourceFile);
   if (!source_path.empty()) {
     LOG(INFO) << "Source: " << source_path.value();
     fake_media_source->SetSourceFile(source_path, override_fps);
   }
 
   // CastTransportSender initialization.
-  scoped_ptr<media::cast::transport::CastTransportSender> transport_sender =
-      media::cast::transport::CastTransportSender::Create(
+  scoped_ptr<media::cast::CastTransportSender> transport_sender =
+      media::cast::CastTransportSender::Create(
           NULL,  // net log.
           cast_environment->Clock(),
           remote_endpoint,
           base::Bind(&UpdateCastTransportStatus),
           base::Bind(&LogRawEvents, cast_environment),
           base::TimeDelta::FromSeconds(1),
           io_message_loop.message_loop_proxy());
 
   // CastSender initialization.
   scoped_ptr<media::cast::CastSender> cast_sender =
@@ skipping 70 matching lines @@
                  base::Passed(&audio_stats_subscriber),
                  base::Passed(&offset_estimator)),
       base::TimeDelta::FromSeconds(logging_duration_seconds));
 
   fake_media_source->Start(cast_sender->audio_frame_input(),
                            cast_sender->video_frame_input());
 
   io_message_loop.Run();
   return 0;
 }