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

Side by Side Diff: webrtc/modules/audio_coding/test/SpatialAudio.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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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_SPATIALAUDIO_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_SPATIALAUDIO_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_SPATIALAUDIO_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_SPATIALAUDIO_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 #define MAX_FILE_NAME_LENGTH_BYTE 500 22 #define MAX_FILE_NAME_LENGTH_BYTE 500
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
25 class SpatialAudio : public ACMTest { 26 class SpatialAudio : public ACMTest {
26 public: 27 public:
27 SpatialAudio(int testMode); 28 SpatialAudio(int testMode);
28 ~SpatialAudio(); 29 ~SpatialAudio();
29 30
30 void Perform(); 31 void Perform();
31 private: 32 private:
32 int16_t Setup(); 33 int16_t Setup();
33 void EncodeDecode(double leftPanning, double rightPanning); 34 void EncodeDecode(double leftPanning, double rightPanning);
34 void EncodeDecode(); 35 void EncodeDecode();
35 36
36 rtc::scoped_ptr<AudioCodingModule> _acmLeft; 37 std::unique_ptr<AudioCodingModule> _acmLeft;
37 rtc::scoped_ptr<AudioCodingModule> _acmRight; 38 std::unique_ptr<AudioCodingModule> _acmRight;
38 rtc::scoped_ptr<AudioCodingModule> _acmReceiver; 39 std::unique_ptr<AudioCodingModule> _acmReceiver;
39 Channel* _channel; 40 Channel* _channel;
40 PCMFile _inFile; 41 PCMFile _inFile;
41 PCMFile _outFile; 42 PCMFile _outFile;
42 int _testMode; 43 int _testMode;
43 }; 44 };
44 45
45 } // namespace webrtc 46 } // namespace webrtc
46 47
47 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_SPATIALAUDIO_H_ 48 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_SPATIALAUDIO_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/PacketLossTest.cc ('k') | webrtc/modules/audio_coding/test/TestAllCodecs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698