Update constraints processing for video content capture.

content/renderer/media/media_stream_constraints_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_constraints_util.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 93 matching lines @@
 VideoCaptureSettings::VideoCaptureSettings() : VideoCaptureSettings("") {}
 
 VideoCaptureSettings::VideoCaptureSettings(const char* failed_constraint_name)
     : failed_constraint_name_(failed_constraint_name) {}
 
 VideoCaptureSettings::VideoCaptureSettings(
     std::string device_id,
     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,
             capture_params.requested_format.frame_size.height());
   DCHECK_LT(track_adapter_settings.max_frame_rate,
             capture_params.requested_format.frame_rate);
 }
 
 VideoCaptureSettings::VideoCaptureSettings(const VideoCaptureSettings& other) =
     default;
@@ skipping 109 matching lines @@
   base::Optional<gfx::Size> expected_native_size;
   if (expect_source_native_size)
     expected_native_size = source_format.frame_size;
 
   return VideoTrackAdapterSettings(
       track_max_width, track_max_height, track_min_aspect_ratio,
       track_max_aspect_ratio, track_max_frame_rate, expected_native_size);
 }
 
 }  // namespace content