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

Side by Side Diff: webrtc/modules/audio_coding/test/TwoWayCommunication.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
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_TWOWAYCOMMUNICATION_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_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 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class TwoWayCommunication : public ACMTest { 24 class TwoWayCommunication : public ACMTest {
24 public: 25 public:
25 explicit TwoWayCommunication(int testMode); 26 explicit TwoWayCommunication(int testMode);
26 ~TwoWayCommunication(); 27 ~TwoWayCommunication();
27 28
28 void Perform(); 29 void Perform();
29 private: 30 private:
30 void ChooseCodec(uint8_t* codecID_A, uint8_t* codecID_B); 31 void ChooseCodec(uint8_t* codecID_A, uint8_t* codecID_B);
31 void SetUp(); 32 void SetUp();
32 void SetUpAutotest(); 33 void SetUpAutotest();
33 34
34 rtc::scoped_ptr<AudioCodingModule> _acmA; 35 std::unique_ptr<AudioCodingModule> _acmA;
35 rtc::scoped_ptr<AudioCodingModule> _acmB; 36 std::unique_ptr<AudioCodingModule> _acmB;
36 37
37 rtc::scoped_ptr<AudioCodingModule> _acmRefA; 38 std::unique_ptr<AudioCodingModule> _acmRefA;
38 rtc::scoped_ptr<AudioCodingModule> _acmRefB; 39 std::unique_ptr<AudioCodingModule> _acmRefB;
39 40
40 Channel* _channel_A2B; 41 Channel* _channel_A2B;
41 Channel* _channel_B2A; 42 Channel* _channel_B2A;
42 43
43 Channel* _channelRef_A2B; 44 Channel* _channelRef_A2B;
44 Channel* _channelRef_B2A; 45 Channel* _channelRef_B2A;
45 46
46 PCMFile _inFileA; 47 PCMFile _inFileA;
47 PCMFile _inFileB; 48 PCMFile _inFileB;
48 49
49 PCMFile _outFileA; 50 PCMFile _outFileA;
50 PCMFile _outFileB; 51 PCMFile _outFileB;
51 52
52 PCMFile _outFileRefA; 53 PCMFile _outFileRefA;
53 PCMFile _outFileRefB; 54 PCMFile _outFileRefB;
54 55
55 int _testMode; 56 int _testMode;
56 }; 57 };
57 58
58 } // namespace webrtc 59 } // namespace webrtc
59 60
60 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_ 61 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TWOWAYCOMMUNICATION_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/TestVADDTX.h ('k') | webrtc/modules/audio_coding/test/TwoWayCommunication.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698