| Index: webrtc/voice_engine/channel_manager.h
|
| diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
|
| index 77dfc454d882f0ecece0859c657331c3720bb1a8..2288781f018eb4fea83a63e6a138ac4315ad9480 100644
|
| --- a/webrtc/voice_engine/channel_manager.h
|
| +++ b/webrtc/voice_engine/channel_manager.h
|
| @@ -23,6 +23,7 @@
|
| namespace webrtc {
|
|
|
| class Config;
|
| +class AudioDecoderFactory;
|
|
|
| namespace voe {
|
|
|
| @@ -101,6 +102,11 @@ class ChannelManager {
|
| // CreateChannel(const Config& external_config) is called.
|
| ChannelOwner CreateChannel();
|
| ChannelOwner CreateChannel(const Config& external_config);
|
| + ChannelOwner CreateChannel(
|
| + std::shared_ptr<AudioDecoderFactory> decoder_factory);
|
| + ChannelOwner CreateChannel(
|
| + const Config& external_config,
|
| + std::shared_ptr<AudioDecoderFactory> decoder_factory);
|
|
|
| // ChannelOwner.channel() will be NULL if channel_id is invalid or no longer
|
| // exists. This should be checked with ChannelOwner::IsValid().
|
| @@ -117,7 +123,9 @@ class ChannelManager {
|
|
|
| private:
|
| // Create a channel given a configuration, |config|.
|
| - ChannelOwner CreateChannelInternal(const Config& config);
|
| + ChannelOwner CreateChannelInternal(
|
| + const Config& config,
|
| + std::shared_ptr<AudioDecoderFactory> decoder_factory);
|
|
|
| uint32_t instance_id_;
|
|
|
|
|