From 1a5cf6eab114462fb1111691293e5331ffe23e50 Mon Sep 17 00:00:00 2001 From: Fredrik Solenberg Date: Fri, 4 Dec 2015 10:41:07 +0100 Subject: [PATCH] Remove the unused NullMediaEngine (and NullVoiceEngine+NullVideoEngine). BUG= R=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1494693003 . Cr-Commit-Position: refs/heads/master@{#10889} --- talk/media/base/mediaengine.h | 62 ----------------------------------- 1 file changed, 62 deletions(-) diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h index 3a6238a8d5..d39f2b45e6 100644 --- a/talk/media/base/mediaengine.h +++ b/talk/media/base/mediaengine.h @@ -231,68 +231,6 @@ class CompositeMediaEngine : public MediaEngineInterface { VIDEO video_; }; -// NullVoiceEngine can be used with CompositeMediaEngine in the case where only -// a video engine is desired. -class NullVoiceEngine { - public: - bool Init(rtc::Thread* worker_thread) { return true; } - void Terminate() {} - // If you need this to return an actual channel, use FakeMediaEngine instead. - VoiceMediaChannel* CreateChannel(const AudioOptions& options) { - return nullptr; - } - AudioOptions GetOptions() const { return AudioOptions(); } - bool SetOptions(const AudioOptions& options) { return true; } - bool SetDevices(const Device* in_device, const Device* out_device) { - return true; - } - bool GetOutputVolume(int* level) { - *level = 0; - return true; - } - bool SetOutputVolume(int level) { return true; } - int GetInputLevel() { return 0; } - const std::vector& codecs() { return codecs_; } - const std::vector& rtp_header_extensions() { - return rtp_header_extensions_; - } - bool StartAecDump(rtc::PlatformFile file) { return false; } - bool StartRtcEventLog(rtc::PlatformFile file) { return false; } - void StopRtcEventLog() {} - - private: - std::vector codecs_; - std::vector rtp_header_extensions_; -}; - -// NullVideoEngine can be used with CompositeMediaEngine in the case where only -// a voice engine is desired. -class NullVideoEngine { - public: - bool Init(rtc::Thread* worker_thread) { return true; } - void Terminate() {} - // If you need this to return an actual channel, use FakeMediaEngine instead. - VideoMediaChannel* CreateChannel( - const VideoOptions& options, - VoiceMediaChannel* voice_media_channel) { - return NULL; - } - bool SetOptions(const VideoOptions& options) { return true; } - bool SetDefaultEncoderConfig(const VideoEncoderConfig& config) { - return true; - } - const std::vector& codecs() { return codecs_; } - const std::vector& rtp_header_extensions() { - return rtp_header_extensions_; - } - - private: - std::vector codecs_; - std::vector rtp_header_extensions_; -}; - -typedef CompositeMediaEngine NullMediaEngine; - enum DataChannelType { DCT_NONE = 0, DCT_RTP = 1,