Index: media/video/capture/video_capture_device.h |
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h |
index 747f1b00d3a6a98e74ab4d3091e84d9cf13e792c..f21e4cb43d2fba04239c519decabf6591e6115fd 100644 |
--- a/media/video/capture/video_capture_device.h |
+++ b/media/video/capture/video_capture_device.h |
@@ -64,7 +64,23 @@ class MEDIA_EXPORT VideoCaptureDevice { |
OTHER_TRANSPORT |
}; |
#endif |
-#if defined(OS_WIN) || defined(OS_MACOSX) |
+#if defined (OS_ANDROID) |
+ // Android targets Capture Api type: it can only be set on construction. |
+ // Automatically generated enum to interface with Java world. |
+ // |
+ // A Java counterpart will be generated for this enum. |
+ // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media |
+ enum CaptureApiType { |
+ API1, |
+ API2_LEGACY, |
+ API2_FULL, |
+ API2_LIMITED, |
+ TANGO, |
+ API_TYPE_UNKNOWN |
+ }; |
+#endif |
+ |
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) |
Name(const std::string& name, |
const std::string& id, |
const CaptureApiType api_type); |
@@ -102,7 +118,7 @@ class MEDIA_EXPORT VideoCaptureDevice { |
return unique_id_ < other.id(); |
} |
-#if defined(OS_WIN) || defined(OS_MACOSX) |
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) |
CaptureApiType capture_api_type() const { |
return capture_api_class_.capture_api_type(); |
} |
@@ -117,7 +133,7 @@ class MEDIA_EXPORT VideoCaptureDevice { |
void set_capabilities_id(const std::string& id) { |
capabilities_id_ = id; |
} |
-#endif |
+#endif // if defined(OS_WIN) |
#if defined(OS_MACOSX) |
TransportType transport_type() const { |
return transport_type_; |
@@ -128,12 +144,12 @@ class MEDIA_EXPORT VideoCaptureDevice { |
void set_is_blacklisted(bool is_blacklisted) { |
is_blacklisted_ = is_blacklisted; |
} |
-#endif // if defined(OS_WIN) |
+#endif // if defined(OS_MACOSX) |
private: |
std::string device_name_; |
std::string unique_id_; |
-#if defined(OS_WIN) || defined(OS_MACOSX) |
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) |
// This class wraps the CaptureApiType to give it a by default value if not |
// initialized. |
class CaptureApiClass { |