Remove ChannelManager::GetCapabilities()

BUG=webrtc:4690

Review URL: https://codereview.webrtc.org/1364083002

Cr-Commit-Position: refs/heads/master@{#10045}
This commit is contained in:
solenberg
2015-09-24 01:45:35 -07:00
committed by Commit bot
parent c675ddd830
commit 61e933eac7
8 changed files with 0 additions and 24 deletions

View File

@ -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;

View File

@ -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,

View File

@ -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;

View File

@ -112,7 +112,6 @@ class WebRtcVideoEngine2 {
// Basic video engine implementation.
void Init();
int GetCapabilities();
bool SetDefaultEncoderConfig(const VideoEncoderConfig& config);
WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,

View File

@ -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 =

View File

@ -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);

View File

@ -144,10 +144,6 @@ bool ChannelManager::SetVideoRtxEnabled(bool enable) {
}
}
int ChannelManager::GetCapabilities() {
return media_engine_->GetCapabilities();
}
void ChannelManager::GetSupportedAudioCodecs(
std::vector<AudioCodec>* codecs) const {
codecs->clear();

View File

@ -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<AudioCodec>* codecs) const;