diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-20 01:04:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-20 01:04:48 +0000 |
| commit | 9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05 (patch) | |
| tree | b91d3bdf39760c82e54ab0be64c74d277f9a57fd /camera | |
| parent | 9d19e392f61de3e8cd365afa12d7836bd3721602 (diff) | |
| parent | a97dfeb91aae9569ff11a5a40634e2960c03915e (diff) | |
| download | frameworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.zip frameworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.tar.gz frameworks_av-9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05.tar.bz2 | |
Merge "Camera: Remove RAW_SENSOR in favor of RAW16"
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraParameters.cpp | 2 | ||||
| -rw-r--r-- | camera/tests/ProCameraTests.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 6212678..24b2327 100644 --- a/camera/tests/ProCameraTests.cpp +++ b/camera/tests/ProCameraTests.cpp @@ -475,7 +475,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; |