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

Unified Diff: remoting/codec/audio_decoder_speex.cc

Issue 16964002: Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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: remoting/codec/audio_decoder_speex.cc
diff --git a/remoting/codec/audio_decoder_speex.cc b/remoting/codec/audio_decoder_speex.cc
index 7114844a72dda111f6602a82d0a443150e53bee3..31bdcd46e8aca09db91d3aef2a27f0586df96ee1 100644
--- a/remoting/codec/audio_decoder_speex.cc
+++ b/remoting/codec/audio_decoder_speex.cc
@@ -74,7 +74,7 @@ scoped_ptr<AudioPacket> AudioDecoderSpeex::Decode(
(packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) ||
(packet->channels() != AudioPacket::CHANNELS_STEREO)) {
LOG(WARNING) << "Received an unsupported packet.";
- return scoped_ptr<AudioPacket>(NULL);
+ return scoped_ptr<AudioPacket>();
}
if (packet->data_size() > kMaxFramesPerPacket) {
LOG(WARNING) << "Received an packet with too many frames.";
@@ -105,7 +105,7 @@ scoped_ptr<AudioPacket> AudioDecoderSpeex::Decode(
int status = speex_decode_int(speex_state_, speex_bits_.get(), samples);
if (status < 0) {
LOG(ERROR) << "Error in decoding Speex data.";
- return scoped_ptr<AudioPacket>(NULL);
+ return scoped_ptr<AudioPacket>();
}
// Transform mono to stereo.
speex_decode_stereo_int(samples, speex_frame_size_, speex_stereo_state_);

Powered by Google App Engine
This is Rietveld 408576698