| Index: webrtc/media/base/fakevideocapturer.h
|
| diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h
|
| index 026bf80a7b15f0f83f94bf66a9fe52eb23bc7cd5..c46375fa972a49d2b46b5973c5380d7be4bc6c24 100644
|
| --- a/webrtc/media/base/fakevideocapturer.h
|
| +++ b/webrtc/media/base/fakevideocapturer.h
|
| @@ -20,9 +20,6 @@
|
| #include "webrtc/media/base/videocapturer.h"
|
| #include "webrtc/media/base/videocommon.h"
|
| #include "webrtc/media/base/videoframe.h"
|
| -#ifdef HAVE_WEBRTC_VIDEO
|
| -#include "webrtc/media/engine/webrtcvideoframefactory.h"
|
| -#endif
|
|
|
| namespace cricket {
|
|
|
| @@ -35,9 +32,6 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| next_timestamp_(rtc::kNumNanosecsPerMillisec),
|
| is_screencast_(is_screencast),
|
| rotation_(webrtc::kVideoRotation_0) {
|
| -#ifdef HAVE_WEBRTC_VIDEO
|
| - set_frame_factory(new cricket::WebRtcVideoFrameFactory());
|
| -#endif
|
| // Default supported formats. Use ResetSupportedFormats to over write.
|
| std::vector<cricket::VideoFormat> formats;
|
| formats.push_back(cricket::VideoFormat(1280, 720,
|
| @@ -93,7 +87,8 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| if (size == 0u) {
|
| return false; // Width and/or Height were zero.
|
| }
|
| -
|
| +#if 0
|
| + // TODO(nisse): Create a cricket::VideoFrame and call OnFrame.
|
| cricket::CapturedFrame frame;
|
| frame.width = width;
|
| frame.height = height;
|
| @@ -114,11 +109,11 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| // TODO(zhurunz): SignalFrameCaptured carry returned value to be able to
|
| // capture results from downstream.
|
| SignalFrameCaptured(this, &frame);
|
| - return true;
|
| - }
|
| +#endif
|
| + // TODO(nisse): XXX Keep to avoid warning.
|
| + next_timestamp_ += timestamp_interval;
|
|
|
| - void SignalCapturedFrame(cricket::CapturedFrame* frame) {
|
| - SignalFrameCaptured(this, frame);
|
| + return true;
|
| }
|
|
|
| sigslot::signal1<FakeVideoCapturer*> SignalDestroyed;
|
|
|