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

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

Issue 2805863002: Remove VideoCaptureDeviceFactory::EnumerateDeviceDescriptors() (Closed)
Patch Set: Rebase Created 3 years, 8 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
(...skipping 19 matching lines...) Expand all
30 UNKNOWN 30 UNKNOWN
31 }; 31 };
32 32
33 enum class VideoCaptureTransportType { 33 enum class VideoCaptureTransportType {
34 // For AVFoundation Api, identify devices that are built-in or USB. 34 // For AVFoundation Api, identify devices that are built-in or USB.
35 MACOSX_USB_OR_BUILT_IN, 35 MACOSX_USB_OR_BUILT_IN,
36 OTHER_TRANSPORT 36 OTHER_TRANSPORT
37 }; 37 };
38 38
39 // Represents information about a capture device as returned by 39 // Represents information about a capture device as returned by
40 // VideoCaptureDeviceFactory::EnumerateDeviceDescriptors(). 40 // VideoCaptureDeviceFactory::GetDeviceDescriptors().
41 // |device_id| represents a unique id of a physical device. Since the same 41 // |device_id| represents a unique id of a physical device. Since the same
42 // physical device may be accessible through different APIs |capture_api| 42 // physical device may be accessible through different APIs |capture_api|
43 // disambiguates the API. 43 // disambiguates the API.
44 struct CAPTURE_EXPORT VideoCaptureDeviceDescriptor { 44 struct CAPTURE_EXPORT VideoCaptureDeviceDescriptor {
45 public: 45 public:
46 VideoCaptureDeviceDescriptor(); 46 VideoCaptureDeviceDescriptor();
47 VideoCaptureDeviceDescriptor( 47 VideoCaptureDeviceDescriptor(
48 const std::string& display_name, 48 const std::string& display_name,
49 const std::string& device_id, 49 const std::string& device_id,
50 VideoCaptureApi capture_api = VideoCaptureApi::UNKNOWN, 50 VideoCaptureApi capture_api = VideoCaptureApi::UNKNOWN,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 }; 99 };
100 100
101 base::Optional<CameraCalibration> camera_calibration; 101 base::Optional<CameraCalibration> camera_calibration;
102 }; 102 };
103 103
104 using VideoCaptureDeviceDescriptors = std::vector<VideoCaptureDeviceDescriptor>; 104 using VideoCaptureDeviceDescriptors = std::vector<VideoCaptureDeviceDescriptor>;
105 105
106 } // namespace media 106 } // namespace media
107 107
108 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_ 108 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
OLDNEW
« no previous file with comments | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/capture/video/video_capture_device_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698