| Index: webrtc/media/base/mediaengine.h
|
| diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
|
| index 8e31c7cbb80839f250b823d1d63071d6541547b1..bd1ce431ec7e75aba2d1b39b9644d9b0c7eb2553 100644
|
| --- a/webrtc/media/base/mediaengine.h
|
| +++ b/webrtc/media/base/mediaengine.h
|
| @@ -27,6 +27,7 @@
|
| #include "webrtc/media/base/mediacommon.h"
|
| #include "webrtc/media/base/videocapturer.h"
|
| #include "webrtc/media/base/videocommon.h"
|
| +#include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
|
|
|
| #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
|
| #define DISABLE_MEDIA_ENGINE_FACTORY
|
| @@ -127,7 +128,11 @@ class MediaEngineFactory {
|
| template<class VOICE, class VIDEO>
|
| class CompositeMediaEngine : public MediaEngineInterface {
|
| public:
|
| - explicit CompositeMediaEngine(webrtc::AudioDeviceModule* adm) : voice_(adm) {}
|
| + CompositeMediaEngine(
|
| + webrtc::AudioDeviceModule* adm,
|
| + const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
|
| + audio_decoder_factory)
|
| + : voice_(adm, audio_decoder_factory) {}
|
| virtual ~CompositeMediaEngine() {}
|
| virtual bool Init() {
|
| video_.Init();
|
|
|