diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-18 23:42:12 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-09-23 10:13:17 -0700 |
| commit | 3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38 (patch) | |
| tree | 8ae32d369b3d4e5bc97736a5a1c303ccfc485f7c /tests | |
| parent | 60cbb52613d212236de49b4f22fe059585f8c1b2 (diff) | |
| download | hardware_libhardware-3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38.zip hardware_libhardware-3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38.tar.gz hardware_libhardware-3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38.tar.bz2 | |
Camera2 Test: skip some tests for limited hardware level
Bug: 10388724
Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraBurstTests.cpp | 21 | ||||
| -rw-r--r-- | tests/camera2/CameraMultiStreamTests.cpp | 17 |
2 files changed, 37 insertions, 1 deletions
diff --git a/tests/camera2/CameraBurstTests.cpp b/tests/camera2/CameraBurstTests.cpp index 47fcb3e..7301fce 100644 --- a/tests/camera2/CameraBurstTests.cpp +++ b/tests/camera2/CameraBurstTests.cpp @@ -362,6 +362,23 @@ TEST_F(CameraBurstTest, VariableBurst) { } } + camera_metadata_ro_entry hardwareLevel = + GetStaticEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL); + ASSERT_EQ(1u, hardwareLevel.count); + uint8_t level = hardwareLevel.data.u8[0]; + ASSERT_GE(level, ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED); + ASSERT_LE(level, ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL); + if (level == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED) { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + std::cerr << "Skipping test " + << test_info->test_case_name() << "." + << test_info->name() + << " because HAL hardware supported level is limited " + << std::endl; + return; + } + dout << "Stream size is " << mWidth << " x " << mHeight << std::endl; dout << "Valid exposure range is: " << minExp << " - " << maxExp << " ns " << std::endl; @@ -373,7 +390,9 @@ TEST_F(CameraBurstTest, VariableBurst) { "Falling back to default set."; int32_t minSensitivity = 100; int32_t maxSensitivity = 800; - if (sensivityRange.count >= 2) { + if (sensivityRange.count == 2) { + ASSERT_GT(sensivityRange.data.i32[0], 0); + ASSERT_GT(sensivityRange.data.i32[1], 0); minSensitivity = sensivityRange.data.i32[0]; maxSensitivity = sensivityRange.data.i32[1]; } diff --git a/tests/camera2/CameraMultiStreamTests.cpp b/tests/camera2/CameraMultiStreamTests.cpp index 9e26066..de1cfd6 100644 --- a/tests/camera2/CameraMultiStreamTests.cpp +++ b/tests/camera2/CameraMultiStreamTests.cpp @@ -477,6 +477,23 @@ TEST_F(CameraMultiStreamTest, MultiBurst) { ASSERT_EQ(0u, availableJpegSizes.count % 2); ASSERT_GE(availableJpegSizes.count, 2u); + camera_metadata_ro_entry hardwareLevel = + GetStaticEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL); + ASSERT_EQ(1u, hardwareLevel.count); + uint8_t level = hardwareLevel.data.u8[0]; + ASSERT_GE(level, ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED); + ASSERT_LE(level, ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL); + if (level == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED) { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + std::cerr << "Skipping test " + << test_info->test_case_name() << "." + << test_info->name() + << " because HAL hardware supported level is limited " + << std::endl; + return; + } + // Find the right sizes for preview, metering, and capture streams // assumes at least 2 entries in availableProcessedSizes. int64_t minFrameDuration = DEFAULT_FRAME_DURATION; |