Cast: Make receiver use cast_transport

media/cast/receiver/frame_receiver.h

 // Copyright 2014 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_RECEIVER_FRAME_RECEIVER_H_
 #define MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 32 matching lines @@
 // (perhaps to just one or two).
 //
 // This class is not thread safe.  Should only be called from the Main cast
 // thread.
 class FrameReceiver : public RtpPayloadFeedback,
                       public base::SupportsWeakPtr<FrameReceiver> {
  public:
   FrameReceiver(const scoped_refptr<CastEnvironment>& cast_environment,
                 const FrameReceiverConfig& config,
                 EventMediaType event_media_type,
-                PacedPacketSender* const packet_sender);
+                CastTransportSender* const transport);
 
   ~FrameReceiver() override;
 
   // Request an encoded frame.
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // except for those requests still enqueued at destruction time.
   void RequestEncodedFrame(const ReceiveEncodedFrameCallback& callback);
 
   // Called to deliver another packet, possibly a duplicate, and possibly
   // out-of-order.  Returns true if the parsing of the packet succeeded.
   bool ProcessPacket(scoped_ptr<Packet> packet);
 
-  // TODO(miu): This is the wrong place for this, but the (de)serialization
-  // implementation needs to be consolidated first.
-  static bool ParseSenderSsrc(const uint8* packet, size_t length, uint32* ssrc);
-
  protected:
   friend class FrameReceiverTest;  // Invokes ProcessParsedPacket().
 
   void ProcessParsedPacket(const RtpCastHeader& rtp_header,
                            const uint8* payload_data,
                            size_t payload_size);
 
   // RtpPayloadFeedback implementation.
   void CastFeedback(const RtcpCastMessage& cast_message) override;
 
@@ skipping 27 matching lines @@
   void ScheduleNextRtcpReport();
 
   // Actually send the next cast message.
   void SendNextCastMessage();
 
   // Actually send the next RTCP report.
   void SendNextRtcpReport();
 
   const scoped_refptr<CastEnvironment> cast_environment_;
 
+  // Transport used to send data back.
+  CastTransportSender* const transport_;
+
   // Deserializes a packet into a RtpHeader + payload bytes.
   RtpParser packet_parser_;
 
   // Accumulates packet statistics, including packet loss, counts, and jitter.
   ReceiverStats stats_;
 
   // Partitions logged events by the type of media passing through.
   EventMediaType event_media_type_;
 
   // Subscribes to raw events.
@@ skipping 57 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FrameReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_