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

Side by Side Diff: webrtc/modules/audio_coding/test/iSACTest.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_ISACTEST_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_
13 13
14 #include <string.h> 14 #include <string.h>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include <memory>
17
17 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
18 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 19 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
19 #include "webrtc/modules/audio_coding/test/ACMTest.h" 20 #include "webrtc/modules/audio_coding/test/ACMTest.h"
20 #include "webrtc/modules/audio_coding/test/Channel.h" 21 #include "webrtc/modules/audio_coding/test/Channel.h"
21 #include "webrtc/modules/audio_coding/test/PCMFile.h" 22 #include "webrtc/modules/audio_coding/test/PCMFile.h"
22 #include "webrtc/modules/audio_coding/test/utility.h" 23 #include "webrtc/modules/audio_coding/test/utility.h"
23 24
24 #define MAX_FILE_NAME_LENGTH_BYTE 500 25 #define MAX_FILE_NAME_LENGTH_BYTE 500
25 #define NO_OF_CLIENTS 15 26 #define NO_OF_CLIENTS 15
26 27
(...skipping 17 matching lines...) Expand all
44 private: 45 private:
45 void Setup(); 46 void Setup();
46 47
47 void Run10ms(); 48 void Run10ms();
48 49
49 void EncodeDecode(int testNr, ACMTestISACConfig& wbISACConfig, 50 void EncodeDecode(int testNr, ACMTestISACConfig& wbISACConfig,
50 ACMTestISACConfig& swbISACConfig); 51 ACMTestISACConfig& swbISACConfig);
51 52
52 void SwitchingSamplingRate(int testNr, int maxSampRateChange); 53 void SwitchingSamplingRate(int testNr, int maxSampRateChange);
53 54
54 rtc::scoped_ptr<AudioCodingModule> _acmA; 55 std::unique_ptr<AudioCodingModule> _acmA;
55 rtc::scoped_ptr<AudioCodingModule> _acmB; 56 std::unique_ptr<AudioCodingModule> _acmB;
56 57
57 rtc::scoped_ptr<Channel> _channel_A2B; 58 std::unique_ptr<Channel> _channel_A2B;
58 rtc::scoped_ptr<Channel> _channel_B2A; 59 std::unique_ptr<Channel> _channel_B2A;
59 60
60 PCMFile _inFileA; 61 PCMFile _inFileA;
61 PCMFile _inFileB; 62 PCMFile _inFileB;
62 63
63 PCMFile _outFileA; 64 PCMFile _outFileA;
64 PCMFile _outFileB; 65 PCMFile _outFileB;
65 66
66 uint8_t _idISAC16kHz; 67 uint8_t _idISAC16kHz;
67 uint8_t _idISAC32kHz; 68 uint8_t _idISAC32kHz;
68 CodecInst _paramISAC16kHz; 69 CodecInst _paramISAC16kHz;
69 CodecInst _paramISAC32kHz; 70 CodecInst _paramISAC32kHz;
70 71
71 std::string file_name_swb_; 72 std::string file_name_swb_;
72 73
73 ACMTestTimer _myTimer; 74 ACMTestTimer _myTimer;
74 int _testMode; 75 int _testMode;
75 }; 76 };
76 77
77 } // namespace webrtc 78 } // namespace webrtc
78 79
79 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_ 80 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_ISACTEST_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/delay_test.cc ('k') | webrtc/modules/audio_coding/test/insert_packet_with_timing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698