WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/voice_engine/voe_base_impl.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/voe_base_impl.h"
 
 #include "webrtc/base/format_macros.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/common.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_device/audio_device_impl.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/output_mixer.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/utility.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
@@ skipping 178 matching lines @@
   // Deregister the observer in all active channels
   for (voe::ChannelManager::Iterator it(&shared_->channel_manager());
        it.IsValid(); it.Increment()) {
     it.GetChannel()->DeRegisterVoiceEngineObserver();
   }
 
   return 0;
 }
 
 int VoEBaseImpl::Init(AudioDeviceModule* external_adm,
-                      AudioProcessing* audioproc) {
+                      AudioProcessing* audioproc,
+                      std::shared_ptr<AudioDecoderFactory> decoder_factory) {
   rtc::CritScope cs(shared_->crit_sec());
   WebRtcSpl_Init();
   if (shared_->statistics().Initialized()) {
     return 0;
   }
   if (shared_->process_thread()) {
     shared_->process_thread()->Start();
   }
 
   // Create an internal ADM if the user has not added an external
@@ skipping 142 matching lines @@
   bool agc_enabled =
       agc->mode() == GainControl::kAdaptiveAnalog && agc->is_enabled();
   if (shared_->audio_device()->SetAGC(agc_enabled) != 0) {
     LOG_F(LS_ERROR) << "Failed to set agc to enabled: " << agc_enabled;
     shared_->SetLastError(VE_AUDIO_DEVICE_MODULE_ERROR);
     // TODO(ajm): No error return here due to
     // https://code.google.com/p/webrtc/issues/detail?id=1464
   }
 #endif
 
+  if (decoder_factory)
+    decoder_factory_ = std::move(decoder_factory);
+  else
+    decoder_factory_ = CreateBuiltinAudioDecoderFactory();

[kwiberg-webrtc, 2016/05/17 13:33:48]

?:

[ossu, 2016/05/17 14:25:35]

That is... punctuation!
If it's a question, my answer is that if the voice-engine is default Init'ed (I
believe in some test, maybe?), it should still behave as previously, i.e. with
the builtin set of codecs.

Eventually we'll want to get away from that, since we don't want VoiceEngine to
depend on our builtin codecs module.

[kwiberg-webrtc, 2016/05/18 03:06:35]

Oh, nothing so subtle! I was jus suggesting

  decoder_factory_ = decoder_factory ? std::move(decoder_factory)
                                     : CreateBuiltinAudioDecoderFactory();

+
   return shared_->statistics().SetInitialized();
 }
 
 int VoEBaseImpl::Terminate() {
   rtc::CritScope cs(shared_->crit_sec());
   return TerminateInternal();
 }
 
 int VoEBaseImpl::CreateChannel() {
   rtc::CritScope cs(shared_->crit_sec());
   if (!shared_->statistics().Initialized()) {
     shared_->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
 
-  voe::ChannelOwner channel_owner = shared_->channel_manager().CreateChannel();
+  voe::ChannelOwner channel_owner =
+      shared_->channel_manager().CreateChannel(decoder_factory_);
   return InitializeChannel(&channel_owner);
 }
 
 int VoEBaseImpl::CreateChannel(const Config& config) {
   rtc::CritScope cs(shared_->crit_sec());
   if (!shared_->statistics().Initialized()) {
     shared_->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   voe::ChannelOwner channel_owner =
-      shared_->channel_manager().CreateChannel(config);
+      shared_->channel_manager().CreateChannel(config, decoder_factory_);
   return InitializeChannel(&channel_owner);
 }
 
 int VoEBaseImpl::InitializeChannel(voe::ChannelOwner* channel_owner) {
   if (channel_owner->channel()->SetEngineInformation(
           shared_->statistics(), *shared_->output_mixer(),
           *shared_->transmit_mixer(), *shared_->process_thread(),
           *shared_->audio_device(), voiceEngineObserverPtr_,
           &callbackCritSect_) != 0) {
     shared_->SetLastError(
@@ skipping 401 matching lines @@
     shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
         "AssociateSendChannel() failed to locate accociate_send_channel");
     return -1;
   }
 
   channel_ptr->set_associate_send_channel(ch);
   return 0;
 }
 
 }  // namespace webrtc