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

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

Issue 25546003: Revert 226264 "Be able to build cast_unittest and related target..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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
« no previous file with comments | « trunk/src/build/all.gyp ('k') | trunk/src/media/cast/audio_receiver/audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/cast/audio_receiver/audio_decoder.h
===================================================================
--- trunk/src/media/cast/audio_receiver/audio_decoder.h (revision 226266)
+++ trunk/src/media/cast/audio_receiver/audio_decoder.h (working copy)
@@ -25,6 +25,8 @@
explicit AudioDecoder(scoped_refptr<CastThread> cast_thread,
const AudioReceiverConfig& audio_config);
+ virtual ~AudioDecoder();
+
// Extract a raw audio frame from the decoder.
// Set the number of desired 10ms blocks and frequency.
bool GetRawAudioFrame(int number_of_10ms_blocks,
@@ -37,13 +39,9 @@
int payload_size,
const RtpCastHeader& rtp_header);
- protected:
- virtual ~AudioDecoder();
-
private:
- friend class base::RefCountedThreadSafe<AudioDecoder>;
-
- scoped_ptr<webrtc::AudioCodingModule> audio_decoder_;
+ // Can't use scoped_ptr due to protected constructor within webrtc.
+ webrtc::AudioCodingModule* audio_decoder_;
bool have_received_packets_;
scoped_refptr<CastThread> cast_thread_;
@@ -53,4 +51,4 @@
} // namespace cast
} // namespace media
-#endif // MEDIA_CAST_AUDIO_RECEIVER_AUDIO_DECODER_H_
+#endif // MEDIA_CAST_AUDIO_RECEIVER_AUDIO_DECODER_H_
« no previous file with comments | « trunk/src/build/all.gyp ('k') | trunk/src/media/cast/audio_receiver/audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698