[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

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 22 matching lines @@
 // discontinuities for playback.  Note: A NULL pointer can be returned when data
 // is not available (e.g., bad/missing packet).
 typedef base::Callback<void(scoped_ptr<AudioBus> audio_bus,
                             const base::TimeTicks& playout_time,
                             bool is_continuous)> AudioFrameDecodedCallback;
 // 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 callbacks deliver still-encoded audio/video frame data, along
-// with the frame's corresponding play-out time.  The client should examine the
-// EncodedXXXFrame::frame_id field to determine whether any frames have been
+// 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::EncodedAudioFrame>,
-                            const base::TimeTicks&)> AudioFrameEncodedCallback;
-typedef base::Callback<void(scoped_ptr<transport::EncodedVideoFrame>,
-                            const base::TimeTicks&)> VideoFrameEncodedCallback;
+typedef base::Callback<void(scoped_ptr<transport::EncodedFrame>)>
+    FrameEncodedCallback;
 
 // This Class is thread safe.
 class FrameReceiver : public base::RefCountedThreadSafe<FrameReceiver> {
  public:
   virtual void GetRawAudioFrame(const AudioFrameDecodedCallback& callback) = 0;
 
-  virtual void GetCodedAudioFrame(
-      const AudioFrameEncodedCallback& callback) = 0;
+  virtual void GetCodedAudioFrame(const FrameEncodedCallback& callback) = 0;
 
   virtual void GetRawVideoFrame(const VideoFrameDecodedCallback& callback) = 0;
 
-  virtual void GetEncodedVideoFrame(
-      const VideoFrameEncodedCallback& 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 {
@@ skipping 13 matching lines @@
   // Polling interface to get audio and video frames from the CastReceiver.
   virtual scoped_refptr<FrameReceiver> frame_receiver() = 0;
 
   virtual ~CastReceiver() {}
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_RECEIVER_H_