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

Unified Diff: media/video/capture/video_capture_device.cc

Issue 1014943005: Android CaptureAPI Types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed android_webview changes. Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/capture/video_capture_device.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/video_capture_device.cc
diff --git a/media/video/capture/video_capture_device.cc b/media/video/capture/video_capture_device.cc
index 70c24df0acdc4c8bd5d5e69faf3ce0513c3bae32..dabeed305d4a6c04cc8166679269ed71a08dfd6f 100644
--- a/media/video/capture/video_capture_device.cc
+++ b/media/video/capture/video_capture_device.cc
@@ -58,6 +58,13 @@ VideoCaptureDevice::Name::Name(const std::string& name,
capture_api_class_(api_type),
transport_type_(transport_type),
is_blacklisted_(false) {}
+#elif defined(ANDROID)
+VideoCaptureDevice::Name::Name(const std::string& name,
+ const std::string& id,
+ const CaptureApiType api_type)
+ : device_name_(name),
+ unique_id_(id),
+ capture_api_class_(api_type) {}
#endif
VideoCaptureDevice::Name::~Name() {}
@@ -102,6 +109,25 @@ const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
return "Unknown API";
}
}
+#elif defined(OS_ANDROID)
+const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
+ switch(capture_api_type()) {
+ case API1:
+ return "Camera API1";
+ case API2_LEGACY:
+ return "Camera API2 Legacy";
+ case API2_FULL:
+ return "Camera API2 Full";
+ case API2_LIMITED:
+ return "Camera API2 Limited";
+ case TANGO:
+ return "Tango API";
+ case API_TYPE_UNKNOWN:
+ default:
+ NOTREACHED() << "Unknown Video Capture API type!";
+ return "Unknown API";
+ }
+}
#endif
VideoCaptureDevice::~VideoCaptureDevice() {}
« no previous file with comments | « media/video/capture/video_capture_device.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698