From e69efbbabf26569ddd0ca12dda44d830a251a07f Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Fri, 6 Mar 2015 13:19:36 -0800 Subject: Replace/rename old HAL graphics formats - Replace RAW_SENSOR with RAW16 - Remove sRGB formats Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1 --- modules/camera/ExampleCamera.cpp | 2 +- modules/camera/Stream.cpp | 10 ++++------ modules/gralloc/gralloc.cpp | 2 +- modules/usbcamera/Stream.cpp | 10 ++++------ modules/usbcamera/UsbCamera.cpp | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) (limited to 'modules') 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, -- cgit v1.1