| Index: webrtc/media/engine/webrtcvideocapturer.cc
|
| diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc
|
| index ba44b1324eaa4472bc0caa7cb5996d16d1463620..7fe47d92eb3817edd2cefb53b2629e49b4f04471 100644
|
| --- a/webrtc/media/engine/webrtcvideocapturer.cc
|
| +++ b/webrtc/media/engine/webrtcvideocapturer.cc
|
| @@ -19,7 +19,6 @@
|
| #include "webrtc/base/thread.h"
|
| #include "webrtc/base/timeutils.h"
|
| #include "webrtc/media/engine/webrtcvideoframe.h"
|
| -#include "webrtc/media/engine/webrtcvideoframefactory.h"
|
|
|
| #include "webrtc/base/win32.h" // Need this to #include the impl files.
|
| #include "webrtc/modules/video_capture/video_capture_factory.h"
|
| @@ -113,18 +112,14 @@ WebRtcVideoCapturer::WebRtcVideoCapturer()
|
| module_(nullptr),
|
| captured_frames_(0),
|
| start_thread_(nullptr),
|
| - async_invoker_(nullptr) {
|
| - set_frame_factory(new WebRtcVideoFrameFactory());
|
| -}
|
| + async_invoker_(nullptr) {}
|
|
|
| WebRtcVideoCapturer::WebRtcVideoCapturer(WebRtcVcmFactoryInterface* factory)
|
| : factory_(factory),
|
| module_(nullptr),
|
| captured_frames_(0),
|
| start_thread_(nullptr),
|
| - async_invoker_(nullptr) {
|
| - set_frame_factory(new WebRtcVideoFrameFactory());
|
| -}
|
| + async_invoker_(nullptr) {}
|
|
|
| WebRtcVideoCapturer::~WebRtcVideoCapturer() {}
|
|
|
| @@ -360,7 +355,7 @@ void WebRtcVideoCapturer::OnIncomingCapturedFrame(
|
|
|
| OnFrame(cricket::WebRtcVideoFrame(
|
| sample.video_frame_buffer(), sample.rotation(),
|
| - sample.render_time_ms() * rtc::kNumMicrosecsPerMillisec, 0),
|
| + sample.render_time_ms() * rtc::kNumMicrosecsPerMillisec),
|
| sample.width(), sample.height());
|
| }
|
|
|
|
|