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

Side by Side Diff: webrtc/modules/audio_coding/acm2/codec_manager.h

Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-actest
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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_ACM2_CODEC_MANAGER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_
13 13
14 #include <map> 14 #include <map>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/optional.h" 17 #include "webrtc/base/optional.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 19 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
21 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" 20 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
22 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class AudioDecoder; 25 class AudioDecoder;
27 class AudioEncoder; 26 class AudioEncoder;
28 27
(...skipping 28 matching lines...) Expand all
57 rtc::ThreadChecker thread_checker_; 56 rtc::ThreadChecker thread_checker_;
58 rtc::Optional<CodecInst> send_codec_inst_; 57 rtc::Optional<CodecInst> send_codec_inst_;
59 RentACodec::StackParameters codec_stack_params_; 58 RentACodec::StackParameters codec_stack_params_;
60 59
61 RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager); 60 RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager);
62 }; 61 };
63 62
64 } // namespace acm2 63 } // namespace acm2
65 } // namespace webrtc 64 } // namespace webrtc
66 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_ 65 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698