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

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

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.h
===================================================================
--- trunk/src/media/cast/audio_receiver/audio_receiver.h (revision 243647)
+++ trunk/src/media/cast/audio_receiver/audio_receiver.h (working copy)
@@ -79,11 +79,10 @@
// 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<transport::EncodedAudioFrame>* encoded_frame);
+ bool PostEncodedAudioFrame(const AudioFrameEncodedCallback& callback,
+ uint32 rtp_timestamp,
+ bool next_frame,
+ scoped_ptr<EncodedAudioFrame>* encoded_frame);
// Actual decoding implementation - should be called under the audio decoder
// thread.
@@ -101,7 +100,7 @@
// Decrypts the data within the |audio_frame| and replaces the data with the
// decrypted string.
- bool DecryptAudioFrame(scoped_ptr<transport::EncodedAudioFrame>* audio_frame);
+ bool DecryptAudioFrame(scoped_ptr<EncodedAudioFrame>* audio_frame);
// Schedule the next RTCP report.
void ScheduleNextRtcpReport();
@@ -118,7 +117,7 @@
scoped_refptr<CastEnvironment> cast_environment_;
base::WeakPtrFactory<AudioReceiver> weak_factory_;
- const transport::AudioCodec codec_;
+ const AudioCodec codec_;
const int frequency_;
base::TimeDelta target_delay_delta_;
scoped_ptr<Framer> audio_buffer_;
« no previous file with comments | « trunk/src/media/cast/audio_receiver/audio_decoder_unittest.cc ('k') | trunk/src/media/cast/audio_receiver/audio_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698