Cast: Reshuffle files under media/cast

media/cast/receiver/audio_decoder.cc

Index: media/cast/receiver/audio_decoder.cc
diff --git a/media/cast/receiver/audio_decoder.cc b/media/cast/receiver/audio_decoder.cc
index b63b200db79bcaa9137c8d65668dd2b1645a38b2..dac0a5e9a1181815a197dacfa85b041fb7f984d0 100644
--- a/media/cast/receiver/audio_decoder.cc
+++ b/media/cast/receiver/audio_decoder.cc
@@ -23,7 +23,7 @@ class AudioDecoder::ImplBase
     : public base::RefCountedThreadSafe<AudioDecoder::ImplBase> {
  public:
   ImplBase(const scoped_refptr<CastEnvironment>& cast_environment,
-           transport::Codec codec,
+           Codec codec,
            int num_channels,
            int sampling_rate)
       : cast_environment_(cast_environment),
@@ -39,7 +39,7 @@ class AudioDecoder::ImplBase
     return cast_initialization_status_;
   }
 
-  void DecodeFrame(scoped_ptr<transport::EncodedFrame> encoded_frame,
+  void DecodeFrame(scoped_ptr<EncodedFrame> encoded_frame,
                    const DecodeFrameCallback& callback) {
     DCHECK_EQ(cast_initialization_status_, STATUS_AUDIO_INITIALIZED);
 
@@ -77,7 +77,7 @@ class AudioDecoder::ImplBase
   virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) = 0;
 
   const scoped_refptr<CastEnvironment> cast_environment_;
-  const transport::Codec codec_;
+  const Codec codec_;
   const int num_channels_;
 
   // Subclass' ctor is expected to set this to STATUS_AUDIO_INITIALIZED.
@@ -96,7 +96,7 @@ class AudioDecoder::OpusImpl : public AudioDecoder::ImplBase {
            int num_channels,
            int sampling_rate)
       : ImplBase(cast_environment,
-                 transport::CODEC_AUDIO_OPUS,
+                 CODEC_AUDIO_OPUS,
                  num_channels,
                  sampling_rate),
         decoder_memory_(new uint8[opus_decoder_get_size(num_channels)]),
@@ -166,7 +166,7 @@ class AudioDecoder::Pcm16Impl : public AudioDecoder::ImplBase {
             int num_channels,
             int sampling_rate)
       : ImplBase(cast_environment,
-                 transport::CODEC_AUDIO_PCM16,
+                 CODEC_AUDIO_PCM16,
                  num_channels,
                  sampling_rate) {
     if (ImplBase::cast_initialization_status_ != STATUS_AUDIO_UNINITIALIZED)
@@ -202,13 +202,13 @@ AudioDecoder::AudioDecoder(
     const scoped_refptr<CastEnvironment>& cast_environment,
     int channels,
     int sampling_rate,
-    transport::Codec codec)
+    Codec codec)
     : cast_environment_(cast_environment) {
   switch (codec) {
-    case transport::CODEC_AUDIO_OPUS:
+    case CODEC_AUDIO_OPUS:
       impl_ = new OpusImpl(cast_environment, channels, sampling_rate);
       break;
-    case transport::CODEC_AUDIO_PCM16:
+    case CODEC_AUDIO_PCM16:
       impl_ = new Pcm16Impl(cast_environment, channels, sampling_rate);
       break;
     default:
@@ -226,7 +226,7 @@ CastInitializationStatus AudioDecoder::InitializationResult() const {
 }
 
 void AudioDecoder::DecodeFrame(
-    scoped_ptr<transport::EncodedFrame> encoded_frame,
+    scoped_ptr<EncodedFrame> encoded_frame,
     const DecodeFrameCallback& callback) {
   DCHECK(encoded_frame.get());
   DCHECK(!callback.is_null());