diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index 73955650e6..1957d21194 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -23,7 +23,6 @@ #include "webrtc/call/rtc_event_log.h" #include "webrtc/common.h" #include "webrtc/config.h" -#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/include/module_common_types.h" @@ -752,14 +751,6 @@ int32_t Channel::NeededFrequency(int32_t id) const { return (highestNeeded); } -int32_t Channel::CreateChannel(Channel*& channel, - int32_t channelId, - uint32_t instanceId, - const Config& config) { - return CreateChannel(channel, channelId, instanceId, config, - CreateBuiltinAudioDecoderFactory()); -} - int32_t Channel::CreateChannel( Channel*& channel, int32_t channelId, diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h index 9c0e39df4f..6fc4f34040 100644 --- a/webrtc/voice_engine/channel.h +++ b/webrtc/voice_engine/channel.h @@ -171,10 +171,6 @@ class Channel enum { KNumSocketThreads = 1 }; enum { KNumberOfSocketBuffers = 8 }; virtual ~Channel(); - static int32_t CreateChannel(Channel*& channel, - int32_t channelId, - uint32_t instanceId, - const Config& config); static int32_t CreateChannel( Channel*& channel, int32_t channelId, diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc index 5f20b2ed16..bcc22b05f4 100644 --- a/webrtc/voice_engine/channel_manager.cc +++ b/webrtc/voice_engine/channel_manager.cc @@ -11,7 +11,6 @@ #include "webrtc/voice_engine/channel_manager.h" #include "webrtc/common.h" -#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/voice_engine/channel.h" namespace webrtc { @@ -49,14 +48,6 @@ ChannelOwner::ChannelRef::ChannelRef(class Channel* channel) ChannelManager::ChannelManager(uint32_t instance_id, const Config& config) : instance_id_(instance_id), last_channel_id_(-1), config_(config) {} -ChannelOwner ChannelManager::CreateChannel() { - return CreateChannel(CreateBuiltinAudioDecoderFactory()); -} - -ChannelOwner ChannelManager::CreateChannel(const Config& external_config) { - return CreateChannel(external_config, CreateBuiltinAudioDecoderFactory()); -} - ChannelOwner ChannelManager::CreateChannel( const rtc::scoped_refptr& decoder_factory) { return CreateChannelInternal(config_, decoder_factory); diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h index c59ee5dc97..adc9d901f1 100644 --- a/webrtc/voice_engine/channel_manager.h +++ b/webrtc/voice_engine/channel_manager.h @@ -97,11 +97,9 @@ class ChannelManager { // CreateChannel will always return a valid ChannelOwner instance. The channel // is created either based on internal configuration, i.e. |config_|, by - // calling CreateChannel(), or using and external configuration + // calling CreateChannel(...), or using and external configuration // |external_config| if the overloaded method - // CreateChannel(const Config& external_config) is called. - ChannelOwner CreateChannel(); - ChannelOwner CreateChannel(const Config& external_config); + // CreateChannel(const Config& external_config, ...) is called. ChannelOwner CreateChannel( const rtc::scoped_refptr& decoder_factory); ChannelOwner CreateChannel(