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

Side by Side Diff: remoting/codec/audio_decoder.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/codec/audio_decoder.h" 5 #include "remoting/codec/audio_decoder.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "remoting/codec/audio_decoder_opus.h" 8 #include "remoting/codec/audio_decoder_opus.h"
9 #include "remoting/codec/audio_decoder_speex.h" 9 #include "remoting/codec/audio_decoder_speex.h"
10 #include "remoting/codec/audio_decoder_verbatim.h" 10 #include "remoting/codec/audio_decoder_verbatim.h"
11 #include "remoting/protocol/session_config.h" 11 #include "remoting/protocol/session_config.h"
12 12
13 namespace remoting { 13 namespace remoting {
14 14
15 scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder( 15 scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
16 const protocol::SessionConfig& config) { 16 const protocol::SessionConfig& config) {
17 const protocol::ChannelConfig& audio_config = config.audio_config(); 17 const protocol::ChannelConfig& audio_config = config.audio_config();
18 18
19 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { 19 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
20 return scoped_ptr<AudioDecoder>(new AudioDecoderVerbatim()); 20 return scoped_ptr<AudioDecoder>(new AudioDecoderVerbatim());
21 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { 21 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
22 return scoped_ptr<AudioDecoder>(new AudioDecoderOpus()); 22 return scoped_ptr<AudioDecoder>(new AudioDecoderOpus());
23 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_SPEEX) { 23 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_SPEEX) {
24 return scoped_ptr<AudioDecoder>(new AudioDecoderSpeex()); 24 return scoped_ptr<AudioDecoder>(new AudioDecoderSpeex());
25 } 25 }
26 26
27 NOTIMPLEMENTED(); 27 NOTIMPLEMENTED();
28 return scoped_ptr<AudioDecoder>(NULL); 28 return scoped_ptr<AudioDecoder>();
29 } 29 }
30 30
31 } // namespace remoting 31 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/codec/audio_decoder_speex.cc » ('j') | remoting/codec/video_encoder_vp8.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698