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

Unified Diff: content/renderer/media/media_stream_constraints_util.cc

Issue 2922013002: Update constraints processing for video content capture. (Closed)
Patch Set: Rebase Created 3 years, 6 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: content/renderer/media/media_stream_constraints_util.cc
diff --git a/content/renderer/media/media_stream_constraints_util.cc b/content/renderer/media/media_stream_constraints_util.cc
index 6af128dda4e246ee1f4bb62d3802bd8ac91c2637..a5c3b0cb6441262e34677d40a5db15ea36a60044 100644
--- a/content/renderer/media/media_stream_constraints_util.cc
+++ b/content/renderer/media/media_stream_constraints_util.cc
@@ -111,14 +111,17 @@ VideoCaptureSettings::VideoCaptureSettings(
media::VideoCaptureParams capture_params,
base::Optional<bool> noise_reduction,
const VideoTrackAdapterSettings& track_adapter_settings,
- double min_frame_rate)
+ base::Optional<double> min_frame_rate,
+ base::Optional<double> max_frame_rate)
: failed_constraint_name_(nullptr),
device_id_(std::move(device_id)),
capture_params_(capture_params),
noise_reduction_(noise_reduction),
track_adapter_settings_(track_adapter_settings),
- min_frame_rate_(min_frame_rate) {
- DCHECK_LE(min_frame_rate_, capture_params.requested_format.frame_rate);
+ min_frame_rate_(min_frame_rate),
+ max_frame_rate_(max_frame_rate) {
+ DCHECK(!min_frame_rate ||
+ *min_frame_rate_ <= capture_params.requested_format.frame_rate);
DCHECK_LE(track_adapter_settings.max_width,
capture_params.requested_format.frame_size.width());
DCHECK_LE(track_adapter_settings.max_height,

Powered by Google App Engine
This is Rietveld 408576698