diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-03-06 13:19:36 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-03-06 13:19:36 -0800 |
| commit | e69efbbabf26569ddd0ca12dda44d830a251a07f (patch) | |
| tree | 8d4f935c3ea418d556b8f3bb22ce41746c2a7992 /tests | |
| parent | 8558510d59f659d83b44728331e88f106ff735c8 (diff) | |
| download | hardware_libhardware-e69efbbabf26569ddd0ca12dda44d830a251a07f.zip hardware_libhardware-e69efbbabf26569ddd0ca12dda44d830a251a07f.tar.gz hardware_libhardware-e69efbbabf26569ddd0ca12dda44d830a251a07f.tar.bz2 | |
Replace/rename old HAL graphics formats
- Replace RAW_SENSOR with RAW16
- Remove sRGB formats
Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamTests.cpp | 6 | ||||
| -rw-r--r-- | tests/camera2/camera2.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp index 94fa911..da5b748 100644 --- a/tests/camera2/CameraMetadataTests.cpp +++ b/tests/camera2/CameraMetadataTests.cpp @@ -169,7 +169,7 @@ TEST_F(CameraMetadataTest, SaneResolutions) { if (rawResolutionsCount > 0) { EXPECT_TRUE( HasElementInArrayFromStaticTag(ANDROID_SCALER_AVAILABLE_FORMATS, - HAL_PIXEL_FORMAT_RAW_SENSOR)); + HAL_PIXEL_FORMAT_RAW16)); } // Required processed sizes. diff --git a/tests/camera2/CameraStreamTests.cpp b/tests/camera2/CameraStreamTests.cpp index 69ee274..a3b8c47 100644 --- a/tests/camera2/CameraStreamTests.cpp +++ b/tests/camera2/CameraStreamTests.cpp @@ -166,15 +166,15 @@ static CameraStreamParams TestParameters[] = { /*mHeapCount*/ 3 }, { - /*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, + /*mFormat*/ HAL_PIXEL_FORMAT_RAW16, /*mHeapCount*/ 1 }, { - /*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, + /*mFormat*/ HAL_PIXEL_FORMAT_RAW16, /*mHeapCount*/ 2 }, { - /*mFormat*/ HAL_PIXEL_FORMAT_RAW_SENSOR, + /*mFormat*/ HAL_PIXEL_FORMAT_RAW16, /*mHeapCount*/ 3 }, }; diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp index 72b7b61..8d637d4 100644 --- a/tests/camera2/camera2.cpp +++ b/tests/camera2/camera2.cpp @@ -305,7 +305,7 @@ class Camera2Test: public testing::Test { } camera_metadata_ro_entry_t availableSizes; - if (format == HAL_PIXEL_FORMAT_RAW_SENSOR) { + if (format == HAL_PIXEL_FORMAT_RAW16) { res = find_camera_metadata_ro_entry(mStaticInfo, ANDROID_SCALER_AVAILABLE_RAW_SIZES, &availableSizes); @@ -445,7 +445,7 @@ TEST_F(Camera2Test, Capture1Raw) { const int32_t *rawResolutions; size_t rawResolutionsCount; - int format = HAL_PIXEL_FORMAT_RAW_SENSOR; + int format = HAL_PIXEL_FORMAT_RAW16; getResolutionList(format, &rawResolutions, &rawResolutionsCount); @@ -457,7 +457,7 @@ TEST_F(Camera2Test, Capture1Raw) { << test_info->test_case_name() << "." << test_info->name() << " because the optional format was not available: " - << "RAW_SENSOR" << std::endl; + << "RAW16" << std::endl; return; } @@ -581,7 +581,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) { const int32_t *rawResolutions; size_t rawResolutionsCount; - int format = HAL_PIXEL_FORMAT_RAW_SENSOR; + int format = HAL_PIXEL_FORMAT_RAW16; getResolutionList(format, &rawResolutions, &rawResolutionsCount); @@ -593,7 +593,7 @@ TEST_F(Camera2Test, CaptureBurstRaw) { << test_info->test_case_name() << "." << test_info->name() << " because the optional format was not available: " - << "RAW_SENSOR" << std::endl; + << "RAW16" << std::endl; return; } |