[Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver.

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_
 
@@ skipping 27 matching lines @@
 // TODO(miu): |video_frame| includes a timestamp, so use that instead.
 typedef base::Callback<void(const scoped_refptr<media::VideoFrame>& video_frame,
                             const base::TimeTicks& playout_time,
                             bool is_continuous)> VideoFrameDecodedCallback;
 
 // The following callback delivers encoded frame data and metadata.  The client
 // should examine the |frame_id| field to determine whether any frames have been
 // dropped (i.e., frame_id should be incrementing by one each time).  Note: A
 // NULL pointer can be returned on error.
 typedef base::Callback<void(scoped_ptr<transport::EncodedFrame>)>
-    FrameEncodedCallback;
+    ReceiveEncodedFrameCallback;
 
-// This Class is thread safe.
-class FrameReceiver : public base::RefCountedThreadSafe<FrameReceiver> {
- public:
-  virtual void GetRawAudioFrame(const AudioFrameDecodedCallback& callback) = 0;
-
-  virtual void GetCodedAudioFrame(const FrameEncodedCallback& callback) = 0;
-
-  virtual void GetRawVideoFrame(const VideoFrameDecodedCallback& callback) = 0;
-
-  virtual void GetEncodedVideoFrame(const FrameEncodedCallback& callback) = 0;
-
- protected:
-  virtual ~FrameReceiver() {}
-
- private:
-  friend class base::RefCountedThreadSafe<FrameReceiver>;
-};
-
-// This Class is thread safe.
 class CastReceiver {
  public:
   static scoped_ptr<CastReceiver> Create(
       scoped_refptr<CastEnvironment> cast_environment,
       const FrameReceiverConfig& audio_config,
       const FrameReceiverConfig& video_config,
       transport::PacketSender* const packet_sender);
 
   // All received RTP and RTCP packets for the call should be sent to this
-  // PacketReceiver. Can be called from any function.
+  // PacketReceiver.  Can be called from any thread.
   // TODO(hubbe): Replace with:
   //   virtual void ReceivePacket(scoped_ptr<Packet> packet) = 0;
   virtual transport::PacketReceiverCallback packet_receiver() = 0;
 
-  // Polling interface to get audio and video frames from the CastReceiver.
-  virtual scoped_refptr<FrameReceiver> frame_receiver() = 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_