Update selection of resolution policy for screen capture with getUserMedia.

content/renderer/media/media_stream_constraints_util_video_content.cc

 // Copyright 2017 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_video_content.h"
 
 #include <cmath>
 #include <utility>
 #include <vector>
 
@@ skipping 100 matching lines @@
                        kMinScreenCastDimension, kMaxScreenCastDimension,
                        kMinScreenCastAspectRatio, kMaxScreenCastAspectRatio);
 }
 
 // TODO(guidou): Update this policy to better match the way
 // WebContentsCaptureMachine::ComputeOptimalViewSize() interprets
 // resolution-change policies. See http://crbug.com/701302.
 media::ResolutionChangePolicy SelectResolutionPolicyFromCandidates(
     const ResolutionSet& resolution_set) {
   ResolutionSet capabilities = ScreenCastResolutionCapabilities();
+  // TODO(guidou): Since the real maximum screen resolution is not known, use
+  // max_width and max_height from |resolution_set| as the actual capability,
+  // if necessary, to decide the resolution policy. Update this to use the
+  // actual capability once the actual screen resolution is used as default.
+  // http://crbug.com/257097
+  int capabilities_max_height =
+      std::min(resolution_set.max_height(), capabilities.max_height());
+  int capabilities_max_width =
+      std::min(resolution_set.max_width(), capabilities.max_width());
+  double capabilities_min_aspect_ratio =
+      static_cast<double>(capabilities.min_width()) / capabilities_max_height;
+  double capabilities_max_aspect_ratio =
+      static_cast<double>(capabilities_max_width) / capabilities.min_height();
   bool can_adjust_resolution =
       resolution_set.min_height() <= capabilities.min_height() &&
-      resolution_set.max_height() >= capabilities.max_height() &&
+      resolution_set.max_height() >= capabilities_max_height &&
       resolution_set.min_width() <= capabilities.min_width() &&
-      resolution_set.max_width() >= capabilities.max_width() &&
-      resolution_set.min_aspect_ratio() <= capabilities.min_aspect_ratio() &&
-      resolution_set.max_aspect_ratio() >= capabilities.max_aspect_ratio();
+      resolution_set.max_width() >= capabilities_max_width &&
+      resolution_set.min_aspect_ratio() <= capabilities_min_aspect_ratio &&
+      resolution_set.max_aspect_ratio() >= capabilities_max_aspect_ratio;
 
   return can_adjust_resolution ? media::RESOLUTION_POLICY_ANY_WITHIN_LIMIT
                                : media::RESOLUTION_POLICY_FIXED_RESOLUTION;
 }
 
 int RoundToInt(double d) {
   return static_cast<int>(std::round(d));
 }
 
 gfx::Size ToGfxSize(const Point& point) {
@@ skipping 168 matching lines @@
         candidates.Intersection(advanced_candidates);
     if (!intersection.IsEmpty())
       candidates = std::move(intersection);
   }
 
   DCHECK(!candidates.IsEmpty());
   return SelectResultFromCandidates(candidates, constraints.Basic());
 }
 
 }  // namespace content