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

Side by Side Diff: webrtc/modules/audio_coding/test/TestAllCodecs.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_TESTALLCODECS_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/modules/audio_coding/test/ACMTest.h" 16 #include "webrtc/modules/audio_coding/test/ACMTest.h"
16 #include "webrtc/modules/audio_coding/test/Channel.h" 17 #include "webrtc/modules/audio_coding/test/Channel.h"
17 #include "webrtc/modules/audio_coding/test/PCMFile.h" 18 #include "webrtc/modules/audio_coding/test/PCMFile.h"
18 #include "webrtc/typedefs.h" 19 #include "webrtc/typedefs.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 class Config; 23 class Config;
23 24
24 class TestPack : public AudioPacketizationCallback { 25 class TestPack : public AudioPacketizationCallback {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // This is useful for codecs which support several sampling frequency. 63 // This is useful for codecs which support several sampling frequency.
63 // Note! Only mono mode is tested in this test. 64 // Note! Only mono mode is tested in this test.
64 void RegisterSendCodec(char side, char* codec_name, int32_t sampling_freq_hz, 65 void RegisterSendCodec(char side, char* codec_name, int32_t sampling_freq_hz,
65 int rate, int packet_size, size_t extra_byte); 66 int rate, int packet_size, size_t extra_byte);
66 67
67 void Run(TestPack* channel); 68 void Run(TestPack* channel);
68 void OpenOutFile(int test_number); 69 void OpenOutFile(int test_number);
69 void DisplaySendReceiveCodec(); 70 void DisplaySendReceiveCodec();
70 71
71 int test_mode_; 72 int test_mode_;
72 rtc::scoped_ptr<AudioCodingModule> acm_a_; 73 std::unique_ptr<AudioCodingModule> acm_a_;
73 rtc::scoped_ptr<AudioCodingModule> acm_b_; 74 std::unique_ptr<AudioCodingModule> acm_b_;
74 TestPack* channel_a_to_b_; 75 TestPack* channel_a_to_b_;
75 PCMFile infile_a_; 76 PCMFile infile_a_;
76 PCMFile outfile_b_; 77 PCMFile outfile_b_;
77 int test_count_; 78 int test_count_;
78 int packet_size_samples_; 79 int packet_size_samples_;
79 size_t packet_size_bytes_; 80 size_t packet_size_bytes_;
80 }; 81 };
81 82
82 } // namespace webrtc 83 } // namespace webrtc
83 84
84 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_ 85 #endif // WEBRTC_MODULES_AUDIO_CODING_TEST_TESTALLCODECS_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/SpatialAudio.h ('k') | webrtc/modules/audio_coding/test/TestRedFec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698