| Index: media/cast/audio_receiver/audio_receiver.cc
|
| diff --git a/media/cast/audio_receiver/audio_receiver.cc b/media/cast/audio_receiver/audio_receiver.cc
|
| index c4eaaa7716dee6f13c0cb3edf95d075f60f8646b..bb9749801fb27c1a3dd21fe944ffca9f04f699ee 100644
|
| --- a/media/cast/audio_receiver/audio_receiver.cc
|
| +++ b/media/cast/audio_receiver/audio_receiver.cc
|
| @@ -291,7 +291,8 @@ void AudioReceiver::PlayoutTimeout() {
|
| }
|
| uint32 rtp_timestamp = 0;
|
| bool next_frame = false;
|
| - scoped_ptr<EncodedAudioFrame> encoded_frame(new EncodedAudioFrame());
|
| + scoped_ptr<transport::EncodedAudioFrame> encoded_frame(
|
| + new transport::EncodedAudioFrame());
|
|
|
| if (!audio_buffer_->GetEncodedAudioFrame(encoded_frame.get(),
|
| &rtp_timestamp, &next_frame)) {
|
| @@ -322,7 +323,8 @@ void AudioReceiver::GetEncodedAudioFrame(
|
|
|
| uint32 rtp_timestamp = 0;
|
| bool next_frame = false;
|
| - scoped_ptr<EncodedAudioFrame> encoded_frame(new EncodedAudioFrame());
|
| + scoped_ptr<transport::EncodedAudioFrame> encoded_frame(
|
| + new transport::EncodedAudioFrame());
|
|
|
| if (!audio_buffer_->GetEncodedAudioFrame(encoded_frame.get(),
|
| &rtp_timestamp, &next_frame)) {
|
| @@ -348,7 +350,7 @@ bool AudioReceiver::PostEncodedAudioFrame(
|
| const AudioFrameEncodedCallback& callback,
|
| uint32 rtp_timestamp,
|
| bool next_frame,
|
| - scoped_ptr<EncodedAudioFrame>* encoded_frame) {
|
| + scoped_ptr<transport::EncodedAudioFrame>* encoded_frame) {
|
| DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
|
| DCHECK(audio_buffer_) << "Invalid function call in this configuration";
|
|
|
| @@ -432,7 +434,7 @@ base::TimeTicks AudioReceiver::GetPlayoutTime(base::TimeTicks now,
|
| }
|
|
|
| bool AudioReceiver::DecryptAudioFrame(
|
| - scoped_ptr<EncodedAudioFrame>* audio_frame) {
|
| + scoped_ptr<transport::EncodedAudioFrame>* audio_frame) {
|
| DCHECK(decryptor_) << "Invalid state";
|
|
|
| if (!decryptor_->SetCounter(GetAesNonce((*audio_frame)->frame_id,
|
|
|