Moved CreateBuiltinDecoderFactory out to VoEBaseImpl.

webrtc/voice_engine/include/voe_base.h

 /*
  *  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.
  */
 
@@ skipping 16 matching lines @@
 //  base->StartPlayout(ch);
 //  ...
 //  base->DeleteChannel(ch);
 //  base->Terminate();
 //  base->Release();
 //  VoiceEngine::Delete(voe);
 //
 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_H
 
+#include <memory>

[ossu, 2016/05/18 16:12:27]

This one isn't necessary.

[kwiberg-webrtc, 2016/05/25 09:19:16]

Acknowledged.

+
+#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
 #include "webrtc/common_types.h"
 
 namespace webrtc {
 
 class AudioDeviceModule;
 class AudioProcessing;
 class AudioTransport;
 class Config;
 
 const int kVoEDefault = -1;
@@ skipping 69 matching lines @@
   virtual int DeRegisterVoiceEngineObserver() = 0;
 
   // Initializes all common parts of the VoiceEngine; e.g. all
   // encoders/decoders, the sound card and core receiving components.
   // This method also makes it possible to install some user-defined external
   // modules:
   // - The Audio Device Module (ADM) which implements all the audio layer
   // functionality in a separate (reference counted) module.
   // - The AudioProcessing module handles capture-side processing. VoiceEngine
   // takes ownership of this object.
+  // - An AudioDecoderFactory - used to create audio decoders.
   // If NULL is passed for any of these, VoiceEngine will create its own.
   // Returns -1 in case of an error, 0 otherwise.
   // TODO(ajm): Remove default NULLs.
   virtual int Init(AudioDeviceModule* external_adm = NULL,
-                   AudioProcessing* audioproc = NULL) = 0;
+                   AudioProcessing* audioproc = NULL,
+                   const rtc::scoped_refptr<AudioDecoderFactory>&
+                       decoder_factory = nullptr) = 0;

[kwiberg-webrtc, 2016/05/25 09:19:16]

Not your fault, but ew! Default values for arguments in a virtual function!

[ossu, 2016/05/26 12:09:53]

Yeah. :/
Fortunately, they're all "no-value" defaults (i.e. nullptr), rather than some
cleverly thought-out value that some subclass might override or need to copy
exactly.

 
   // Returns NULL before Init() is called.
   virtual AudioProcessing* audio_processing() = 0;
 
   // This method is WIP - DO NOT USE!
   // Returns NULL before Init() is called.
   virtual AudioDeviceModule* audio_device_module() = 0;
 
   // Terminates all VoiceEngine functions and releases allocated resources.
   // Returns 0.
@@ skipping 49 matching lines @@
   virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0;
 
  protected:
   VoEBase() {}
   virtual ~VoEBase() {}
 };
 
 }  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_BASE_H