| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 37ddd162e56c0c062e7ab2ae08416128d8374fc7..46a51b6d96166740ed7f5b467c366ad68a5ffec8 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -814,7 +814,8 @@ Channel::Channel(int32_t channelId,
|
| pacing_enabled_(config.Get<VoicePacing>().enabled),
|
| feedback_observer_proxy_(new TransportFeedbackProxy()),
|
| seq_num_allocator_proxy_(new TransportSequenceNumberProxy()),
|
| - rtp_packet_sender_proxy_(new RtpPacketSenderProxy()) {
|
| + rtp_packet_sender_proxy_(new RtpPacketSenderProxy()),
|
| + decoder_factory_(decoder_factory) {
|
| WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId, _channelId),
|
| "Channel::Channel() - ctor");
|
| AudioCodingModule::Config acm_config;
|
| @@ -1070,6 +1071,10 @@ void Channel::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
|
| audio_sink_ = std::move(sink);
|
| }
|
|
|
| +const rtc::scoped_refptr<AudioDecoderFactory>&
|
| +Channel::GetAudioDecoderFactory() const {
|
| + return decoder_factory_;
|
| +}
|
| int32_t Channel::StartPlayout() {
|
| WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
|
| "Channel::StartPlayout()");
|
|
|