OLD | NEW |
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 "base/memory/ptr_util.h" |
8 #include "remoting/codec/audio_decoder_opus.h" | 9 #include "remoting/codec/audio_decoder_opus.h" |
9 #include "remoting/codec/audio_decoder_verbatim.h" | 10 #include "remoting/codec/audio_decoder_verbatim.h" |
10 #include "remoting/protocol/session_config.h" | 11 #include "remoting/protocol/session_config.h" |
11 | 12 |
12 namespace remoting { | 13 namespace remoting { |
13 | 14 |
14 scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder( | 15 std::unique_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder( |
15 const protocol::SessionConfig& config) { | 16 const protocol::SessionConfig& config) { |
16 const protocol::ChannelConfig& audio_config = config.audio_config(); | 17 const protocol::ChannelConfig& audio_config = config.audio_config(); |
17 | 18 |
18 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { | 19 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { |
19 return make_scoped_ptr(new AudioDecoderVerbatim()); | 20 return base::WrapUnique(new AudioDecoderVerbatim()); |
20 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 21 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
21 return make_scoped_ptr(new AudioDecoderOpus()); | 22 return base::WrapUnique(new AudioDecoderOpus()); |
22 } | 23 } |
23 | 24 |
24 NOTIMPLEMENTED(); | 25 NOTIMPLEMENTED(); |
25 return nullptr; | 26 return nullptr; |
26 } | 27 } |
27 | 28 |
28 } // namespace remoting | 29 } // namespace remoting |
OLD | NEW |