summaryrefslogtreecommitdiffstats
path: root/remoting/codec
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 00:35:13 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 00:35:13 +0000
commit3c2dc955e2d6bbcc20fd18512c09cc916e796b0a (patch)
treefff266eb50e04302ce4f632a938a1963b4b1fefe /remoting/codec
parent27b7b64d69423a0e50b740f0b9d81c46a3de33be (diff)
downloadchromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.zip
chromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.tar.gz
chromium_src-3c2dc955e2d6bbcc20fd18512c09cc916e796b0a.tar.bz2
Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool across all files built on Linux in the remoting/ directory. BUG=173286 Review URL: https://chromiumcodereview.appspot.com/16964002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/codec')
-rw-r--r--remoting/codec/audio_decoder.cc2
-rw-r--r--remoting/codec/audio_decoder_speex.cc4
-rw-r--r--remoting/codec/video_encoder_vp8.cc5
3 files changed, 4 insertions, 7 deletions
diff --git a/remoting/codec/audio_decoder.cc b/remoting/codec/audio_decoder.cc
index 3dc70c3..94c30b4 100644
--- a/remoting/codec/audio_decoder.cc
+++ b/remoting/codec/audio_decoder.cc
@@ -25,7 +25,7 @@ scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
}
NOTIMPLEMENTED();
- return scoped_ptr<AudioDecoder>(NULL);
+ return scoped_ptr<AudioDecoder>();
}
} // namespace remoting
diff --git a/remoting/codec/audio_decoder_speex.cc b/remoting/codec/audio_decoder_speex.cc
index 7114844..31bdcd4 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_);
diff --git a/remoting/codec/video_encoder_vp8.cc b/remoting/codec/video_encoder_vp8.cc
index 7824065..21712aa 100644
--- a/remoting/codec/video_encoder_vp8.cc
+++ b/remoting/codec/video_encoder_vp8.cc
@@ -31,12 +31,9 @@ namespace remoting {
VideoEncoderVp8::VideoEncoderVp8()
: initialized_(false),
- codec_(NULL),
- image_(NULL),
active_map_width_(0),
active_map_height_(0),
- last_timestamp_(0) {
-}
+ last_timestamp_(0) {}
VideoEncoderVp8::~VideoEncoderVp8() {
Destroy();