Cast:Adding cast_transport_config and cleaning up

media/cast/video_sender/video_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_VIDEO_SENDER_VIDEO_SENDER_H_
 #define MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 45 matching lines @@
   // the encoder is done with the frame; it does not mean that the encoded frame
   // has been sent out.
   void InsertRawVideoFrame(
       const scoped_refptr<media::VideoFrame>& video_frame,
       const base::TimeTicks& capture_time);
 
   // The video_frame must be valid until the closure callback is called.
   // The closure callback is called from the main 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 InsertCodedVideoFrame(const EncodedVideoFrame* video_frame,
+  void InsertCodedVideoFrame(const transport::EncodedVideoFrame* video_frame,
                              const base::TimeTicks& capture_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:
   // Protected for testability.
   void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
@@ skipping 13 matching lines @@
   // normal operation 3 full frames), hence this is the last resort to prevent
   // us getting stuck after a long outage.
   void ScheduleNextResendCheck();
   void ResendCheck();
 
   // Monitor how many frames that are silently dropped by the video sender
   // per time unit.
   void ScheduleNextSkippedFramesCheck();
   void SkippedFramesCheck();
 
-  void SendEncodedVideoFrame(const EncodedVideoFrame* video_frame,
+  void SendEncodedVideoFrame(const transport::EncodedVideoFrame* video_frame,
                              const base::TimeTicks& capture_time);
   void ResendFrame(uint32 resend_frame_id);
   void ReceivedAck(uint32 acked_frame_id);
   void UpdateFramesInFlight();
 
   void SendEncodedVideoFrameMainThread(
-      scoped_ptr<EncodedVideoFrame> video_frame,
+      scoped_ptr<transport::EncodedVideoFrame> video_frame,
       const base::TimeTicks& capture_time);
 
   void InitializeTimers();
 
   // Caller must allocate the destination |encrypted_video_frame| the data
   // member will be resized to hold the encrypted size.
-  bool EncryptVideoFrame(const EncodedVideoFrame& encoded_frame,
-                         EncodedVideoFrame* encrypted_video_frame);
+  bool EncryptVideoFrame(const transport::EncodedVideoFrame& encoded_frame,
+                         transport::EncodedVideoFrame* encrypted_video_frame);
 
   const base::TimeDelta rtp_max_delay_;
   const int max_frame_rate_;
 
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_ptr<LocalRtcpVideoSenderFeedback> rtcp_feedback_;
   scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_;
   scoped_ptr<VideoEncoder> video_encoder_;
   scoped_ptr<Rtcp> rtcp_;
   scoped_ptr<transport::RtpSender> rtp_sender_;
@@ skipping 13 matching lines @@
   bool initialized_;
   base::WeakPtrFactory<VideoSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_