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_ |