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

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

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 <memory>
16 #include <string> 15 #include <string>
17 16
18 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/common_types.h" // NULL 18 #include "webrtc/common_types.h" // NULL
20 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" 19 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
21 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" 20 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
22 #include "webrtc/modules/audio_coding/neteq/packet.h" 21 #include "webrtc/modules/audio_coding/neteq/packet.h"
23 #include "webrtc/typedefs.h" 22 #include "webrtc/typedefs.h"
24 23
25 namespace webrtc { 24 namespace webrtc {
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 DecoderMap decoders_; 155 DecoderMap decoders_;
157 int active_decoder_type_; 156 int active_decoder_type_;
158 int active_cng_decoder_type_; 157 int active_cng_decoder_type_;
159 std::unique_ptr<ComfortNoiseDecoder> active_cng_decoder_; 158 std::unique_ptr<ComfortNoiseDecoder> active_cng_decoder_;
160 159
161 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase); 160 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
162 }; 161 };
163 162
164 } // namespace webrtc 163 } // namespace webrtc
165 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 164 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/include/audio_coding_module.h ('k') | webrtc/modules/audio_coding/neteq/neteq.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698