Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: media/cast/audio_receiver/audio_receiver.cc

Issue 109413004: Cast:Adding cast_transport_config and cleaning up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Injecting TaskRunner Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bd78cf7666805acd174676afbbaabf44674497d5..effa658273b186c884fe9580cac787c433f6a8de 100644
--- a/media/cast/audio_receiver/audio_receiver.cc
+++ b/media/cast/audio_receiver/audio_receiver.cc
@@ -282,7 +282,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)) {
@@ -313,7 +314,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)) {
@@ -339,7 +341,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";
@@ -423,7 +425,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,

Powered by Google App Engine
This is Rietveld 408576698