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

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

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
11 #ifndef WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H 11 #ifndef WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
12 #define WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H 12 #define WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
13 13
14 #include <stdio.h> 14 #include <stdio.h>
15 #include <string> 15 #include <string>
16 16
17 #include "gflags/gflags.h" 17 #include "gflags/gflags.h"
18 #include "webrtc/voice_engine/include/voe_audio_processing.h" 18 #include "webrtc/voice_engine/include/voe_audio_processing.h"
19 #include "webrtc/voice_engine/include/voe_base.h" 19 #include "webrtc/voice_engine/include/voe_base.h"
20 #include "webrtc/voice_engine/include/voe_dtmf.h"
21 #include "webrtc/voice_engine/include/voe_errors.h" 20 #include "webrtc/voice_engine/include/voe_errors.h"
22 #include "webrtc/voice_engine/include/voe_file.h" 21 #include "webrtc/voice_engine/include/voe_file.h"
23 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 22 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
24 #include "webrtc/voice_engine/test/auto_test/resource_manager.h" 23 #include "webrtc/voice_engine/test/auto_test/resource_manager.h"
25 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" 24 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
26 #include "webrtc/voice_engine/test/auto_test/voe_test_interface.h" 25 #include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
27 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API 26 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
28 #include "webrtc/voice_engine/include/voe_codec.h" 27 #include "webrtc/voice_engine/include/voe_codec.h"
29 #endif 28 #endif
30 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 29 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
(...skipping 22 matching lines...) Expand all
53 52
54 DECLARE_bool(include_timing_dependent_tests); 53 DECLARE_bool(include_timing_dependent_tests);
55 54
56 namespace voetest { 55 namespace voetest {
57 56
58 class SubAPIManager { 57 class SubAPIManager {
59 public: 58 public:
60 SubAPIManager() 59 SubAPIManager()
61 : _base(true), 60 : _base(true),
62 _codec(false), 61 _codec(false),
63 _dtmf(false),
64 _externalMedia(false), 62 _externalMedia(false),
65 _file(false), 63 _file(false),
66 _hardware(false), 64 _hardware(false),
67 _netEqStats(false), 65 _netEqStats(false),
68 _network(false), 66 _network(false),
69 _rtp_rtcp(false), 67 _rtp_rtcp(false),
70 _videoSync(false), 68 _videoSync(false),
71 _volumeControl(false), 69 _volumeControl(false),
72 _apm(false) { 70 _apm(false) {
73 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API 71 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
74 _codec = true; 72 _codec = true;
75 #endif 73 #endif
76 #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
77 _dtmf = true;
78 #endif
79 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 74 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
80 _externalMedia = true; 75 _externalMedia = true;
81 #endif 76 #endif
82 #ifdef WEBRTC_VOICE_ENGINE_FILE_API 77 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
83 _file = true; 78 _file = true;
84 #endif 79 #endif
85 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API 80 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
86 _hardware = true; 81 _hardware = true;
87 #endif 82 #endif
88 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 83 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
(...skipping 10 matching lines...) Expand all
99 _volumeControl = true; 94 _volumeControl = true;
100 #endif 95 #endif
101 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API 96 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
102 _apm = true; 97 _apm = true;
103 #endif 98 #endif
104 } 99 }
105 100
106 void DisplayStatus() const; 101 void DisplayStatus() const;
107 102
108 private: 103 private:
109 bool _base, _codec, _dtmf; 104 bool _base, _codec;
110 bool _externalMedia, _file, _hardware; 105 bool _externalMedia, _file, _hardware;
111 bool _netEqStats, _network, _rtp_rtcp, _videoSync, _volumeControl, _apm; 106 bool _netEqStats, _network, _rtp_rtcp, _videoSync, _volumeControl, _apm;
112 }; 107 };
113 108
114 class VoETestManager { 109 class VoETestManager {
115 public: 110 public:
116 VoETestManager(); 111 VoETestManager();
117 ~VoETestManager(); 112 ~VoETestManager();
118 113
119 // Must be called after construction. 114 // Must be called after construction.
(...skipping 15 matching lines...) Expand all
135 } 130 }
136 VoEBase* BasePtr() const { 131 VoEBase* BasePtr() const {
137 return voe_base_; 132 return voe_base_;
138 } 133 }
139 VoECodec* CodecPtr() const { 134 VoECodec* CodecPtr() const {
140 return voe_codec_; 135 return voe_codec_;
141 } 136 }
142 VoEVolumeControl* VolumeControlPtr() const { 137 VoEVolumeControl* VolumeControlPtr() const {
143 return voe_volume_control_; 138 return voe_volume_control_;
144 } 139 }
145 VoEDtmf* DtmfPtr() const {
146 return voe_dtmf_;
147 }
148 VoERTP_RTCP* RTP_RTCPPtr() const { 140 VoERTP_RTCP* RTP_RTCPPtr() const {
149 return voe_rtp_rtcp_; 141 return voe_rtp_rtcp_;
150 } 142 }
151 VoEAudioProcessing* APMPtr() const { 143 VoEAudioProcessing* APMPtr() const {
152 return voe_apm_; 144 return voe_apm_;
153 } 145 }
154 146
155 VoENetwork* NetworkPtr() const { 147 VoENetwork* NetworkPtr() const {
156 return voe_network_; 148 return voe_network_;
157 } 149 }
(...skipping 19 matching lines...) Expand all
177 return voe_neteq_stats_; 169 return voe_neteq_stats_;
178 } 170 }
179 #endif 171 #endif
180 172
181 private: 173 private:
182 bool initialized_; 174 bool initialized_;
183 175
184 VoiceEngine* voice_engine_; 176 VoiceEngine* voice_engine_;
185 VoEBase* voe_base_; 177 VoEBase* voe_base_;
186 VoECodec* voe_codec_; 178 VoECodec* voe_codec_;
187 VoEDtmf* voe_dtmf_;
188 VoEExternalMedia* voe_xmedia_; 179 VoEExternalMedia* voe_xmedia_;
189 VoEFile* voe_file_; 180 VoEFile* voe_file_;
190 VoEHardware* voe_hardware_; 181 VoEHardware* voe_hardware_;
191 VoENetwork* voe_network_; 182 VoENetwork* voe_network_;
192 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 183 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
193 VoENetEqStats* voe_neteq_stats_; 184 VoENetEqStats* voe_neteq_stats_;
194 #endif 185 #endif
195 VoERTP_RTCP* voe_rtp_rtcp_; 186 VoERTP_RTCP* voe_rtp_rtcp_;
196 VoEVideoSync* voe_vsync_; 187 VoEVideoSync* voe_vsync_;
197 VoEVolumeControl* voe_volume_control_; 188 VoEVolumeControl* voe_volume_control_;
198 VoEAudioProcessing* voe_apm_; 189 VoEAudioProcessing* voe_apm_;
199 190
200 ResourceManager resource_manager_; 191 ResourceManager resource_manager_;
201 }; 192 };
202 193
203 } // namespace voetest 194 } // namespace voetest
204 195
205 #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H 196 #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc ('k') | webrtc/voice_engine/test/auto_test/voe_standard_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698