Update constraints processing for video content capture.

content/renderer/media/media_stream_constraints_util.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 //     the adapter settings suitable for the track the constraints are being
 //     to. These settings are derived from the width, height, aspectRatio and
 //     frameRate constraints.
 // Some MediaStreamVideoSink objects (e.g. MediaStreamVideoWebRtcSink) require
 // configuration derived from constraints that cannot be obtained from the
 // source and track settings indicated above. The following fields are used
 // to configure sinks:
 //   * noise_reduction: used to control noise reduction for a screen-capture
 //     track sent to a peer connection. Derive from the googNoiseReduction
 //     constraint.
-//   * min_frame_rate: used to control frame refreshes in screen-capture tracks
-//     sent to a peer connection. Derived from the frameRate constraint.
+//   * min_frame_rate and max_frame_rate: used to control frame refreshes in
+//     screen-capture tracks sent to a peer connection. Derived from the
+//     frameRate constraint.
 class CONTENT_EXPORT VideoCaptureSettings {
  public:
   // Creates an object without value and with an empty failed constraint name.
   VideoCaptureSettings();
 
   // Creates an object without value and with the given
   // |failed_constraint_name|. Does not take ownership of
   // |failed_constraint_name|, so it must be null or point to a string that
   // remains accessible.
   explicit VideoCaptureSettings(const char* failed_constraint_name);
 
   // Creates an object with the given values.
   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);
 
   VideoCaptureSettings(const VideoCaptureSettings& other);
   VideoCaptureSettings& operator=(const VideoCaptureSettings& other);
   VideoCaptureSettings(VideoCaptureSettings&& other);
   VideoCaptureSettings& operator=(VideoCaptureSettings&& other);
   ~VideoCaptureSettings();
 
   bool HasValue() const { return failed_constraint_name_ == nullptr; }
 
   // Convenience accessors for fields embedded in |capture_params_|.
@@ skipping 33 matching lines @@
     return capture_params_;
   }
   const base::Optional<bool>& noise_reduction() const {
     DCHECK(HasValue());
     return noise_reduction_;
   }
   const VideoTrackAdapterSettings& track_adapter_settings() const {
     DCHECK(HasValue());
     return track_adapter_settings_;
   }
-  double min_frame_rate() const {
+  const base::Optional<double>& min_frame_rate() const {
     DCHECK(HasValue());
     return min_frame_rate_;
   }
+  const base::Optional<double>& max_frame_rate() const {
+    DCHECK(HasValue());
+    return max_frame_rate_;
+  }
 
  private:
   const char* failed_constraint_name_;
   std::string device_id_;
   media::VideoCaptureParams capture_params_;
   base::Optional<bool> noise_reduction_;
   VideoTrackAdapterSettings track_adapter_settings_;
-  double min_frame_rate_;
+  base::Optional<double> min_frame_rate_;
+  base::Optional<double> max_frame_rate_;
 };
 
 // Method to get boolean value of constraint with |name| from constraints.
 // Returns true if the constraint is specified in either mandatory or optional
 // constraints.
 bool CONTENT_EXPORT GetConstraintValueAsBoolean(
     const blink::WebMediaConstraints& constraints,
     const blink::BooleanConstraint blink::WebMediaTrackConstraintSet::*picker,
     bool* value);
 
@@ skipping 94 matching lines @@
 VideoTrackAdapterSettings CONTENT_EXPORT SelectVideoTrackAdapterSettings(
     const blink::WebMediaTrackConstraintSet& basic_constraint_set,
     const ResolutionSet& resolution_set,
     const NumericRangeSet<double>& frame_rate_set,
     const media::VideoCaptureFormat& source_format,
     bool expect_source_native_size);
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_H_