| Index: media/cast/audio_receiver/audio_receiver.h
|
| diff --git a/media/cast/audio_receiver/audio_receiver.h b/media/cast/audio_receiver/audio_receiver.h
|
| index b2abfc2f4b04d86c10f8b309234b6370a0aa513f..2742399f33a8a4b5a2ed64da63d412663b09465d 100644
|
| --- a/media/cast/audio_receiver/audio_receiver.h
|
| +++ b/media/cast/audio_receiver/audio_receiver.h
|
| @@ -53,7 +53,8 @@ class AudioReceiver : public base::NonThreadSafe,
|
|
|
| // Extract a raw audio frame from the cast receiver.
|
| // Actual decoding will be preformed on a designated audio_decoder thread.
|
| - void GetRawAudioFrame(int number_of_10ms_blocks, int desired_frequency,
|
| + void GetRawAudioFrame(int number_of_10ms_blocks,
|
| + int desired_frequency,
|
| const AudioFrameDecodedCallback& callback);
|
|
|
| // Extract an encoded audio frame from the cast receiver.
|
| @@ -62,8 +63,13 @@ class AudioReceiver : public base::NonThreadSafe,
|
| // Should only be called from the main cast thread.
|
| 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:
|
| - void IncomingParsedRtpPacket(const uint8* payload_data, size_t payload_size,
|
| + void IncomingParsedRtpPacket(const uint8* payload_data,
|
| + size_t payload_size,
|
| const RtpCastHeader& rtp_header);
|
|
|
| private:
|
| @@ -82,10 +88,12 @@ class AudioReceiver : public base::NonThreadSafe,
|
|
|
| // Actual decoding implementation - should be called under the audio decoder
|
| // thread.
|
| - void DecodeAudioFrameThread(int number_of_10ms_blocks, int desired_frequency,
|
| + void DecodeAudioFrameThread(int number_of_10ms_blocks,
|
| + int desired_frequency,
|
| const AudioFrameDecodedCallback callback);
|
| void ReturnDecodedFrameWithPlayoutDelay(
|
| - scoped_ptr<PcmAudioFrame> audio_frame, uint32 rtp_timestamp,
|
| + scoped_ptr<PcmAudioFrame> audio_frame,
|
| + uint32 rtp_timestamp,
|
| const AudioFrameDecodedCallback callback);
|
|
|
| // Return the playout time based on the current time and rtp timestamp.
|
|
|