admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

voice_engine: Removed old variants of Channel constructor and CreateChannel

Browse Source 
These are no longer used internally and their interface is not to be
considered public. They were due to be changed in
https://codereview.webrtc.org/1993783002/ but remained due to a
misunderstanding.

Review-Url: https://codereview.webrtc.org/2082483003
Cr-Commit-Position: refs/heads/master@{#13816}
This commit is contained in:
ossu 2016-08-18 04:22:56 -07:00 committed by Commit bot
parent 38d840c35a
commit e1f5b4a7fe
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/voice_engine/channel.cc
View File

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

4
webrtc/voice_engine/channel.h
View File

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

9
webrtc/voice_engine/channel_manager.cc
View File

@ -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<AudioDecoderFactory>& decoder_factory) {
return CreateChannelInternal(config_, decoder_factory);

6
webrtc/voice_engine/channel_manager.h
View File

@ -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<AudioDecoderFactory>& decoder_factory);
ChannelOwner CreateChannel(