media/capture/video/video_capture_device.h - Issue 1952463002: Media Stream Image Capture (4): wire takePhoto and implement in FakeVCDevice

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/capture/video/video_capture_device.h

Issue 1952463002: Media Stream Image Capture (4): wire takePhoto and implement in FakeVCDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unittests Created 4 years, 7 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

« content/browser/renderer_host/media/video_capture_manager.h ('K') | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/capture/video/video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/video_capture_device.h

diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h

index ed40a9a178be281e6757b0398bca7cc6e2e5a761..7a1f9cdeb89321ede10d57899ad009df93bb8ed1 100644

--- a/media/capture/video/video_capture_device.h

+++ b/media/capture/video/video_capture_device.h

@@ -299,6 +299,14 @@ class MEDIA_EXPORT VideoCaptureDevice {

// happens first.

virtual void StopAndDeAllocate() = 0;

+ // Asynchronously takes a photo, possibly reconfiguring the capture objects

+ // and/or interrupting the capture flow. Returns false if taking the picture

+ // could not be scheduled at all, or else runs |photo_callback| (on the thread

+ // where TakePhoto() is run).

+ using TakePhotoCallback =

+ base::Callback<void(const std::string&, std::unique_ptr<std::string>)>;

+ virtual bool TakePhoto(const TakePhotoCallback& photo_callback);

miu 2016/05/04 23:45:50 Consider adding WARN_UNUSED_RESULT (just before th

mcasas 2016/05/05 00:57:12 Done.

// Gets the power line frequency, either from the params if specified by the

// user or from the current system time zone.

PowerLineFrequency GetPowerLineFrequency(