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

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

Issue 129113003: Revert 243647 "Cast:Adding cast_transport_config and cleaning up" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months 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: trunk/src/media/cast/audio_receiver/audio_receiver.cc
===================================================================
--- trunk/src/media/cast/audio_receiver/audio_receiver.cc (revision 243647)
+++ trunk/src/media/cast/audio_receiver/audio_receiver.cc (working copy)
@@ -291,8 +291,7 @@
}
uint32 rtp_timestamp = 0;
bool next_frame = false;
- scoped_ptr<transport::EncodedAudioFrame> encoded_frame(
- new transport::EncodedAudioFrame());
+ scoped_ptr<EncodedAudioFrame> encoded_frame(new EncodedAudioFrame());
if (!audio_buffer_->GetEncodedAudioFrame(encoded_frame.get(),
&rtp_timestamp, &next_frame)) {
@@ -323,8 +322,7 @@
uint32 rtp_timestamp = 0;
bool next_frame = false;
- scoped_ptr<transport::EncodedAudioFrame> encoded_frame(
- new transport::EncodedAudioFrame());
+ scoped_ptr<EncodedAudioFrame> encoded_frame(new EncodedAudioFrame());
if (!audio_buffer_->GetEncodedAudioFrame(encoded_frame.get(),
&rtp_timestamp, &next_frame)) {
@@ -350,7 +348,7 @@
const AudioFrameEncodedCallback& callback,
uint32 rtp_timestamp,
bool next_frame,
- scoped_ptr<transport::EncodedAudioFrame>* encoded_frame) {
+ scoped_ptr<EncodedAudioFrame>* encoded_frame) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
DCHECK(audio_buffer_) << "Invalid function call in this configuration";
@@ -434,7 +432,7 @@
}
bool AudioReceiver::DecryptAudioFrame(
- scoped_ptr<transport::EncodedAudioFrame>* audio_frame) {
+ scoped_ptr<EncodedAudioFrame>* audio_frame) {
DCHECK(decryptor_) << "Invalid state";
if (!decryptor_->SetCounter(GetAesNonce((*audio_frame)->frame_id,
« no previous file with comments | « trunk/src/media/cast/audio_receiver/audio_receiver.h ('k') | trunk/src/media/cast/audio_receiver/audio_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698