| Index: media/video/capture/fake_video_capture_device.cc
|
| diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
|
| index 852a480ae082120ff5d3cd148b42dc83609b6eb4..0d1bad893fb5a1ca8bf17eda97aa5ba28077af28 100644
|
| --- a/media/video/capture/fake_video_capture_device.cc
|
| +++ b/media/video/capture/fake_video_capture_device.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "media/audio/fake_audio_input_stream.h"
|
| +#include "media/base/video_frame.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| @@ -216,9 +217,9 @@ void FakeVideoCaptureDevice::OnCaptureTask() {
|
| // Give the captured frame to the client.
|
| client_->OnIncomingCapturedFrame(fake_frame_.get(),
|
| frame_size,
|
| - base::TimeTicks::Now(),
|
| + capture_format_,
|
| 0,
|
| - capture_format_);
|
| + base::TimeTicks::Now());
|
| if (!(frame_count_ % kFakeCaptureCapabilityChangePeriod) &&
|
| format_roster_.size() > 0U) {
|
| Reallocate();
|
|
|