Revert of Cast:Adding cast_transport_config and cleaning up

media/cast/video_receiver/video_receiver.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_RECEIVER_VIDEO_RECEIVER_H_
 #define MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 43 matching lines @@
   // Insert a RTP packet to the video receiver.
   void IncomingPacket(const uint8* packet, size_t length,
                       const base::Closure callback);
 
  protected:
   void IncomingParsedRtpPacket(const uint8* payload_data,
                                size_t payload_size,
                                const RtpCastHeader& rtp_header);
 
   void DecodeVideoFrameThread(
-      scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
+      scoped_ptr<EncodedVideoFrame> encoded_frame,
       const base::TimeTicks render_time,
       const VideoFrameDecodedCallback& frame_decoded_callback);
 
  private:
   friend class LocalRtpVideoData;
   friend class LocalRtpVideoFeedback;
 
   void CastFeedback(const RtcpCastMessage& cast_message);
 
   void DecodeVideoFrame(const VideoFrameDecodedCallback& callback,
-                        scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
+                        scoped_ptr<EncodedVideoFrame> encoded_frame,
                         const base::TimeTicks& render_time);
 
-  bool DecryptVideoFrame(scoped_ptr<transport::EncodedVideoFrame>* video_frame);
+  bool DecryptVideoFrame(scoped_ptr<EncodedVideoFrame>* video_frame);
 
-  bool PullEncodedVideoFrame(
-      uint32 rtp_timestamp,
-      bool next_frame,
-      scoped_ptr<transport::EncodedVideoFrame>* encoded_frame,
-      base::TimeTicks* render_time);
+  bool PullEncodedVideoFrame(uint32 rtp_timestamp,
+                             bool next_frame,
+                             scoped_ptr<EncodedVideoFrame>* encoded_frame,
+                             base::TimeTicks* render_time);
 
   void PlayoutTimeout();
 
   // Returns Render time based on current time and the rtp timestamp.
   base::TimeTicks GetRenderTime(base::TimeTicks now, uint32 rtp_timestamp);
 
   void InitializeTimers();
 
   // Schedule timing for the next cast message.
   void ScheduleNextCastMessage();
 
   // Schedule timing for the next RTCP report.
   void ScheduleNextRtcpReport();
 
   // Actually send the next cast message.
   void SendNextCastMessage();
 
   // Actually send the next RTCP report.
   void SendNextRtcpReport();
 
   scoped_ptr<VideoDecoder> video_decoder_;
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_ptr<Framer> framer_;
-  const transport::VideoCodec codec_;
+  const VideoCodec codec_;
   base::TimeDelta target_delay_delta_;
   base::TimeDelta frame_delay_;
   scoped_ptr<LocalRtpVideoData> incoming_payload_callback_;
   scoped_ptr<LocalRtpVideoFeedback> incoming_payload_feedback_;
   RtpReceiver rtp_receiver_;
   scoped_ptr<Rtcp> rtcp_;
   scoped_ptr<RtpReceiverStatistics> rtp_video_receiver_statistics_;
   base::TimeTicks time_last_sent_cast_message_;
   base::TimeDelta time_offset_;  // Sender-receiver offset estimation.
   scoped_ptr<crypto::Encryptor> decryptor_;
   scoped_ptr<crypto::SymmetricKey> decryption_key_;
   std::string iv_mask_;
   std::list<VideoFrameEncodedCallback> queued_encoded_callbacks_;
   bool time_incoming_packet_updated_;
   base::TimeTicks time_incoming_packet_;
   uint32 incoming_rtp_timestamp_;
   base::TimeTicks last_render_time_;
 
   base::WeakPtrFactory<VideoReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_