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

media/cast/audio_receiver/audio_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_AUDIO_RECEIVER_AUDIO_RECEIVER_H_
 #define MEDIA_CAST_AUDIO_RECEIVER_AUDIO_RECEIVER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 58 matching lines @@
   // the configuration that was passed to the ctor.
   //
   // The given |callback| is guaranteed to be run at some point in the future,
   // even if to respond with NULL at shutdown time.
   void GetRawAudioFrame(const AudioFrameDecodedCallback& callback);
 
   // Request an encoded audio 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 GetEncodedAudioFrame(const AudioFrameEncodedCallback& callback);
+  void GetEncodedAudioFrame(const FrameEncodedCallback& callback);
 
   // Deliver another packet, possibly a duplicate, and possibly out-of-order.
   void IncomingPacket(scoped_ptr<Packet> packet);
 
   // Update target audio delay used to compute the playout time. Rtcp
   // will also be updated (will be included in all outgoing reports).
   void SetTargetDelay(base::TimeDelta target_delay);
 
  protected:
   friend class AudioReceiverTest;  // Invokes 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 EncodedAudioFrame into |audio_decoder_|.  GetRawAudioFrame() uses
-  // this as a callback for GetEncodedAudioFrame().
+  // Feeds an EncodedFrame into |audio_decoder_|.  GetRawAudioFrame() uses this
+  // as a callback for GetEncodedAudioFrame().
   void DecodeEncodedAudioFrame(
       const AudioFrameDecodedCallback& callback,
-      scoped_ptr<transport::EncodedAudioFrame> 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 the next RTCP report.
   void ScheduleNextRtcpReport();
 
   // Actually send the next RTCP report.
@@ skipping 30 matching lines @@
   base::TimeDelta target_delay_delta_;
   Framer framer_;
   scoped_ptr<AudioDecoder> audio_decoder_;
   Rtcp rtcp_;
   base::TimeDelta time_offset_;
   base::TimeTicks time_first_incoming_packet_;
   uint32 first_incoming_rtp_timestamp_;
   transport::TransportEncryptionHandler decryptor_;
 
   // Outstanding callbacks to run to deliver on client requests for frames.
-  std::list<AudioFrameEncodedCallback> 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 AUDIO_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<AudioReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_AUDIO_RECEIVER_AUDIO_RECEIVER_H_