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 /modules/usbcamera | |
| 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 'modules/usbcamera')
| -rw-r--r-- | modules/usbcamera/Stream.cpp | 10 | ||||
| -rw-r--r-- | modules/usbcamera/UsbCamera.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
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, |