From a97dfeb91aae9569ff11a5a40634e2960c03915e Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Thu, 19 Feb 2015 16:26:13 -0800 Subject: Camera: Remove RAW_SENSOR in favor of RAW16 Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880 --- camera/CameraParameters.cpp | 2 +- camera/tests/ProCameraTests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'camera') diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index e5e4e90..3dbf75e 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -526,7 +526,7 @@ int CameraParameters::previewFormatToEnum(const char* format) { !strcmp(format, PIXEL_FORMAT_RGBA8888) ? HAL_PIXEL_FORMAT_RGBA_8888 : // RGB8888 !strcmp(format, PIXEL_FORMAT_BAYER_RGGB) ? - HAL_PIXEL_FORMAT_RAW_SENSOR : // Raw sensor data + HAL_PIXEL_FORMAT_RAW16 : // Raw sensor data -1; } diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp index 1f5867a..0ea7da6 100644 --- a/camera/tests/ProCameraTests.cpp +++ b/camera/tests/ProCameraTests.cpp @@ -469,7 +469,7 @@ protected: CMP_STR(NV16, YCbCr_422_SP); CMP_STR(NV21, YCrCb_420_SP); CMP_STR(YUY2, YCbCr_422_I); - CMP_STR(RAW, RAW_SENSOR); + CMP_STR(RAW, RAW16); CMP_STR(RGBA, RGBA_8888); std::cerr << "Unknown format string " << str << std::endl; -- cgit v1.1