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 /services/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 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 4ac5166..5dbdeb2 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -1959,7 +1959,7 @@ size_t Camera2Client::calculateBufferSize(int width, int height, return width * height * 2; case HAL_PIXEL_FORMAT_RGBA_8888: return width * height * 4; - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: return width * height * 2; default: ALOGE("%s: Unknown preview format: %x", diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 4f4cfb0..87e0132 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -182,9 +182,9 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { supportedPreviewFormats += CameraParameters::PIXEL_FORMAT_YUV420SP; break; - // Not advertizing JPEG, RAW_SENSOR, etc, for preview formats + // Not advertizing JPEG, RAW16, etc, for preview formats case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: case HAL_PIXEL_FORMAT_BLOB: addComma = false; break; @@ -2253,7 +2253,7 @@ const char* Parameters::formatEnumToString(int format) { case HAL_PIXEL_FORMAT_RGBA_8888: // RGBA8888 fmt = CameraParameters::PIXEL_FORMAT_RGBA8888; break; - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: ALOGW("Raw sensor preview format requested."); fmt = CameraParameters::PIXEL_FORMAT_BAYER_RGGB; break; |