| Index: webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.h b/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| index 6801877c76223fdef6b6656d6984c6af4573381c..ca2780d3c624c958a161913cf839665abcdb9c00 100644
|
| --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| @@ -16,23 +16,7 @@
|
|
|
| #include "gflags/gflags.h"
|
| #include "webrtc/test/testsupport/fileutils.h"
|
| -#include "webrtc/voice_engine/include/voe_audio_processing.h"
|
| -#include "webrtc/voice_engine/include/voe_base.h"
|
| -#include "webrtc/voice_engine/include/voe_errors.h"
|
| -#include "webrtc/voice_engine/include/voe_file.h"
|
| -#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
| #include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
|
| -#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
|
| -#include "webrtc/voice_engine/include/voe_codec.h"
|
| -#include "webrtc/voice_engine/include/voe_external_media.h"
|
| -#include "webrtc/voice_engine/include/voe_hardware.h"
|
| -#include "webrtc/voice_engine/include/voe_network.h"
|
| -#include "webrtc/voice_engine/include/voe_video_sync.h"
|
| -#include "webrtc/voice_engine/include/voe_volume_control.h"
|
| -
|
| -namespace webrtc {
|
| -class VoENetEqStats;
|
| -}
|
|
|
| #if defined(WEBRTC_ANDROID)
|
| extern char mobileLogMsg[640];
|
| @@ -76,83 +60,6 @@ class SubAPIManager {
|
| bool _netEqStats, _network, _rtp_rtcp, _videoSync, _volumeControl, _apm;
|
| };
|
|
|
| -class VoETestManager {
|
| - public:
|
| - VoETestManager();
|
| - ~VoETestManager();
|
| -
|
| - // Must be called after construction.
|
| - bool Init();
|
| -
|
| - void GetInterfaces();
|
| - int ReleaseInterfaces();
|
| -
|
| - const char* AudioFilename() const {
|
| - const std::string& result =
|
| - webrtc::test::ResourcePath("voice_engine/audio_long16", "pcm");
|
| - return result.c_str();
|
| - }
|
| -
|
| - VoiceEngine* VoiceEnginePtr() const {
|
| - return voice_engine_;
|
| - }
|
| - VoEBase* BasePtr() const {
|
| - return voe_base_;
|
| - }
|
| - VoECodec* CodecPtr() const {
|
| - return voe_codec_;
|
| - }
|
| - VoEVolumeControl* VolumeControlPtr() const {
|
| - return voe_volume_control_;
|
| - }
|
| - VoERTP_RTCP* RTP_RTCPPtr() const {
|
| - return voe_rtp_rtcp_;
|
| - }
|
| - VoEAudioProcessing* APMPtr() const {
|
| - return voe_apm_;
|
| - }
|
| -
|
| - VoENetwork* NetworkPtr() const {
|
| - return voe_network_;
|
| - }
|
| -
|
| - VoEFile* FilePtr() const {
|
| - return voe_file_;
|
| - }
|
| -
|
| - VoEHardware* HardwarePtr() const {
|
| - return voe_hardware_;
|
| - }
|
| -
|
| - VoEVideoSync* VideoSyncPtr() const {
|
| - return voe_vsync_;
|
| - }
|
| -
|
| - VoEExternalMedia* ExternalMediaPtr() const {
|
| - return voe_xmedia_;
|
| - }
|
| -
|
| - VoENetEqStats* NetEqStatsPtr() const {
|
| - return voe_neteq_stats_;
|
| - }
|
| -
|
| - private:
|
| - bool initialized_;
|
| -
|
| - VoiceEngine* voice_engine_;
|
| - VoEBase* voe_base_;
|
| - VoECodec* voe_codec_;
|
| - VoEExternalMedia* voe_xmedia_;
|
| - VoEFile* voe_file_;
|
| - VoEHardware* voe_hardware_;
|
| - VoENetwork* voe_network_;
|
| - VoENetEqStats* voe_neteq_stats_;
|
| - VoERTP_RTCP* voe_rtp_rtcp_;
|
| - VoEVideoSync* voe_vsync_;
|
| - VoEVolumeControl* voe_volume_control_;
|
| - VoEAudioProcessing* voe_apm_;
|
| -};
|
| -
|
| } // namespace voetest
|
|
|
| #endif // WEBRTC_VOICE_ENGINE_VOE_STANDARD_TEST_H
|
|
|