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

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

Issue 25544003: Fix code style and gyp files in cast to build cast_unittest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed gyp files 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 | « build/all.gyp ('k') | 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: media/cast/audio_receiver/audio_decoder.h
diff --git a/media/cast/audio_receiver/audio_decoder.h b/media/cast/audio_receiver/audio_decoder.h
index 2f5f13aea2d710f98329573fd26cecc5fac3434b..bd84e37fbc83df9d66ebfb8398ef2cf8e91e4e8e 100644
--- a/media/cast/audio_receiver/audio_decoder.h
+++ b/media/cast/audio_receiver/audio_decoder.h
@@ -25,8 +25,6 @@ class AudioDecoder : public base::RefCountedThreadSafe<AudioDecoder> {
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,
@@ -39,9 +37,13 @@ class AudioDecoder : public base::RefCountedThreadSafe<AudioDecoder> {
int payload_size,
const RtpCastHeader& rtp_header);
+ protected:
+ virtual ~AudioDecoder();
+
private:
- // Can't use scoped_ptr due to protected constructor within webrtc.
- webrtc::AudioCodingModule* audio_decoder_;
+ friend class base::RefCountedThreadSafe<AudioDecoder>;
+
+ scoped_ptr<webrtc::AudioCodingModule> audio_decoder_;
bool have_received_packets_;
scoped_refptr<CastThread> cast_thread_;
@@ -51,4 +53,4 @@ class AudioDecoder : public base::RefCountedThreadSafe<AudioDecoder> {
} // 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 | « build/all.gyp ('k') | media/cast/audio_receiver/audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698