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

Side by Side Diff: webrtc/modules/audio_coding/test/TestStereo.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_TESTSTEREO_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_
13 13
14 #include <math.h> 14 #include <math.h>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include <memory>
17
17 #include "webrtc/modules/audio_coding/test/ACMTest.h" 18 #include "webrtc/modules/audio_coding/test/ACMTest.h"
18 #include "webrtc/modules/audio_coding/test/Channel.h" 19 #include "webrtc/modules/audio_coding/test/Channel.h"
19 #include "webrtc/modules/audio_coding/test/PCMFile.h" 20 #include "webrtc/modules/audio_coding/test/PCMFile.h"
20 21
21 #define PCMA_AND_PCMU 22 #define PCMA_AND_PCMU
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
25 enum StereoMonoMode { 26 enum StereoMonoMode {
26 kNotSet, 27 kNotSet,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 int rate, int pack_size, int channels, 76 int rate, int pack_size, int channels,
76 int payload_type); 77 int payload_type);
77 78
78 void Run(TestPackStereo* channel, int in_channels, int out_channels, 79 void Run(TestPackStereo* channel, int in_channels, int out_channels,
79 int percent_loss = 0); 80 int percent_loss = 0);
80 void OpenOutFile(int16_t test_number); 81 void OpenOutFile(int16_t test_number);
81 void DisplaySendReceiveCodec(); 82 void DisplaySendReceiveCodec();
82 83
83 int test_mode_; 84 int test_mode_;
84 85
85 rtc::scoped_ptr<AudioCodingModule> acm_a_; 86 std::unique_ptr<AudioCodingModule> acm_a_;
86 rtc::scoped_ptr<AudioCodingModule> acm_b_; 87 std::unique_ptr<AudioCodingModule> acm_b_;
87 88
88 TestPackStereo* channel_a2b_; 89 TestPackStereo* channel_a2b_;
89 90
90 PCMFile* in_file_stereo_; 91 PCMFile* in_file_stereo_;
91 PCMFile* in_file_mono_; 92 PCMFile* in_file_mono_;
92 PCMFile out_file_; 93 PCMFile out_file_;
93 int16_t test_cntr_; 94 int16_t test_cntr_;
94 uint16_t pack_size_samp_; 95 uint16_t pack_size_samp_;
95 uint16_t pack_size_bytes_; 96 uint16_t pack_size_bytes_;
96 int counter_; 97 int counter_;
(...skipping 11 matching lines...) Expand all
108 int pcmu_pltype_; 109 int pcmu_pltype_;
109 #endif 110 #endif
110 #ifdef WEBRTC_CODEC_OPUS 111 #ifdef WEBRTC_CODEC_OPUS
111 int opus_pltype_; 112 int opus_pltype_;
112 #endif 113 #endif
113 }; 114 };
114 115
115 } // namespace webrtc 116 } // namespace webrtc
116 117
117 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_ 118 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTSTEREO_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/TestRedFec.h ('k') | webrtc/modules/audio_coding/test/TestVADDTX.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698