WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/voice_engine/channel.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/format_macros.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common.h"
 #include "webrtc/config.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"

[ossu, 2016/05/03 16:13:22]

This one should go.

[ossu, 2016/05/11 11:22:32]

Not anymore!

 #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"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/modules/utility/include/process_thread.h"
@@ skipping 613 matching lines @@
     if (_outputFilePlayerPtr) {
       if (_outputFilePlayerPtr->Frequency() > highestNeeded) {
         highestNeeded = _outputFilePlayerPtr->Frequency();
       }
     }
   }
 
   return (highestNeeded);
 }
 
-int32_t Channel::CreateChannel(Channel*& channel,
-                               int32_t channelId,
-                               uint32_t instanceId,
-                               RtcEventLog* const event_log,
-                               const Config& config) {
+int32_t Channel::CreateChannel(
+    Channel*& channel,
+    int32_t channelId,
+    uint32_t instanceId,
+    RtcEventLog* const event_log,
+    const Config& config,
+    std::shared_ptr<AudioDecoderFactory> decoder_factory) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(instanceId, channelId),
                "Channel::CreateChannel(channelId=%d, instanceId=%d)", channelId,
                instanceId);
 
-  channel = new Channel(channelId, instanceId, event_log, config);
+  channel = new Channel(channelId, instanceId, event_log, config,
+                        std::move(decoder_factory));
   if (channel == NULL) {
     WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(instanceId, channelId),
                  "Channel::CreateChannel() unable to allocate memory for"
                  " channel");
     return -1;
   }
   return 0;
 }
 
 void Channel::PlayNotification(int32_t id, uint32_t durationMs) {
@@ skipping 39 matching lines @@
 
   _outputFileRecording = false;
   WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::RecordFileEnded() => output file recorder module is"
                " shutdown");
 }
 
 Channel::Channel(int32_t channelId,
                  uint32_t instanceId,
                  RtcEventLog* const event_log,
-                 const Config& config)
+                 const Config& config,
+                 std::shared_ptr<AudioDecoderFactory> decoder_factory)

[the sun, 2016/05/03 21:07:30]

I think I'd rather avoid this and instead add a setter function on Channel, to
allow setting the ADF from AudioReceiveStream, via ChannelProxy, by recreating
the ACM.

     : _instanceId(instanceId),
       _channelId(channelId),
       event_log_(event_log),
       rtp_header_parser_(RtpHeaderParser::Create()),
       rtp_payload_registry_(
           new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(true))),
       rtp_receive_statistics_(
           ReceiveStatistics::Create(Clock::GetRealTimeClock())),
       rtp_receiver_(
           RtpReceiver::CreateAudioReceiver(Clock::GetRealTimeClock(),
@@ skipping 67 matching lines @@
   AudioCodingModule::Config acm_config;
   acm_config.id = VoEModuleId(instanceId, channelId);
   if (config.Get<NetEqCapacityConfig>().enabled) {
     // Clamping the buffer capacity at 20 packets. While going lower will
     // probably work, it makes little sense.
     acm_config.neteq_config.max_packets_in_buffer =
         std::max(20, config.Get<NetEqCapacityConfig>().capacity);
   }
   acm_config.neteq_config.enable_fast_accelerate =
       config.Get<NetEqFastAccelerate>().enabled;
+  acm_config.decoder_factory = std::move(decoder_factory);
   audio_coding_.reset(AudioCodingModule::Create(acm_config));
 
   _outputAudioLevel.Clear();
 
   RtpRtcp::Configuration configuration;
   configuration.audio = true;
   configuration.outgoing_transport = this;
   configuration.receive_statistics = rtp_receive_statistics_.get();
   configuration.bandwidth_callback = rtcp_observer_.get();
   if (pacing_enabled_) {
@@ skipping 192 matching lines @@
     return -1;
   }
   if (rx_audioproc_->gain_control()->set_mode(kDefaultRxAgcMode) != 0) {
     LOG(LS_ERROR) << "gain_control()->set_mode(kDefaultRxAgcMode) failed.";
     return -1;
   }
 
   return 0;
 }
 
-int32_t Channel::SetEngineInformation(Statistics& engineStatistics,
-                                      OutputMixer& outputMixer,
-                                      voe::TransmitMixer& transmitMixer,
-                                      ProcessThread& moduleProcessThread,
-                                      AudioDeviceModule& audioDeviceModule,
-                                      VoiceEngineObserver* voiceEngineObserver,
-                                      rtc::CriticalSection* callbackCritSect) {
+int32_t Channel::SetEngineInformation(
+    Statistics& engineStatistics,
+    OutputMixer& outputMixer,
+    voe::TransmitMixer& transmitMixer,
+    ProcessThread& moduleProcessThread,
+    AudioDeviceModule& audioDeviceModule,
+    VoiceEngineObserver* voiceEngineObserver,
+    rtc::CriticalSection* callbackCritSect) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::SetEngineInformation()");
   _engineStatisticsPtr = &engineStatistics;
   _outputMixerPtr = &outputMixer;
   _transmitMixerPtr = &transmitMixer,
   _moduleProcessThreadPtr = &moduleProcessThread;
   _audioDeviceModulePtr = &audioDeviceModule;
   _voiceEngineObserverPtr = voiceEngineObserver;
   _callbackCritSectPtr = callbackCritSect;
   return 0;
@@ skipping 2503 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc