Remove old-style constraints from Chrome internals

content/renderer/media/media_stream_video_capturer_source.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_video_capturer_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 78 matching lines @@
   } else {
     NOTREACHED();
   }
 
   // If the maximum frame resolution was provided in the constraints, use it if
   // either: 1) none has been set yet; or 2) the maximum specificed is smaller
   // than the current setting.
   int width = 0;
   int height = 0;
   gfx::Size desired_max_frame_size;
-  if (GetConstraintValueAsInteger(constraints,
-                                  MediaStreamVideoSource::kMaxWidth,
-                                  &width) &&
-      GetConstraintValueAsInteger(constraints,
-                                  MediaStreamVideoSource::kMaxHeight,
-                                  &height) &&
-      DimensionValueIsValid(width) &&
-      DimensionValueIsValid(height)) {
+  if (GetConstraintMaxAsInteger(
+          constraints, &blink::WebMediaTrackConstraintSet::width, &width) &&
+      GetConstraintMaxAsInteger(
+          constraints, &blink::WebMediaTrackConstraintSet::height, &height) &&
+      DimensionValueIsValid(width) && DimensionValueIsValid(height)) {
     desired_max_frame_size.SetSize(width, height);
     if (params->requested_format.frame_size.IsEmpty() ||
         desired_max_frame_size.width() <
             params->requested_format.frame_size.width() ||
         desired_max_frame_size.height() <
             params->requested_format.frame_size.height()) {
       params->requested_format.frame_size = desired_max_frame_size;
     }
   }
 
   // Set the default frame resolution if none was provided.
   if (params->requested_format.frame_size.IsEmpty()) {
     params->requested_format.frame_size.SetSize(
         MediaStreamVideoSource::kDefaultWidth,
         MediaStreamVideoSource::kDefaultHeight);
   }
 
   // If the maximum frame rate was provided, use it if either: 1) none has been
   // set yet; or 2) the maximum specificed is smaller than the current setting.
   double frame_rate = 0.0;
-  if (GetConstraintValueAsDouble(constraints,
-                                 MediaStreamVideoSource::kMaxFrameRate,
-                                 &frame_rate) &&
+  if (GetConstraintMaxAsDouble(constraints,
+                               &blink::WebMediaTrackConstraintSet::frameRate,
+                               &frame_rate) &&
       FrameRateValueIsValid(frame_rate)) {
     if (params->requested_format.frame_rate <= 0.0f ||
         frame_rate < params->requested_format.frame_rate) {
       params->requested_format.frame_rate = frame_rate;
     }
   }
 
   // Set the default frame rate if none was provided.
   if (params->requested_format.frame_rate <= 0.0f) {
     params->requested_format.frame_rate =
         MediaStreamVideoSource::kDefaultFrameRate;
   }
 
   // If the minimum frame resolution was provided, compare it to the maximum
   // frame resolution to determine the intended resolution change policy.
   if (!desired_max_frame_size.IsEmpty() &&
-      GetConstraintValueAsInteger(constraints,
-                                  MediaStreamVideoSource::kMinWidth,
-                                  &width) &&
-      GetConstraintValueAsInteger(constraints,
-                                  MediaStreamVideoSource::kMinHeight,
-                                  &height) &&
+      GetConstraintMinAsInteger(
+          constraints, &blink::WebMediaTrackConstraintSet::width, &width) &&
+      GetConstraintMinAsInteger(
+          constraints, &blink::WebMediaTrackConstraintSet::height, &height) &&
       width <= desired_max_frame_size.width() &&
       height <= desired_max_frame_size.height()) {
     if (width == desired_max_frame_size.width() &&
         height == desired_max_frame_size.height()) {
       // Constraints explicitly require a single frame resolution.
       params->resolution_change_policy =
           media::RESOLUTION_POLICY_FIXED_RESOLUTION;
     } else if (DimensionValueIsValid(width) &&
                DimensionValueIsValid(height) &&
                AreNearlyEquivalentInAspectRatio(gfx::Size(width, height),
@@ skipping 17 matching lines @@
            << params->resolution_change_policy;
 }
 
 // Interprets the properties in |constraints| to override values in |params| and
 // determine the power line frequency.
 void SetPowerLineFrequencyParamFromConstraints(
     const blink::WebMediaConstraints& constraints,
     media::VideoCaptureParams* params) {
   int freq;
   params->power_line_frequency = media::PowerLineFrequency::FREQUENCY_DEFAULT;
-  if (!GetOptionalConstraintValueAsInteger(constraints, kPowerLineFrequency,
-                                           &freq)) {
+  if (!GetConstraintValueAsInteger(
+          constraints,
+          &blink::WebMediaTrackConstraintSet::googPowerLineFrequency, &freq)) {
     return;
   }
   if (freq == static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ))
     params->power_line_frequency = media::PowerLineFrequency::FREQUENCY_50HZ;
   else if (freq == static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ))
     params->power_line_frequency = media::PowerLineFrequency::FREQUENCY_60HZ;
 }
 
 // LocalVideoCapturerSource is a delegate used by MediaStreamVideoCapturerSource
 // for local video capture. It uses the Render singleton VideoCaptureImplManager
@@ skipping 239 matching lines @@
 void MediaStreamVideoCapturerSource::OnStarted(bool result) {
   OnStartDone(result ? MEDIA_DEVICE_OK : MEDIA_DEVICE_TRACK_START_FAILURE);
 }
 
 const char*
 MediaStreamVideoCapturerSource::GetPowerLineFrequencyForTesting() const {
   return kPowerLineFrequency;
 }
 
 }  // namespace content