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

Unified Diff: media/capture/video/win/video_capture_device_win.h

Issue 2873143002: Image Capture: wire setPhotoOptions() for Win (Closed)
Patch Set: Correct wrong human rebase Created 3 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
« no previous file with comments | « no previous file | media/capture/video/win/video_capture_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/win/video_capture_device_win.h
diff --git a/media/capture/video/win/video_capture_device_win.h b/media/capture/video/win/video_capture_device_win.h
index ac75421b9d4b1fe01b9b597a7b01f45ceaef201f..84a9311623b85dc4112776892a4c01ceb4b328ac 100644
--- a/media/capture/video/win/video_capture_device_win.h
+++ b/media/capture/video/win/video_capture_device_win.h
@@ -12,6 +12,7 @@
#define NO_DSHOW_STRSAFE
#include <dshow.h>
#include <stdint.h>
+#include <vidcap.h>
#include <map>
#include <string>
@@ -77,6 +78,8 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice,
void StopAndDeAllocate() override;
void TakePhoto(TakePhotoCallback callback) override;
void GetPhotoCapabilities(GetPhotoCapabilitiesCallback callback) override;
+ void SetPhotoOptions(mojom::PhotoSettingsPtr settings,
+ SetPhotoOptionsCallback callback) override;
private:
enum InternalState {
@@ -116,6 +119,14 @@ class VideoCaptureDeviceWin : public VideoCaptureDevice,
// Map of all capabilities this device support.
CapabilityList capabilities_;
+ VideoCaptureFormat capture_format_;
+
+ base::win::ScopedComPtr<ICameraControl> camera_control_;
+ base::win::ScopedComPtr<IVideoProcAmp> video_control_;
+ // These flags keep the manual/auto mode between cycles of SetPhotoOptions().
+ bool white_balance_mode_manual_;
+ bool exposure_mode_manual_;
+
base::TimeTicks first_ref_time_;
std::queue<TakePhotoCallback> take_photo_callbacks_;
« no previous file with comments | « no previous file | media/capture/video/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698