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

Unified Diff: content/browser/media/capture/content_video_capture_device_core.h

Issue 965123002: Crash fix for desktop capture size calculations, and some minor things. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « no previous file | content/browser/media/capture/content_video_capture_device_core.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/capture/content_video_capture_device_core.h
diff --git a/content/browser/media/capture/content_video_capture_device_core.h b/content/browser/media/capture/content_video_capture_device_core.h
index f56c10950f5890145ca37ee66923c33a39988fa0..9cd3244a07b165c7d1988d9750b4aa5e57177d57 100644
--- a/content/browser/media/capture/content_video_capture_device_core.h
+++ b/content/browser/media/capture/content_video_capture_device_core.h
@@ -62,6 +62,10 @@ class ThreadSafeCaptureOracle
return oracle_.min_capture_period();
}
+ gfx::Size max_frame_size() const {
+ return params_.requested_format.frame_size;
+ }
+
// Returns the current capture resolution.
gfx::Size GetCaptureSize() const;
@@ -97,13 +101,10 @@ class ThreadSafeCaptureOracle
VideoCaptureOracle oracle_;
// The video capture parameters used to construct the oracle proxy.
- media::VideoCaptureParams params_;
-
- // Indicates if capture size has been updated after construction.
- bool capture_size_updated_;
+ const media::VideoCaptureParams params_;
- // The current capturing format, as a media::VideoFrame::Format.
- media::VideoFrame::Format video_frame_format_;
+ // The current video capture size.
+ gfx::Size capture_size_;
};
// Keeps track of the video capture source frames and executes copying on the
« no previous file with comments | « no previous file | content/browser/media/capture/content_video_capture_device_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698