diff options
-rw-r--r-- | modules/camera/ExampleCamera.cpp | 2 | ||||
-rw-r--r-- | modules/camera/Stream.cpp | 10 | ||||
-rw-r--r-- | modules/gralloc/gralloc.cpp | 2 | ||||
-rw-r--r-- | modules/usbcamera/Stream.cpp | 10 | ||||
-rw-r--r-- | modules/usbcamera/UsbCamera.cpp | 2 | ||||
-rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 2 | ||||
-rw-r--r-- | tests/camera2/CameraStreamTests.cpp | 6 | ||||
-rw-r--r-- | tests/camera2/camera2.cpp | 10 |
8 files changed, 20 insertions, 24 deletions
diff --git a/modules/camera/ExampleCamera.cpp b/modules/camera/ExampleCamera.cpp index ca28b99..d873321 100644 --- a/modules/camera/ExampleCamera.cpp +++ b/modules/camera/ExampleCamera.cpp @@ -92,7 +92,7 @@ camera_metadata_t *ExampleCamera::initStaticInfo() /* android.scaler */ int32_t android_scaler_available_formats[] = { - HAL_PIXEL_FORMAT_RAW_SENSOR, + HAL_PIXEL_FORMAT_RAW16, HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_RGBA_8888, HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp index 90ad30b..e0099b6 100644 --- a/modules/camera/Stream.cpp +++ b/modules/camera/Stream.cpp @@ -117,10 +117,6 @@ const char* Stream::formatToString(int format) return "RGB 888"; case HAL_PIXEL_FORMAT_RGB_565: return "RGB 565"; - case HAL_PIXEL_FORMAT_sRGB_A_8888: - return "sRGB A 8888"; - case HAL_PIXEL_FORMAT_sRGB_X_8888: - return "sRGB B 8888"; case HAL_PIXEL_FORMAT_Y8: return "Y8"; case HAL_PIXEL_FORMAT_Y16: @@ -133,8 +129,10 @@ const char* Stream::formatToString(int format) return "NV21"; case HAL_PIXEL_FORMAT_YCbCr_422_I: return "YUY2"; - case HAL_PIXEL_FORMAT_RAW_SENSOR: - return "RAW SENSOR"; + case HAL_PIXEL_FORMAT_RAW10: + return "RAW10"; + case HAL_PIXEL_FORMAT_RAW16: + return "RAW16"; case HAL_PIXEL_FORMAT_BLOB: return "BLOB"; case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp index bdc789d..a9fbc80 100644 --- a/modules/gralloc/gralloc.cpp +++ b/modules/gralloc/gralloc.cpp @@ -217,7 +217,7 @@ static int gralloc_alloc(alloc_device_t* dev, bpp = 3; break; case HAL_PIXEL_FORMAT_RGB_565: - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: bpp = 2; break; default: diff --git a/modules/usbcamera/Stream.cpp b/modules/usbcamera/Stream.cpp index a3fefa3..f56866e 100644 --- a/modules/usbcamera/Stream.cpp +++ b/modules/usbcamera/Stream.cpp @@ -98,10 +98,6 @@ const char* Stream::formatToString(int format) { return "RGB 888"; case HAL_PIXEL_FORMAT_RGB_565: return "RGB 565"; - case HAL_PIXEL_FORMAT_sRGB_A_8888: - return "sRGB A 8888"; - case HAL_PIXEL_FORMAT_sRGB_X_8888: - return "sRGB B 8888"; case HAL_PIXEL_FORMAT_Y8: return "Y8"; case HAL_PIXEL_FORMAT_Y16: @@ -114,8 +110,10 @@ const char* Stream::formatToString(int format) { return "NV21"; case HAL_PIXEL_FORMAT_YCbCr_422_I: return "YUY2"; - case HAL_PIXEL_FORMAT_RAW_SENSOR: - return "RAW SENSOR"; + case HAL_PIXEL_FORMAT_RAW10: + return "RAW10"; + case HAL_PIXEL_FORMAT_RAW16: + return "RAW16"; case HAL_PIXEL_FORMAT_BLOB: return "BLOB"; case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: diff --git a/modules/usbcamera/UsbCamera.cpp b/modules/usbcamera/UsbCamera.cpp index ded3e92..82a1145 100644 --- a/modules/usbcamera/UsbCamera.cpp +++ b/modules/usbcamera/UsbCamera.cpp @@ -94,7 +94,7 @@ int UsbCamera::initStaticInfo() { /* android.scaler */ int32_t android_scaler_available_formats[] = { - HAL_PIXEL_FORMAT_RAW_SENSOR, + HAL_PIXEL_FORMAT_RAW16, HAL_PIXEL_FORMAT_BLOB, HAL_PIXEL_FORMAT_RGBA_8888, HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 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; } |