Moved CreateBuiltinDecoderFactory out to VoEBaseImpl.

webrtc/voice_engine/include/voe_base.h

Index: webrtc/voice_engine/include/voe_base.h
diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index 4001b945774892123a60f260300b301579f906d2..26e73f80595d212f98a4eed69b45ec298c1b2804 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -34,6 +34,10 @@
 #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 {
@@ -123,11 +127,14 @@ class WEBRTC_DLLEXPORT VoEBase {
   // 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;