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

Side by Side Diff: webrtc/modules/audio_coding/neteq/decoder_database.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs
Patch Set: Created 4 years, 10 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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
13 13
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/common_types.h" // NULL 18 #include "webrtc/common_types.h" // NULL
20 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" 19 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
21 #include "webrtc/modules/audio_coding/neteq/packet.h" 20 #include "webrtc/modules/audio_coding/neteq/packet.h"
22 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class DecoderDatabase { 25 class DecoderDatabase {
27 public: 26 public:
28 enum DatabaseReturnCodes { 27 enum DatabaseReturnCodes {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 153
155 DecoderMap decoders_; 154 DecoderMap decoders_;
156 int active_decoder_; 155 int active_decoder_;
157 int active_cng_decoder_; 156 int active_cng_decoder_;
158 157
159 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase); 158 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
160 }; 159 };
161 160
162 } // namespace webrtc 161 } // namespace webrtc
163 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 162 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/background_noise.h ('k') | webrtc/modules/audio_coding/neteq/expand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698