Minor refactoring of SelectSettings results for consistency.

content/renderer/media/media_stream_constraints_util_video_device.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_device.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <utility>
@@ skipping 156 matching lines @@
   long native_width_;
   long min_width_;
   long max_width_;
   double native_frame_rate_;
   double min_frame_rate_;
   double max_frame_rate_;
 };
 
 VideoDeviceCaptureSourceSelectionResult ResultFromSettings(
     const VideoDeviceCaptureSourceSettings& settings) {
-  VideoDeviceCaptureSourceSelectionResult result;
-  result.capture_params.power_line_frequency = settings.power_line_frequency();
-  result.capture_params.requested_format = settings.format();
-  result.device_id = settings.device_id();
-  result.facing_mode = settings.facing_mode();
-  result.noise_reduction = settings.noise_reduction();
-  result.failed_constraint_name = nullptr;
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format = settings.format();
+  capture_params.power_line_frequency = settings.power_line_frequency();
 
-  return result;
+  return VideoDeviceCaptureSourceSelectionResult(
+      settings.device_id(), settings.facing_mode(), capture_params,
+      settings.noise_reduction());
 }
 
 // Generic distance function between two numeric values. Based on the fitness
 // distance function described in
 // https://w3c.github.io/mediacapture-main/#dfn-fitness-distance
 double Distance(double value1, double value2) {
   if (std::fabs(value1 - value2) <= blink::DoubleConstraint::kConstraintEpsilon)
     return 0.0;
 
   return std::fabs(value1 - value2) /
@@ skipping 545 matching lines @@
              : blink::WebString::fromASCII(kVideoKindColor);
 }
 
 VideoDeviceCaptureCapabilities::VideoDeviceCaptureCapabilities() = default;
 VideoDeviceCaptureCapabilities::VideoDeviceCaptureCapabilities(
     VideoDeviceCaptureCapabilities&& other) = default;
 VideoDeviceCaptureCapabilities::~VideoDeviceCaptureCapabilities() = default;
 VideoDeviceCaptureCapabilities& VideoDeviceCaptureCapabilities::operator=(
     VideoDeviceCaptureCapabilities&& other) = default;
 
-const char kDefaultFailedConstraintName[] = "";
+VideoDeviceCaptureSourceSelectionResult::
+    VideoDeviceCaptureSourceSelectionResult()
+    : VideoDeviceCaptureSourceSelectionResult("") {}
 
 VideoDeviceCaptureSourceSelectionResult::
-    VideoDeviceCaptureSourceSelectionResult()
-    : failed_constraint_name(kDefaultFailedConstraintName),
-      facing_mode(::mojom::FacingMode::NONE) {}
+    VideoDeviceCaptureSourceSelectionResult(const char* failed_constraint_name)
+    : failed_constraint_name_(failed_constraint_name) {}
+
+VideoDeviceCaptureSourceSelectionResult::
+    VideoDeviceCaptureSourceSelectionResult(
+        const std::string& device_id,
+        ::mojom::FacingMode facing_mode,
+        media::VideoCaptureParams capture_params,
+        rtc::Optional<bool> noise_reduction)
+    : failed_constraint_name_(nullptr),
+      device_id_(device_id),
+      facing_mode_(facing_mode),
+      capture_params_(capture_params),
+      noise_reduction_(noise_reduction) {}
+
 VideoDeviceCaptureSourceSelectionResult::
     VideoDeviceCaptureSourceSelectionResult(
         const VideoDeviceCaptureSourceSelectionResult& other) = default;
 VideoDeviceCaptureSourceSelectionResult::
     VideoDeviceCaptureSourceSelectionResult(
         VideoDeviceCaptureSourceSelectionResult&& other) = default;
 VideoDeviceCaptureSourceSelectionResult::
     ~VideoDeviceCaptureSourceSelectionResult() = default;
 VideoDeviceCaptureSourceSelectionResult&
 VideoDeviceCaptureSourceSelectionResult::operator=(
@@ skipping 19 matching lines @@
   //    ideal values of the basic constraint set using native values for
   //    settings that can support a range of values.
   // e) A custom distance value based on how close the candidate is to default
   //    settings.
   // Parts (a) and (b) are according to spec. Parts (c) to (e) are
   // implementation specific and used to break ties.
   DistanceVector best_distance(2 * constraints.advanced().size() + 3 +
                                kNumDefaultDistanceEntries);
   std::fill(best_distance.begin(), best_distance.end(), HUGE_VAL);
   VideoDeviceCaptureSourceSelectionResult result;
-  const char* failed_constraint_name = result.failed_constraint_name;
+  const char* failed_constraint_name = result.failed_constraint_name();
 
   for (auto& device : capabilities.device_capabilities) {
     double basic_device_distance =
         DeviceSourceDistance(device->device_id, device->facing_mode,
                              constraints.basic(), &failed_constraint_name);
     if (!std::isfinite(basic_device_distance))
       continue;
 
     for (auto& format : device->formats) {
       ConstrainedFormat constrained_format(format);
@@ skipping 70 matching lines @@
           if (candidate_distance_vector < best_distance) {
             best_distance = candidate_distance_vector;
             result = ResultFromSettings(candidate);
           }
         }
       }
     }
   }
 
   if (!result.HasValue())
-    result.failed_constraint_name = failed_constraint_name;
+    return VideoDeviceCaptureSourceSelectionResult(failed_constraint_name);
 
   return result;
 }
 
 }  // namespace content