Minor refactoring of support classes for video-device constraints.

content/renderer/media/media_stream_constraints_util_video_device.h

Index: content/renderer/media/media_stream_constraints_util_video_device.h
diff --git a/content/renderer/media/media_stream_constraints_util_video_source.h b/content/renderer/media/media_stream_constraints_util_video_device.h
similarity index 66%
rename from content/renderer/media/media_stream_constraints_util_video_source.h
rename to content/renderer/media/media_stream_constraints_util_video_device.h
index b3df2ff8f07feb5dbe1c717afa30aba322fd3730..f4ee1d72b20228f99a4a6425cc3b949448923c70 100644
--- a/content/renderer/media/media_stream_constraints_util_video_source.h
+++ b/content/renderer/media/media_stream_constraints_util_video_device.h
@@ -2,10 +2,9 @@
 // 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_VIDEO_SOURCE_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_VIDEO_SOURCE_H_
+#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_VIDEO_DEVICE_H_
+#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_VIDEO_DEVICE_H_
 
-#include <iosfwd>
 #include <string>
 #include <vector>
 
@@ -25,69 +24,51 @@ namespace content {
 blink::WebString CONTENT_EXPORT
 GetVideoKindForFormat(const media::VideoCaptureFormat& format);
 
-struct CONTENT_EXPORT VideoCaptureCapabilities {
-  VideoCaptureCapabilities();
-  VideoCaptureCapabilities(VideoCaptureCapabilities&& other);
-  ~VideoCaptureCapabilities();
-  VideoCaptureCapabilities& operator=(VideoCaptureCapabilities&& other);
+struct CONTENT_EXPORT VideoDeviceCaptureCapabilities {
+  VideoDeviceCaptureCapabilities();
+  VideoDeviceCaptureCapabilities(VideoDeviceCaptureCapabilities&& other);
+  ~VideoDeviceCaptureCapabilities();
+  VideoDeviceCaptureCapabilities& operator=(
+      VideoDeviceCaptureCapabilities&& other);
 
   // Each field is independent of each other.
   std::vector<::mojom::VideoInputDeviceCapabilitiesPtr> device_capabilities;
   std::vector<media::PowerLineFrequency> power_line_capabilities;
 };
 
-class CONTENT_EXPORT VideoCaptureSourceSettings {
- public:
-  VideoCaptureSourceSettings();
-  VideoCaptureSourceSettings(const VideoCaptureSourceSettings& other);
-  VideoCaptureSourceSettings(VideoCaptureSourceSettings&& other);
-  VideoCaptureSourceSettings(const std::string& device_id,
-                             const media::VideoCaptureFormat& format,
-                             ::mojom::FacingMode facing_mode,
-                             media::PowerLineFrequency power_line_frequency);
-  ~VideoCaptureSourceSettings();
-  VideoCaptureSourceSettings& operator=(
-      const VideoCaptureSourceSettings& other);
-  VideoCaptureSourceSettings& operator=(VideoCaptureSourceSettings&& other);
-
-  // Accessors for easier interaction with blink constraint classes.
-  blink::WebString GetFacingMode() const;
-  long GetPowerLineFrequency() const;
-  long GetWidth() const;
-  long GetHeight() const;
-  double GetFrameRate() const;
-  blink::WebString GetDeviceId() const;
-  blink::WebString GetVideoKind() const;
-
-  const media::VideoCaptureFormat& format() const { return format_; }
-  const std::string& device_id() const { return device_id_; }
-  ::mojom::FacingMode facing_mode() const { return facing_mode_; }
-  media::PowerLineFrequency power_line_frequency() const {
-    return power_line_frequency_;
+struct CONTENT_EXPORT VideoDeviceCaptureSourceSelectionResult {
+  VideoDeviceCaptureSourceSelectionResult();
+  VideoDeviceCaptureSourceSelectionResult(
+      const VideoDeviceCaptureSourceSelectionResult& other);
+  VideoDeviceCaptureSourceSelectionResult(
+      VideoDeviceCaptureSourceSelectionResult&& other);
+  ~VideoDeviceCaptureSourceSelectionResult();
+  VideoDeviceCaptureSourceSelectionResult& operator=(
+      const VideoDeviceCaptureSourceSelectionResult& other);
+  VideoDeviceCaptureSourceSelectionResult& operator=(
+      VideoDeviceCaptureSourceSelectionResult&& other);
+
+  bool HasValue() const { return failed_constraint_name == nullptr; }
+
+  // Convenience accessors for fields embedded in |capture_params|.
+  const media::VideoCaptureFormat& Format() const {
+    return capture_params.requested_format;
+  }
+  int Width() const {
+    return capture_params.requested_format.frame_size.width();
+  }
+  int Height() const {
+    return capture_params.requested_format.frame_size.width();
+  }
+  float FrameRate() const { return capture_params.requested_format.frame_rate; }
+  media::PowerLineFrequency PowerLineFrequency() const {
+    return capture_params.power_line_frequency;
   }

[hbos_chromium, 2017/02/24 11:28:57]

Here you use names like Width() but in VideoDeviceCaptureSourceSettings you use
names like GetWidth(). I'm OK with either but be consistent.

[Guido Urdaneta, 2017/02/24 13:13:44]

As discussed offline, the Get ones are not just accessors, but also make type
transformations to be more Blink friendly. Updated the comment for Get functions
to make that more clear.

 
- private:
-  std::string device_id_;
-  media::VideoCaptureFormat format_;
-  ::mojom::FacingMode facing_mode_;
-  media::PowerLineFrequency power_line_frequency_;
-};
-
-struct CONTENT_EXPORT VideoCaptureSourceSelectionResult {
-  VideoCaptureSourceSelectionResult();
-  VideoCaptureSourceSelectionResult(
-      const VideoCaptureSourceSelectionResult& other);
-  VideoCaptureSourceSelectionResult(VideoCaptureSourceSelectionResult&& other);
-  ~VideoCaptureSourceSelectionResult();
-  VideoCaptureSourceSelectionResult& operator=(
-      const VideoCaptureSourceSelectionResult& other);
-  VideoCaptureSourceSelectionResult& operator=(
-      VideoCaptureSourceSelectionResult&& other);
-
-  bool has_value() const { return failed_constraint_name == nullptr; }
-
-  VideoCaptureSourceSettings settings;
   const char* failed_constraint_name;
+  std::string device_id;
+  ::mojom::FacingMode facing_mode;
+  media::VideoCaptureParams capture_params;
 };
 
 // This function performs source and source-settings selection based on
@@ -152,10 +133,11 @@ struct CONTENT_EXPORT VideoCaptureSourceSelectionResult {
 //    settings that include the device ID, power-line frequency, resolution, and
 //    frame rate, in that order. Note that there is no default facing mode or
 //    aspect ratio.
-VideoCaptureSourceSelectionResult CONTENT_EXPORT
-SelectVideoCaptureSourceSettings(const VideoCaptureCapabilities& capabilities,
-                                 const blink::WebMediaConstraints& constraints);
+VideoDeviceCaptureSourceSelectionResult CONTENT_EXPORT
+SelectVideoDeviceCaptureSourceSettings(
+    const VideoDeviceCaptureCapabilities& capabilities,
+    const blink::WebMediaConstraints& constraints);
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_VIDEO_SOURCE_H_
+#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CONSTRAINTS_UTIL_VIDEO_DEVICE_H_