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

Side by Side Diff: webrtc/voice_engine/test/auto_test/voe_standard_test.cc

Issue 1723153002: Remove the VoEDtmf interface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 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
(...skipping 24 matching lines...) Expand all
35 namespace voetest { 35 namespace voetest {
36 36
37 int dummy = 0; // Dummy used in different functions to avoid warnings 37 int dummy = 0; // Dummy used in different functions to avoid warnings
38 38
39 void SubAPIManager::DisplayStatus() const { 39 void SubAPIManager::DisplayStatus() const {
40 TEST_LOG("Supported sub APIs:\n\n"); 40 TEST_LOG("Supported sub APIs:\n\n");
41 if (_base) 41 if (_base)
42 TEST_LOG(" Base\n"); 42 TEST_LOG(" Base\n");
43 if (_codec) 43 if (_codec)
44 TEST_LOG(" Codec\n"); 44 TEST_LOG(" Codec\n");
45 if (_dtmf)
46 TEST_LOG(" Dtmf\n");
47 if (_externalMedia) 45 if (_externalMedia)
48 TEST_LOG(" ExternalMedia\n"); 46 TEST_LOG(" ExternalMedia\n");
49 if (_file) 47 if (_file)
50 TEST_LOG(" File\n"); 48 TEST_LOG(" File\n");
51 if (_hardware) 49 if (_hardware)
52 TEST_LOG(" Hardware\n"); 50 TEST_LOG(" Hardware\n");
53 if (_netEqStats) 51 if (_netEqStats)
54 TEST_LOG(" NetEqStats\n"); 52 TEST_LOG(" NetEqStats\n");
55 if (_network) 53 if (_network)
56 TEST_LOG(" Network\n"); 54 TEST_LOG(" Network\n");
57 if (_rtp_rtcp) 55 if (_rtp_rtcp)
58 TEST_LOG(" RTP_RTCP\n"); 56 TEST_LOG(" RTP_RTCP\n");
59 if (_videoSync) 57 if (_videoSync)
60 TEST_LOG(" VideoSync\n"); 58 TEST_LOG(" VideoSync\n");
61 if (_volumeControl) 59 if (_volumeControl)
62 TEST_LOG(" VolumeControl\n"); 60 TEST_LOG(" VolumeControl\n");
63 if (_apm) 61 if (_apm)
64 TEST_LOG(" AudioProcessing\n"); 62 TEST_LOG(" AudioProcessing\n");
65 ANL(); 63 ANL();
66 TEST_LOG("Excluded sub APIs:\n\n"); 64 TEST_LOG("Excluded sub APIs:\n\n");
67 if (!_base) 65 if (!_base)
68 TEST_LOG(" Base\n"); 66 TEST_LOG(" Base\n");
69 if (!_codec) 67 if (!_codec)
70 TEST_LOG(" Codec\n"); 68 TEST_LOG(" Codec\n");
71 if (!_dtmf)
72 TEST_LOG(" Dtmf\n");
73 if (!_externalMedia) 69 if (!_externalMedia)
74 TEST_LOG(" ExternamMedia\n"); 70 TEST_LOG(" ExternamMedia\n");
75 if (!_file) 71 if (!_file)
76 TEST_LOG(" File\n"); 72 TEST_LOG(" File\n");
77 if (!_hardware) 73 if (!_hardware)
78 TEST_LOG(" Hardware\n"); 74 TEST_LOG(" Hardware\n");
79 if (!_netEqStats) 75 if (!_netEqStats)
80 TEST_LOG(" NetEqStats\n"); 76 TEST_LOG(" NetEqStats\n");
81 if (!_network) 77 if (!_network)
82 TEST_LOG(" Network\n"); 78 TEST_LOG(" Network\n");
83 if (!_rtp_rtcp) 79 if (!_rtp_rtcp)
84 TEST_LOG(" RTP_RTCP\n"); 80 TEST_LOG(" RTP_RTCP\n");
85 if (!_videoSync) 81 if (!_videoSync)
86 TEST_LOG(" VideoSync\n"); 82 TEST_LOG(" VideoSync\n");
87 if (!_volumeControl) 83 if (!_volumeControl)
88 TEST_LOG(" VolumeControl\n"); 84 TEST_LOG(" VolumeControl\n");
89 if (!_apm) 85 if (!_apm)
90 TEST_LOG(" AudioProcessing\n"); 86 TEST_LOG(" AudioProcessing\n");
91 ANL(); 87 ANL();
92 } 88 }
93 89
94 VoETestManager::VoETestManager() 90 VoETestManager::VoETestManager()
95 : initialized_(false), 91 : initialized_(false),
96 voice_engine_(NULL), 92 voice_engine_(NULL),
97 voe_base_(0), 93 voe_base_(0),
98 voe_codec_(0), 94 voe_codec_(0),
99 voe_dtmf_(0),
100 voe_xmedia_(0), 95 voe_xmedia_(0),
101 voe_file_(0), 96 voe_file_(0),
102 voe_hardware_(0), 97 voe_hardware_(0),
103 voe_network_(0), 98 voe_network_(0),
104 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 99 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
105 voe_neteq_stats_(NULL), 100 voe_neteq_stats_(NULL),
106 #endif 101 #endif
107 voe_rtp_rtcp_(0), 102 voe_rtp_rtcp_(0),
108 voe_vsync_(0), 103 voe_vsync_(0),
109 voe_volume_control_(0), 104 voe_volume_control_(0),
(...skipping 14 matching lines...) Expand all
124 } 119 }
125 120
126 return true; 121 return true;
127 } 122 }
128 123
129 void VoETestManager::GetInterfaces() { 124 void VoETestManager::GetInterfaces() {
130 if (voice_engine_) { 125 if (voice_engine_) {
131 voe_base_ = VoEBase::GetInterface(voice_engine_); 126 voe_base_ = VoEBase::GetInterface(voice_engine_);
132 voe_codec_ = VoECodec::GetInterface(voice_engine_); 127 voe_codec_ = VoECodec::GetInterface(voice_engine_);
133 voe_volume_control_ = VoEVolumeControl::GetInterface(voice_engine_); 128 voe_volume_control_ = VoEVolumeControl::GetInterface(voice_engine_);
134 voe_dtmf_ = VoEDtmf::GetInterface(voice_engine_);
135 voe_rtp_rtcp_ = VoERTP_RTCP::GetInterface(voice_engine_); 129 voe_rtp_rtcp_ = VoERTP_RTCP::GetInterface(voice_engine_);
136 voe_apm_ = VoEAudioProcessing::GetInterface(voice_engine_); 130 voe_apm_ = VoEAudioProcessing::GetInterface(voice_engine_);
137 voe_network_ = VoENetwork::GetInterface(voice_engine_); 131 voe_network_ = VoENetwork::GetInterface(voice_engine_);
138 voe_file_ = VoEFile::GetInterface(voice_engine_); 132 voe_file_ = VoEFile::GetInterface(voice_engine_);
139 #ifdef _TEST_VIDEO_SYNC_ 133 #ifdef _TEST_VIDEO_SYNC_
140 voe_vsync_ = VoEVideoSync::GetInterface(voice_engine_); 134 voe_vsync_ = VoEVideoSync::GetInterface(voice_engine_);
141 #endif 135 #endif
142 voe_hardware_ = VoEHardware::GetInterface(voice_engine_); 136 voe_hardware_ = VoEHardware::GetInterface(voice_engine_);
143 // Set the audio layer to use in all tests 137 // Set the audio layer to use in all tests
144 if (voe_hardware_) { 138 if (voe_hardware_) {
(...skipping 23 matching lines...) Expand all
168 voe_base_ = NULL; 162 voe_base_ = NULL;
169 } 163 }
170 if (voe_codec_) { 164 if (voe_codec_) {
171 voe_codec_->Release(); 165 voe_codec_->Release();
172 voe_codec_ = NULL; 166 voe_codec_ = NULL;
173 } 167 }
174 if (voe_volume_control_) { 168 if (voe_volume_control_) {
175 voe_volume_control_->Release(); 169 voe_volume_control_->Release();
176 voe_volume_control_ = NULL; 170 voe_volume_control_ = NULL;
177 } 171 }
178 if (voe_dtmf_) {
179 voe_dtmf_->Release();
180 voe_dtmf_ = NULL;
181 }
182 if (voe_rtp_rtcp_) { 172 if (voe_rtp_rtcp_) {
183 voe_rtp_rtcp_->Release(); 173 voe_rtp_rtcp_->Release();
184 voe_rtp_rtcp_ = NULL; 174 voe_rtp_rtcp_ = NULL;
185 } 175 }
186 if (voe_apm_) { 176 if (voe_apm_) {
187 voe_apm_->Release(); 177 voe_apm_->Release();
188 voe_apm_ = NULL; 178 voe_apm_ = NULL;
189 } 179 }
190 if (voe_network_) { 180 if (voe_network_) {
191 voe_network_->Release(); 181 voe_network_->Release();
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 google::AllowCommandLineReparsing(); 323 google::AllowCommandLineReparsing();
334 google::ParseCommandLineFlags(&argc, &argv, true); 324 google::ParseCommandLineFlags(&argc, &argv, true);
335 325
336 if (FLAGS_automated) { 326 if (FLAGS_automated) {
337 return RunInAutomatedMode(); 327 return RunInAutomatedMode();
338 } 328 }
339 329
340 return RunInManualMode(); 330 return RunInManualMode();
341 } 331 }
342 #endif //#if !defined(WEBRTC_IOS) 332 #endif //#if !defined(WEBRTC_IOS)
OLDNEW
« no previous file with comments | « webrtc/voice_engine/test/auto_test/voe_standard_test.h ('k') | webrtc/voice_engine/test/auto_test/voe_test_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698