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

Side by Side Diff: webrtc/modules/audio_coding/test/APITest.h

Issue 1695763004: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/test/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-neteq
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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/test/EncodeDecodeTest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TEST_APITEST_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 16 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
16 #include "webrtc/modules/audio_coding/test/ACMTest.h" 17 #include "webrtc/modules/audio_coding/test/ACMTest.h"
17 #include "webrtc/modules/audio_coding/test/Channel.h" 18 #include "webrtc/modules/audio_coding/test/Channel.h"
18 #include "webrtc/modules/audio_coding/test/PCMFile.h" 19 #include "webrtc/modules/audio_coding/test/PCMFile.h"
19 #include "webrtc/modules/audio_coding/test/utility.h" 20 #include "webrtc/modules/audio_coding/test/utility.h"
20 #include "webrtc/system_wrappers/include/event_wrapper.h" 21 #include "webrtc/system_wrappers/include/event_wrapper.h"
21 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" 22 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 bool PullAudioRunA(); 76 bool PullAudioRunA();
76 bool ProcessRunA(); 77 bool ProcessRunA();
77 bool APIRunA(); 78 bool APIRunA();
78 79
79 bool PullAudioRunB(); 80 bool PullAudioRunB();
80 bool PushAudioRunB(); 81 bool PushAudioRunB();
81 bool ProcessRunB(); 82 bool ProcessRunB();
82 bool APIRunB(); 83 bool APIRunB();
83 84
84 //--- ACMs 85 //--- ACMs
85 rtc::scoped_ptr<AudioCodingModule> _acmA; 86 std::unique_ptr<AudioCodingModule> _acmA;
86 rtc::scoped_ptr<AudioCodingModule> _acmB; 87 std::unique_ptr<AudioCodingModule> _acmB;
87 88
88 //--- Channels 89 //--- Channels
89 Channel* _channel_A2B; 90 Channel* _channel_A2B;
90 Channel* _channel_B2A; 91 Channel* _channel_B2A;
91 92
92 //--- I/O files 93 //--- I/O files
93 // A 94 // A
94 PCMFile _inFileA; 95 PCMFile _inFileA;
95 PCMFile _outFileA; 96 PCMFile _outFileA;
96 // B 97 // B
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 VADCallback* _vadCallbackB; 155 VADCallback* _vadCallbackB;
155 RWLockWrapper& _apiTestRWLock; 156 RWLockWrapper& _apiTestRWLock;
156 bool _randomTest; 157 bool _randomTest;
157 int _testNumA; 158 int _testNumA;
158 int _testNumB; 159 int _testNumB;
159 }; 160 };
160 161
161 } // namespace webrtc 162 } // namespace webrtc
162 163
163 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_ 164 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_APITEST_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/test/EncodeDecodeTest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698