diff options
| author | mikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:14:56 +0000 |
|---|---|---|
| committer | mikhal@chromium.org <mikhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 21:14:56 +0000 |
| commit | e1f0b85058b95912bf34064e7e9a0ae2cb12d254 (patch) | |
| tree | dbe002ae284e8ef008d8caa96819ada811221e1b /media/cast/audio_receiver/audio_receiver.cc | |
| parent | 3c03a29af565c63a10dba3b6b503b899c3714726 (diff) | |
| download | chromium_src-e1f0b85058b95912bf34064e7e9a0ae2cb12d254.zip chromium_src-e1f0b85058b95912bf34064e7e9a0ae2cb12d254.tar.gz chromium_src-e1f0b85058b95912bf34064e7e9a0ae2cb12d254.tar.bz2 | |
Cast:Adding cast_transport_config and cleaning up
BUG=327482
Review URL: https://codereview.chromium.org/109413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/audio_receiver/audio_receiver.cc')
| -rw-r--r-- | media/cast/audio_receiver/audio_receiver.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/cast/audio_receiver/audio_receiver.cc b/media/cast/audio_receiver/audio_receiver.cc index c4eaaa7..bb97498 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, |