Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: media/video/capture/fake_video_capture_device.cc

Issue 83793004: Implement IPCs and VideoCapture::Client interfaces for texture capture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: e296ac98 Win32 bits. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c0680a2a8f03b3868b72edc0663cc250b4dfe04b 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"
@@ -214,11 +215,11 @@ void FakeVideoCaptureDevice::OnCaptureTask() {
frame_count_++;
// Give the captured frame to the client.
- client_->OnIncomingCapturedFrame(fake_frame_.get(),
- frame_size,
- base::TimeTicks::Now(),
- 0,
- capture_format_);
+ client_->OnIncomingCapturedData(fake_frame_.get(),
+ frame_size,
+ capture_format_,
+ 0,
+ base::TimeTicks::Now());
if (!(frame_count_ % kFakeCaptureCapabilityChangePeriod) &&
format_roster_.size() > 0U) {
Reallocate();
« no previous file with comments | « media/video/capture/android/video_capture_device_android.cc ('k') | media/video/capture/file_video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698