From 61e933eac7673feb2f8663c3e71e503b714b350f Mon Sep 17 00:00:00 2001 From: solenberg Date: Thu, 24 Sep 2015 01:45:35 -0700 Subject: [PATCH] Remove ChannelManager::GetCapabilities() BUG=webrtc:4690 Review URL: https://codereview.webrtc.org/1364083002 Cr-Commit-Position: refs/heads/master@{#10045} --- talk/media/base/fakemediaengine.h | 2 -- talk/media/base/mediaengine.h | 7 ------- talk/media/webrtc/webrtcvideoengine2.cc | 2 -- talk/media/webrtc/webrtcvideoengine2.h | 1 - talk/media/webrtc/webrtcvoiceengine.cc | 4 ---- talk/media/webrtc/webrtcvoiceengine.h | 1 - talk/session/media/channelmanager.cc | 4 ---- talk/session/media/channelmanager.h | 3 --- 8 files changed, 24 deletions(-) diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h index 18511dc9e8..49efe0fb52 100644 --- a/talk/media/base/fakemediaengine.h +++ b/talk/media/base/fakemediaengine.h @@ -778,7 +778,6 @@ class FakeVoiceEngine : public FakeBaseEngine { } bool Init(rtc::Thread* worker_thread) { return true; } void Terminate() {} - int GetCapabilities() { return AUDIO_SEND | AUDIO_RECV; } webrtc::VoiceEngine* GetVoE() { return nullptr; } AudioOptions GetOptions() const { return options_; @@ -861,7 +860,6 @@ class FakeVideoEngine : public FakeBaseEngine { options_changed_ = true; return true; } - int GetCapabilities() { return VIDEO_SEND | VIDEO_RECV; } bool SetDefaultEncoderConfig(const VideoEncoderConfig& config) { default_encoder_config_ = config; return true; diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h index 68536ed56f..d739804203 100644 --- a/talk/media/base/mediaengine.h +++ b/talk/media/base/mediaengine.h @@ -74,8 +74,6 @@ class MediaEngineInterface { virtual bool Init(rtc::Thread* worker_thread) = 0; // Shuts down the engine. virtual void Terminate() = 0; - // Returns what the engine is capable of, as a set of Capabilities, above. - virtual int GetCapabilities() = 0; // TODO(solenberg): Remove once VoE API refactoring is done. virtual webrtc::VoiceEngine* GetVoE() = 0; @@ -166,9 +164,6 @@ class CompositeMediaEngine : public MediaEngineInterface { voice_.Terminate(); } - virtual int GetCapabilities() { - return (voice_.GetCapabilities() | video_.GetCapabilities()); - } virtual webrtc::VoiceEngine* GetVoE() { return voice_.GetVoE(); } @@ -244,7 +239,6 @@ class NullVoiceEngine { public: bool Init(rtc::Thread* worker_thread) { return true; } void Terminate() {} - int GetCapabilities() { return 0; } // If you need this to return an actual channel, use FakeMediaEngine instead. VoiceMediaChannel* CreateChannel(const AudioOptions& options) { return nullptr; @@ -279,7 +273,6 @@ class NullVideoEngine { public: bool Init(rtc::Thread* worker_thread) { return true; } void Terminate() {} - int GetCapabilities() { return 0; } // If you need this to return an actual channel, use FakeMediaEngine instead. VideoMediaChannel* CreateChannel( const VideoOptions& options, diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 7cd5c0622e..dacab418b3 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -572,8 +572,6 @@ void WebRtcVideoEngine2::Init() { initialized_ = true; } -int WebRtcVideoEngine2::GetCapabilities() { return VIDEO_RECV | VIDEO_SEND; } - bool WebRtcVideoEngine2::SetDefaultEncoderConfig( const VideoEncoderConfig& config) { const VideoCodec& codec = config.max_codec; diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/talk/media/webrtc/webrtcvideoengine2.h index acd9a1bcea..f438aa0886 100644 --- a/talk/media/webrtc/webrtcvideoengine2.h +++ b/talk/media/webrtc/webrtcvideoengine2.h @@ -112,7 +112,6 @@ class WebRtcVideoEngine2 { // Basic video engine implementation. void Init(); - int GetCapabilities(); bool SetDefaultEncoderConfig(const VideoEncoderConfig& config); WebRtcVideoChannel2* CreateChannel(webrtc::Call* call, diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc index f4b5ab3f55..214059a2d5 100644 --- a/talk/media/webrtc/webrtcvoiceengine.cc +++ b/talk/media/webrtc/webrtcvoiceengine.cc @@ -563,10 +563,6 @@ void WebRtcVoiceEngine::Terminate() { voe_wrapper_->base()->Terminate(); } -int WebRtcVoiceEngine::GetCapabilities() { - return AUDIO_SEND | AUDIO_RECV; -} - VoiceMediaChannel* WebRtcVoiceEngine::CreateChannel(webrtc::Call* call, const AudioOptions& options) { WebRtcVoiceMediaChannel* ch = diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h index 19fefced0b..e8edfb1d90 100644 --- a/talk/media/webrtc/webrtcvoiceengine.h +++ b/talk/media/webrtc/webrtcvoiceengine.h @@ -70,7 +70,6 @@ class WebRtcVoiceEngine bool Init(rtc::Thread* worker_thread); void Terminate(); - int GetCapabilities(); webrtc::VoiceEngine* GetVoE() { return voe()->engine(); } VoiceMediaChannel* CreateChannel(webrtc::Call* call, const AudioOptions& options); diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc index 97978a6fbe..41819b7e1c 100644 --- a/talk/session/media/channelmanager.cc +++ b/talk/session/media/channelmanager.cc @@ -144,10 +144,6 @@ bool ChannelManager::SetVideoRtxEnabled(bool enable) { } } -int ChannelManager::GetCapabilities() { - return media_engine_->GetCapabilities(); -} - void ChannelManager::GetSupportedAudioCodecs( std::vector* codecs) const { codecs->clear(); diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h index cb4559c7b0..8545cdcb61 100644 --- a/talk/session/media/channelmanager.h +++ b/talk/session/media/channelmanager.h @@ -83,9 +83,6 @@ class ChannelManager : public rtc::MessageHandler, MediaEngineInterface* media_engine() { return media_engine_.get(); } - // Gets capabilities. Can be called prior to starting the media engine. - int GetCapabilities(); - // Retrieves the list of supported audio & video codec types. // Can be called before starting the media engine. void GetSupportedAudioCodecs(std::vector* codecs) const;