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

Side by Side Diff: remoting/codec/audio_decoder.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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_verbatim.h" 9 #include "remoting/codec/audio_decoder_verbatim.h"
10 #include "remoting/protocol/session_config.h" 10 #include "remoting/protocol/session_config.h"
11 11
12 namespace remoting { 12 namespace remoting {
13 13
14 scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder( 14 scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
15 const protocol::SessionConfig& config) { 15 const protocol::SessionConfig& config) {
16 const protocol::ChannelConfig& audio_config = config.audio_config(); 16 const protocol::ChannelConfig& audio_config = config.audio_config();
17 17
18 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { 18 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
19 return scoped_ptr<AudioDecoder>(new AudioDecoderVerbatim()); 19 return scoped_ptr<AudioDecoder>(new AudioDecoderVerbatim());
20 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { 20 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
21 return scoped_ptr<AudioDecoder>(new AudioDecoderOpus()); 21 return scoped_ptr<AudioDecoder>(new AudioDecoderOpus());
22 } 22 }
23 23
24 NOTIMPLEMENTED(); 24 NOTIMPLEMENTED();
25 return scoped_ptr<AudioDecoder>(); 25 return nullptr;
26 } 26 }
27 27
28 } // namespace remoting 28 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698