Cast: Make receiver use cast_transport

media/cast/cast_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.
 //
 // This is the main interface for the cast receiver. All configuration are done
 // at creation.
 
 #ifndef MEDIA_CAST_CAST_RECEIVER_H_
 #define MEDIA_CAST_CAST_RECEIVER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/audio_bus.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
+#include "media/cast/net/cast_transport_sender.h"
 
 namespace media {
 class VideoFrame;
 
 namespace cast {
 
 class PacketSender;
 
 // The following callbacks are used to deliver decoded audio/video frame data,
 // the frame's corresponding play-out time, and a continuity flag.
@@ skipping 15 matching lines @@
 // NULL pointer can be returned on error.
 typedef base::Callback<void(scoped_ptr<EncodedFrame>)>
     ReceiveEncodedFrameCallback;
 
 class CastReceiver {
  public:
   static scoped_ptr<CastReceiver> Create(
       scoped_refptr<CastEnvironment> cast_environment,
       const FrameReceiverConfig& audio_config,
       const FrameReceiverConfig& video_config,
-      PacketSender* const packet_sender);
+      CastTransportSender* const transport);
 
   // All received RTP and RTCP packets for the call should be sent to this
   // PacketReceiver.  Can be called from any thread.
-  // TODO(hubbe): Replace with:
-  //   virtual void ReceivePacket(scoped_ptr<Packet> packet) = 0;
-  virtual PacketReceiverCallback packet_receiver() = 0;
+  virtual void ReceivePacket(scoped_ptr<Packet> packet) = 0;
 
   // Polling interface to get audio and video frames from the CastReceiver.  The
   // the RequestDecodedXXXXXFrame() methods utilize internal software-based
   // decoding, while the RequestEncodedXXXXXFrame() methods provides
   // still-encoded frames for use with external/hardware decoders.
   //
   // In all cases, the given |callback| is guaranteed to be run at some point in
   // the future, except for those requests still enqueued at destruction time.
   //
   // These methods should all be called on the CastEnvironment's MAIN thread.
   virtual void RequestDecodedAudioFrame(
       const AudioFrameDecodedCallback& callback) = 0;
   virtual void RequestEncodedAudioFrame(
       const ReceiveEncodedFrameCallback& callback) = 0;
   virtual void RequestDecodedVideoFrame(
       const VideoFrameDecodedCallback& callback) = 0;
   virtual void RequestEncodedVideoFrame(
       const ReceiveEncodedFrameCallback& callback) = 0;
 
   virtual ~CastReceiver() {}
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_RECEIVER_H_