Index: talk/app/webrtc/objc/RTCPeerConnectionFactory.mm |
diff --git a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm |
index 50ea47dc6482843fa5d613b4f41bbeaf35da158f..adb9db6c5cc2bb2bd893e23cd6752f70b9f8dfb3 100644 |
--- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm |
+++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm |
@@ -51,10 +51,11 @@ |
#include "talk/app/webrtc/peerconnectioninterface.h" |
#include "talk/app/webrtc/videosourceinterface.h" |
#include "talk/app/webrtc/videotrack.h" |
+#include "talk/app/webrtc/objc/h264decoderfactory.h" |
+#include "talk/app/webrtc/objc/h264encoderfactory.h" |
#include "webrtc/base/logging.h" |
#include "webrtc/base/ssladapter.h" |
- |
@implementation RTCPeerConnectionFactory { |
rtc::scoped_ptr<rtc::Thread> _signalingThread; |
rtc::scoped_ptr<rtc::Thread> _workerThread; |
@@ -80,8 +81,16 @@ |
_workerThread.reset(new rtc::Thread()); |
result = _workerThread->Start(); |
NSAssert(result, @"Failed to start worker thread."); |
+ |
+ rtc::scoped_ptr<webrtc::H264EncoderFactory> encoderFactory; |
+ rtc::scoped_ptr<webrtc::H264DecoderFactory> decoderFactory; |
+#if defined(WEBRTC_OBJC_H264) |
+ encoderFactory.reset(new webrtc::H264EncoderFactory()); |
+ decoderFactory.reset(new webrtc::H264DecoderFactory()); |
+#endif |
_nativeFactory = webrtc::CreatePeerConnectionFactory( |
- _signalingThread.get(), _workerThread.get(), NULL, NULL, NULL); |
+ _signalingThread.get(), _workerThread.get(), nullptr, |
+ encoderFactory.release(), decoderFactory.release()); |
NSAssert(_nativeFactory, @"Failed to initialize PeerConnectionFactory!"); |
// Uncomment to get sensitive logs emitted (to stderr or logcat). |
// rtc::LogMessage::LogToDebug(rtc::LS_SENSITIVE); |