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

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

Issue 2386183002: Replace manual conversions with Mojo type mappings
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | mojo/public/tools/bindings/chromium_bindings_configuration.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <list>
9 #include <string> 8 #include <string>
9 #include <vector>
10 10
11 #include "media/capture/capture_export.h" 11 #include "media/capture/capture_export.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 // A Java counterpart will be generated for this enum. 15 // A Java counterpart will be generated for this enum.
16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media 16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
17 enum class VideoCaptureApi { 17 enum class VideoCaptureApi {
18 LINUX_V4L2_SINGLE_PLANE, 18 LINUX_V4L2_SINGLE_PLANE,
19 WIN_MEDIA_FOUNDATION, 19 WIN_MEDIA_FOUNDATION,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 std::string device_id; 77 std::string device_id;
78 // A unique hardware identifier of the capture device. 78 // A unique hardware identifier of the capture device.
79 // It is of the form "[vid]:[pid]" when a USB device is detected, and empty 79 // It is of the form "[vid]:[pid]" when a USB device is detected, and empty
80 // otherwise. 80 // otherwise.
81 std::string model_id; 81 std::string model_id;
82 82
83 VideoCaptureApi capture_api; 83 VideoCaptureApi capture_api;
84 VideoCaptureTransportType transport_type; 84 VideoCaptureTransportType transport_type;
85 }; 85 };
86 86
87 using VideoCaptureDeviceDescriptors = std::list<VideoCaptureDeviceDescriptor>; 87 using VideoCaptureDeviceDescriptors = std::vector<VideoCaptureDeviceDescriptor>;
88 88
89 } // namespace media 89 } // namespace media
90 90
91 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_ 91 #endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_DESCRIPTOR_H_
OLDNEW
« no previous file with comments | « no previous file | mojo/public/tools/bindings/chromium_bindings_configuration.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698