Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(417)

Side by Side Diff: media/capture/video/video_capture_device_descriptor.h

Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range. (Closed)
Patch Set: review #25 fix. Thanks kinuko@. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_ 5 #ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
6 #define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_ 6 #define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/optional.h"
11 #include "media/capture/capture_export.h" 12 #include "media/capture/capture_export.h"
12 13
13 namespace media { 14 namespace media {
14 15
15 // A Java counterpart will be generated for this enum. 16 // A Java counterpart will be generated for this enum.
16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media 17 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
17 enum class VideoCaptureApi { 18 enum class VideoCaptureApi {
18 LINUX_V4L2_SINGLE_PLANE, 19 LINUX_V4L2_SINGLE_PLANE,
19 WIN_MEDIA_FOUNDATION, 20 WIN_MEDIA_FOUNDATION,
20 WIN_DIRECT_SHOW, 21 WIN_DIRECT_SHOW,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 76
76 std::string display_name; // Name that is intended for display in the UI 77 std::string display_name; // Name that is intended for display in the UI
77 std::string device_id; 78 std::string device_id;
78 // A unique hardware identifier of the capture device. 79 // A unique hardware identifier of the capture device.
79 // It is of the form "[vid]:[pid]" when a USB device is detected, and empty 80 // It is of the form "[vid]:[pid]" when a USB device is detected, and empty
80 // otherwise. 81 // otherwise.
81 std::string model_id; 82 std::string model_id;
82 83
83 VideoCaptureApi capture_api; 84 VideoCaptureApi capture_api;
84 VideoCaptureTransportType transport_type; 85 VideoCaptureTransportType transport_type;
86
87 // Contains camera calibration parameters.
88 // These parameters apply to both RGB and depth video devices. See also
89 // https://w3c.github.io/mediacapture-depth/#mediatracksettings-dictionary
90 // TODO(aleksandar.stojiljkovic): Add principal point and camera distortion
91 // model and coefficients. See also https://crbug.com/616098
92 struct CameraCalibration {
93 double focal_length_x = 0.0;
94 double focal_length_y = 0.0;
95 // depth near and far are used only for depth cameras.
96 double depth_near = 0.0;
97 double depth_far = 0.0;
98 };
99
100 base::Optional<CameraCalibration> camera_calibration;
85 }; 101 };
86 102
87 using VideoCaptureDeviceDescriptors = std::vector<VideoCaptureDeviceDescriptor>; 103 using VideoCaptureDeviceDescriptors = std::vector<VideoCaptureDeviceDescriptor>;
88 104
89 } // namespace media 105 } // namespace media
90 106
91 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_ 107 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698