Cast:Adding cast_transport_config and cleaning up

media/cast/audio_sender/audio_sender.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_AUDIO_SENDER_H_
 #define MEDIA_CAST_AUDIO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
-#include "media/cast/cast_environment.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/transport/rtp_sender/rtp_sender.h"
 
 namespace crypto {
 class Encryptor;
 class SymmetricKey;
 }
 
 namespace media {
 class AudioBus;
@@ skipping 22 matching lines @@
   // done with |audio_bus|; it does not mean that the encoded data has been
   // sent out.
   void InsertAudio(const AudioBus* audio_bus,
                    const base::TimeTicks& recorded_time,
                    const base::Closure& done_callback);
 
   // The audio_frame must be valid until the closure callback is called.
   // The closure callback is called from the main cast thread as soon as
   // the cast sender is done with the frame; it does not mean that the encoded
   // frame has been sent out.
-  void InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
-                             const base::TimeTicks& recorded_time,
-                             const base::Closure callback);
+  void InsertCodedAudioFrame(
+      const transport::EncodedAudioFrame* audio_frame,
+      const base::TimeTicks& recorded_time,
+      const base::Closure callback);
 
   // Only called from the main cast thread.
   void IncomingRtcpPacket(const uint8* packet, size_t length,
                           const base::Closure callback);
 
  protected:
-  void SendEncodedAudioFrame(scoped_ptr<EncodedAudioFrame> audio_frame,
-                             const base::TimeTicks& recorded_time);
+  void SendEncodedAudioFrame(
+      scoped_ptr<transport::EncodedAudioFrame> audio_frame,
+      const base::TimeTicks& recorded_time);
 
  private:
   friend class LocalRtcpAudioSenderFeedback;
 
   void ResendPackets(
       const MissingFramesAndPacketsMap& missing_frames_and_packets);
 
   // Caller must allocate the destination |encrypted_frame|. The data member
   // will be resized to hold the encrypted size.
-  bool EncryptAudioFrame(const EncodedAudioFrame& audio_frame,
-                         EncodedAudioFrame* encrypted_frame);
+  bool EncryptAudioFrame(const transport::EncodedAudioFrame& audio_frame,
+                         transport::EncodedAudioFrame* encrypted_frame);
 
   void ScheduleNextRtcpReport();
   void SendRtcpReport();
 
   void InitializeTimers();
 
   base::WeakPtrFactory<AudioSender> weak_factory_;
 
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_refptr<AudioEncoder> audio_encoder_;
   transport::RtpSender rtp_sender_;
   scoped_ptr<LocalRtpSenderStatistics> rtp_audio_sender_statistics_;
   scoped_ptr<LocalRtcpAudioSenderFeedback> rtcp_feedback_;
   Rtcp rtcp_;
   bool initialized_;
   scoped_ptr<crypto::Encryptor> encryptor_;
   scoped_ptr<crypto::SymmetricKey> encryption_key_;
   std::string iv_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_AUDIO_SENDER_H_