Update constraints processing for video content capture.

content/renderer/media/media_stream_video_track.h

 // Copyright 2013 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_VIDEO_TRACK_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 34 matching lines @@
   static blink::WebMediaStreamTrack CreateVideoTrack(
       MediaStreamVideoSource* source,
       const blink::WebMediaConstraints& constraints,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
   static blink::WebMediaStreamTrack CreateVideoTrack(
       MediaStreamVideoSource* source,
       const VideoTrackAdapterSettings& adapter_settings,
       const base::Optional<bool>& noise_reduction,
       bool is_screencast,
-      double min_frame_rate,
+      const base::Optional<double>& min_frame_rate,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
 
   static MediaStreamVideoTrack* GetVideoTrack(
       const blink::WebMediaStreamTrack& track);
 
   // Constructors for video tracks.
   // TODO(guidou): Remove the variant that takes a |constraints| argument.
   // http://crbug.com/706408
   MediaStreamVideoTrack(
       MediaStreamVideoSource* source,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
   MediaStreamVideoTrack(
       MediaStreamVideoSource* source,
       const blink::WebMediaConstraints& constraints,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
   MediaStreamVideoTrack(
       MediaStreamVideoSource* source,
       const VideoTrackAdapterSettings& adapter_settings,
       const base::Optional<bool>& noise_reduction,
       bool is_screen_cast,
-      double min_frame_rate,
+      const base::Optional<double>& min_frame_rate,
       const MediaStreamVideoSource::ConstraintsCallback& callback,
       bool enabled);
   ~MediaStreamVideoTrack() override;
 
   // MediaStreamTrack overrides.
   void SetEnabled(bool enabled) override;
   void SetContentHint(
       blink::WebMediaStreamTrack::ContentHintType content_hint) override;
   void Stop() override;
   void GetSettings(blink::WebMediaStreamTrack::Settings& settings) override;
 
   void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state);
 
   const blink::WebMediaConstraints& constraints() const {
     DCHECK(IsOldVideoConstraints());
     return constraints_;
   }
   const base::Optional<bool>& noise_reduction() const {
     DCHECK(!IsOldVideoConstraints());
     return noise_reduction_;
   }
   bool is_screencast() const {
     DCHECK(!IsOldVideoConstraints());
     return is_screencast_;
   }
-  double min_frame_rate() const {
+  const base::Optional<double>& min_frame_rate() const {
     DCHECK(!IsOldVideoConstraints());
     return min_frame_rate_;
   }
+  const base::Optional<double>& max_frame_rate() const {
+    DCHECK(!IsOldVideoConstraints());
+    return max_frame_rate_;
+  }
   const VideoTrackAdapterSettings& adapter_settings() const {
     DCHECK(!IsOldVideoConstraints());
     return *adapter_settings_;
   }
 
   // Setting information about the track size.
   // Called from MediaStreamVideoSource at track initialization.
   void SetTargetSizeAndFrameRate(int width, int height, double frame_rate) {
     width_ = width;
     height_ = height;
@@ skipping 26 matching lines @@
   class FrameDeliverer;
   const scoped_refptr<FrameDeliverer> frame_deliverer_;
 
   // TODO(guidou): remove this field. http://crbug.com/706408
   const blink::WebMediaConstraints constraints_;
 
   // TODO(guidou): Make this field a regular field instead of a unique_ptr.
   std::unique_ptr<VideoTrackAdapterSettings> adapter_settings_;
   base::Optional<bool> noise_reduction_;
   bool is_screencast_;
-  double min_frame_rate_;
+  base::Optional<double> min_frame_rate_;
+  base::Optional<double> max_frame_rate_;
 
   // Weak ref to the source this tracks is connected to.
   base::WeakPtr<MediaStreamVideoSource> source_;
 
   // This is used for tracking if all connected video sinks are secure.
   SecureDisplayLinkTracker<MediaStreamVideoSink> secure_tracker_;
 
   // Remembering our desired video size and frame rate.
   int width_ = 0;
   int height_ = 0;
   double frame_rate_ = 0.0;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoTrack);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_TRACK_H_