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

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

Issue 2672583002: Remove VoEVideoSync interface. (Closed)
Patch Set: rebase Created 3 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_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/test/testsupport/fileutils.h" 18 #include "webrtc/test/testsupport/fileutils.h"
19 #include "webrtc/voice_engine/include/voe_audio_processing.h" 19 #include "webrtc/voice_engine/include/voe_audio_processing.h"
20 #include "webrtc/voice_engine/include/voe_base.h" 20 #include "webrtc/voice_engine/include/voe_base.h"
21 #include "webrtc/voice_engine/include/voe_errors.h" 21 #include "webrtc/voice_engine/include/voe_errors.h"
22 #include "webrtc/voice_engine/include/voe_file.h" 22 #include "webrtc/voice_engine/include/voe_file.h"
23 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 23 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
24 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" 24 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
25 #include "webrtc/voice_engine/test/auto_test/voe_test_interface.h" 25 #include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
26 #include "webrtc/voice_engine/include/voe_codec.h" 26 #include "webrtc/voice_engine/include/voe_codec.h"
27 #include "webrtc/voice_engine/include/voe_external_media.h" 27 #include "webrtc/voice_engine/include/voe_external_media.h"
28 #include "webrtc/voice_engine/include/voe_hardware.h" 28 #include "webrtc/voice_engine/include/voe_hardware.h"
29 #include "webrtc/voice_engine/include/voe_network.h" 29 #include "webrtc/voice_engine/include/voe_network.h"
30 #include "webrtc/voice_engine/include/voe_video_sync.h"
31 #include "webrtc/voice_engine/include/voe_volume_control.h" 30 #include "webrtc/voice_engine/include/voe_volume_control.h"
32 31
33 namespace webrtc { 32 namespace webrtc {
34 class VoENetEqStats; 33 class VoENetEqStats;
35 } 34 }
36 35
37 #if defined(WEBRTC_ANDROID) 36 #if defined(WEBRTC_ANDROID)
38 extern char mobileLogMsg[640]; 37 extern char mobileLogMsg[640];
39 #endif 38 #endif
40 39
41 DECLARE_bool(include_timing_dependent_tests); 40 DECLARE_bool(include_timing_dependent_tests);
42 41
43 namespace voetest { 42 namespace voetest {
44 43
45 class SubAPIManager { 44 class SubAPIManager {
46 public: 45 public:
47 SubAPIManager() 46 SubAPIManager()
48 : _base(true), 47 : _base(true),
49 _codec(false), 48 _codec(false),
50 _externalMedia(false), 49 _externalMedia(false),
51 _file(false), 50 _file(false),
52 _hardware(false), 51 _hardware(false),
53 _netEqStats(false), 52 _netEqStats(false),
54 _network(false), 53 _network(false),
55 _rtp_rtcp(false), 54 _rtp_rtcp(false),
56 _videoSync(false),
57 _volumeControl(false), 55 _volumeControl(false),
58 _apm(false) { 56 _apm(false) {
59 _codec = true; 57 _codec = true;
60 _externalMedia = true; 58 _externalMedia = true;
61 _file = true; 59 _file = true;
62 _hardware = true; 60 _hardware = true;
63 _netEqStats = true; 61 _netEqStats = true;
64 _network = true; 62 _network = true;
65 _rtp_rtcp = true; 63 _rtp_rtcp = true;
66 _videoSync = true;
67 _volumeControl = true; 64 _volumeControl = true;
68 _apm = true; 65 _apm = true;
69 } 66 }
70 67
71 void DisplayStatus() const; 68 void DisplayStatus() const;
72 69
73 private: 70 private:
74 bool _base, _codec; 71 bool _base, _codec;
75 bool _externalMedia, _file, _hardware; 72 bool _externalMedia, _file, _hardware;
76 bool _netEqStats, _network, _rtp_rtcp, _videoSync, _volumeControl, _apm; 73 bool _netEqStats, _network, _rtp_rtcp, _volumeControl, _apm;
77 }; 74 };
78 75
79 class VoETestManager { 76 class VoETestManager {
80 public: 77 public:
81 VoETestManager(); 78 VoETestManager();
82 ~VoETestManager(); 79 ~VoETestManager();
83 80
84 // Must be called after construction. 81 // Must be called after construction.
85 bool Init(); 82 bool Init();
86 83
(...skipping 30 matching lines...) Expand all
117 } 114 }
118 115
119 VoEFile* FilePtr() const { 116 VoEFile* FilePtr() const {
120 return voe_file_; 117 return voe_file_;
121 } 118 }
122 119
123 VoEHardware* HardwarePtr() const { 120 VoEHardware* HardwarePtr() const {
124 return voe_hardware_; 121 return voe_hardware_;
125 } 122 }
126 123
127 VoEVideoSync* VideoSyncPtr() const {
128 return voe_vsync_;
129 }
130
131 VoEExternalMedia* ExternalMediaPtr() const { 124 VoEExternalMedia* ExternalMediaPtr() const {
132 return voe_xmedia_; 125 return voe_xmedia_;
133 } 126 }
134 127
135 VoENetEqStats* NetEqStatsPtr() const { 128 VoENetEqStats* NetEqStatsPtr() const {
136 return voe_neteq_stats_; 129 return voe_neteq_stats_;
137 } 130 }
138 131
139 private: 132 private:
140 bool initialized_; 133 bool initialized_;
141 134
142 VoiceEngine* voice_engine_; 135 VoiceEngine* voice_engine_;
143 VoEBase* voe_base_; 136 VoEBase* voe_base_;
144 VoECodec* voe_codec_; 137 VoECodec* voe_codec_;
145 VoEExternalMedia* voe_xmedia_; 138 VoEExternalMedia* voe_xmedia_;
146 VoEFile* voe_file_; 139 VoEFile* voe_file_;
147 VoEHardware* voe_hardware_; 140 VoEHardware* voe_hardware_;
148 VoENetwork* voe_network_; 141 VoENetwork* voe_network_;
149 VoENetEqStats* voe_neteq_stats_; 142 VoENetEqStats* voe_neteq_stats_;
150 VoERTP_RTCP* voe_rtp_rtcp_; 143 VoERTP_RTCP* voe_rtp_rtcp_;
151 VoEVideoSync* voe_vsync_;
152 VoEVolumeControl* voe_volume_control_; 144 VoEVolumeControl* voe_volume_control_;
153 VoEAudioProcessing* voe_apm_; 145 VoEAudioProcessing* voe_apm_;
154 }; 146 };
155 147
156 } // namespace voetest 148 } // namespace voetest
157 149
158 #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H 150 #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698