| 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 1cc14ee3c6880195cdc2f7d87b9ef5fd5c05c8c1..43f53914abd77fda21c0da3434459fa7f2b2bead 100644
|
| --- a/media/cast/audio_receiver/audio_receiver.h
|
| +++ b/media/cast/audio_receiver/audio_receiver.h
|
| @@ -79,10 +79,11 @@ class AudioReceiver : public base::NonThreadSafe,
|
| // Time to pull out the audio even though we are missing data.
|
| void PlayoutTimeout();
|
|
|
| - bool PostEncodedAudioFrame(const AudioFrameEncodedCallback& callback,
|
| - uint32 rtp_timestamp,
|
| - bool next_frame,
|
| - scoped_ptr<EncodedAudioFrame>* encoded_frame);
|
| + bool PostEncodedAudioFrame(
|
| + const AudioFrameEncodedCallback& callback,
|
| + uint32 rtp_timestamp,
|
| + bool next_frame,
|
| + scoped_ptr<transport::EncodedAudioFrame>* encoded_frame);
|
|
|
| // Actual decoding implementation - should be called under the audio decoder
|
| // thread.
|
| @@ -100,7 +101,7 @@ class AudioReceiver : public base::NonThreadSafe,
|
|
|
| // Decrypts the data within the |audio_frame| and replaces the data with the
|
| // decrypted string.
|
| - bool DecryptAudioFrame(scoped_ptr<EncodedAudioFrame>* audio_frame);
|
| + bool DecryptAudioFrame(scoped_ptr<transport::EncodedAudioFrame>* audio_frame);
|
|
|
| // Schedule the next RTCP report.
|
| void ScheduleNextRtcpReport();
|
| @@ -117,7 +118,7 @@ class AudioReceiver : public base::NonThreadSafe,
|
| scoped_refptr<CastEnvironment> cast_environment_;
|
| base::WeakPtrFactory<AudioReceiver> weak_factory_;
|
|
|
| - const AudioCodec codec_;
|
| + const transport::AudioCodec codec_;
|
| const int frequency_;
|
| base::TimeDelta target_delay_delta_;
|
| scoped_ptr<Framer> audio_buffer_;
|
|
|