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

Unified Diff: content/browser/media/media_internals_unittest.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 | « content/browser/media/media_internals.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals_unittest.cc
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index 6a060176fb6ab32eae26f65c00b1bdcfe424b41c..2d43218dba9b0436c48c722b1efa336c969578bb 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -109,7 +109,8 @@ class MediaInternalsVideoCaptureDeviceTest : public testing::Test,
MediaInternals::UpdateCallback update_cb_;
};
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+ defined(OS_ANDROID)
TEST_F(MediaInternalsVideoCaptureDeviceTest,
AllCaptureApiTypesHaveProperStringRepresentation) {
typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName;
@@ -128,6 +129,12 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
m[VideoCaptureDeviceName::QTKIT] = "QTKit";
m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
+#elif defined(OS_ANDROID)
+ m[VideoCaptureDeviceName::API1] = "Camera API1";
+ m[VideoCaptureDeviceName::API2_LEGACY] = "Camera API2 Legacy";
+ m[VideoCaptureDeviceName::API2_FULL] = "Camera API2 Full";
+ m[VideoCaptureDeviceName::API2_LIMITED] = "Camera API2 Limited";
+ m[VideoCaptureDeviceName::TANGO] = "Tango API";
#endif
EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size());
for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) {
@@ -179,6 +186,9 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
media::VideoCaptureDevice::Name(
"dummy", "/dev/dummy",
media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE),
+#elif defined(OS_ANDROID)
+ media::VideoCaptureDevice::Name("dummy", "dummy",
+ media::VideoCaptureDevice::Name::API2_LEGACY),
#else
media::VideoCaptureDevice::Name("dummy", "dummy"),
#endif
@@ -207,6 +217,8 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
ExpectString("captureApi", "Direct Show");
#elif defined(OS_MACOSX)
ExpectString("captureApi", "QTKit");
+#elif defined(OS_ANDROID)
+ ExpectString("captureApi", "Camera API2 Legacy");
#endif
}
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698