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

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 58 matching lines @@
   // Request a decoded video frame.
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // even if to respond with NULL at shutdown time.
   void GetRawVideoFrame(const VideoFrameDecodedCallback& callback);
 
   // Request an encoded video frame.
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // even if to respond with NULL at shutdown time.
-  void GetEncodedVideoFrame(const VideoFrameEncodedCallback& callback);
+  void GetEncodedVideoFrame(const FrameEncodedCallback& callback);
 
   // Deliver another packet, possibly a duplicate, and possibly out-of-order.
   void IncomingPacket(scoped_ptr<Packet> packet);
 
  protected:
   friend class VideoReceiverTest;  // Invoked OnReceivedPayloadData().
 
   virtual void OnReceivedPayloadData(const uint8* payload_data,
                                      size_t payload_size,
                                      const RtpCastHeader& rtp_header) OVERRIDE;
 
   // RtpPayloadFeedback implementation.
   virtual void CastFeedback(const RtcpCastMessage& cast_message) OVERRIDE;
 
  private:
   // Processes ready-to-consume packets from |framer_|, decrypting each packet's
   // payload data, and then running the enqueued callbacks in order (one for
   // each packet).  This method may post a delayed task to re-invoke itself in
   // the future to wait for missing/incomplete frames.
   void EmitAvailableEncodedFrames();
 
   // Clears the |is_waiting_for_consecutive_frame_| flag and invokes
   // EmitAvailableEncodedFrames().
   void EmitAvailableEncodedFramesAfterWaiting();
 
-  // Feeds an EncodedVideoFrame into |video_decoder_|.  GetRawVideoFrame() uses
-  // this as a callback for GetEncodedVideoFrame().
+  // Feeds an EncodedFrame into |video_decoder_|.  GetRawVideoFrame() uses this
+  // as a callback for GetEncodedVideoFrame().
   void DecodeEncodedVideoFrame(
       const VideoFrameDecodedCallback& callback,
-      scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
-      const base::TimeTicks& playout_time);
+      scoped_ptr<transport::EncodedFrame> encoded_frame);
 
   // Return the playout time based on the current time and rtp timestamp.
   base::TimeTicks GetPlayoutTime(base::TimeTicks now, uint32 rtp_timestamp);
 
   void InitializeTimers();
 
   // Schedule timing for the next cast message.
   void ScheduleNextCastMessage();
 
   // Schedule timing for the next RTCP report.
@@ skipping 32 matching lines @@
   scoped_ptr<VideoDecoder> video_decoder_;
   Rtcp rtcp_;
   base::TimeDelta time_offset_;  // Sender-receiver offset estimation.
   int time_offset_counter_;
   bool time_incoming_packet_updated_;
   base::TimeTicks time_incoming_packet_;
   uint32 incoming_rtp_timestamp_;
   transport::TransportEncryptionHandler decryptor_;
 
   // Outstanding callbacks to run to deliver on client requests for frames.
-  std::list<VideoFrameEncodedCallback> frame_request_queue_;
+  std::list<FrameEncodedCallback> frame_request_queue_;
 
   // True while there's an outstanding task to re-invoke
   // EmitAvailableEncodedFrames().
   bool is_waiting_for_consecutive_frame_;
 
   // This mapping allows us to log FRAME_ACK_SENT as a frame event. In addition
   // it allows the event to be transmitted via RTCP.
   RtpTimestamp frame_id_to_rtp_timestamp_[256];
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_