Cast: Reshuffle files under media/cast

media/cast/cast_config.h

 // 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.
 
 #ifndef MEDIA_CAST_CAST_CONFIG_H_
 #define MEDIA_CAST_CAST_CONFIG_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "media/cast/cast_defines.h"
-#include "media/cast/transport/cast_transport_config.h"
+#include "media/cast/net/cast_transport_config.h"
 
 namespace media {
 class VideoEncodeAccelerator;
 
 namespace cast {
 
-enum RtcpMode {
-  kRtcpCompound,     // Compound RTCP mode is described by RFC 4585.
-  kRtcpReducedSize,  // Reduced-size RTCP mode is described by RFC 5506.
-};
-
 // TODO(miu): Merge AudioSenderConfig and VideoSenderConfig and make their
 // naming/documentation consistent with FrameReceiverConfig.
 struct AudioSenderConfig {
   AudioSenderConfig();
   ~AudioSenderConfig();
 
   // Identifier referring to the sender, used by the receiver.
   uint32 ssrc;
 
   // The receiver's SSRC identifier.
@@ skipping 11 matching lines @@
   // etc.).
   base::TimeDelta target_playout_delay;
 
   // RTP payload type enum: Specifies the type/encoding of frame data.
   int rtp_payload_type;
 
   bool use_external_encoder;
   int frequency;
   int channels;
   int bitrate;  // Set to <= 0 for "auto variable bitrate" (libopus knows best).
-  transport::Codec codec;
+  Codec codec;
 
   // The AES crypto key and initialization vector.  Each of these strings
   // contains the data in binary form, of size kAesKeySize.  If they are empty
   // strings, crypto is not being used.
   std::string aes_key;
   std::string aes_iv_mask;
 };
 
 struct VideoSenderConfig {
   VideoSenderConfig();
@@ skipping 25 matching lines @@
   int height;
 
   float congestion_control_back_off;
   int max_bitrate;
   int min_bitrate;
   int start_bitrate;
   int max_qp;
   int min_qp;
   int max_frame_rate;
   int max_number_of_video_buffers_used;  // Max value depend on codec.
-  transport::Codec codec;
+  Codec codec;
   int number_of_encode_threads;
 
   // The AES crypto key and initialization vector.  Each of these strings
   // contains the data in binary form, of size kAesKeySize.  If they are empty
   // strings, crypto is not being used.
   std::string aes_key;
   std::string aes_iv_mask;
 };
 
 // TODO(miu): Naming and minor type changes are badly needed in a later CL.
@@ skipping 40 matching lines @@
   int channels;
 
   // The target frame rate.  For audio, this is normally 100 (i.e., frames have
   // a duration of 10ms each).  For video, this is normally 30, but any frame
   // rate is supported.
   int max_frame_rate;  // TODO(miu): Rename to target_frame_rate.
 
   // Codec used for the compression of signal data.
   // TODO(miu): Merge the AudioCodec and VideoCodec enums into one so this union
   // is not necessary.
-  transport::Codec codec;
+  Codec codec;
 
   // The AES crypto key and initialization vector.  Each of these strings
   // contains the data in binary form, of size kAesKeySize.  If they are empty
   // strings, crypto is not being used.
   std::string aes_key;
   std::string aes_iv_mask;
 };
 
-// import from media::cast::transport
-typedef transport::Packet Packet;
-typedef transport::PacketList PacketList;
+// Import from media::cast.
+
+typedef Packet Packet;
+typedef PacketList PacketList;
 
 typedef base::Callback<void(CastInitializationStatus)>
     CastInitializationCallback;
 
 typedef base::Callback<void(scoped_refptr<base::SingleThreadTaskRunner>,
                             scoped_ptr<media::VideoEncodeAccelerator>)>
     ReceiveVideoEncodeAcceleratorCallback;
 typedef base::Callback<void(const ReceiveVideoEncodeAcceleratorCallback&)>
     CreateVideoEncodeAcceleratorCallback;
 
 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)>
     ReceiveVideoEncodeMemoryCallback;
 typedef base::Callback<void(size_t size,
                             const ReceiveVideoEncodeMemoryCallback&)>
     CreateVideoEncodeMemoryCallback;
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_CONFIG_H_