diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-19 16:28:08 -0800 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2015-02-19 17:02:48 -0800 |
commit | 64cc1d03596bcda1f2d0bdc35d92546bb03eb406 (patch) | |
tree | f9894cc82cce2c561827a657d15ba8b7b7759769 /media | |
parent | 93dcc45e3cafba4c9082febf19734ccca3dda781 (diff) | |
download | frameworks_base-64cc1d03596bcda1f2d0bdc35d92546bb03eb406.zip frameworks_base-64cc1d03596bcda1f2d0bdc35d92546bb03eb406.tar.gz frameworks_base-64cc1d03596bcda1f2d0bdc35d92546bb03eb406.tar.bz2 |
ImageReader: Switch to RAW16 from RAW_SENSOR
Change-Id: I6362a997b0895686f988896de0463d834354f238
Diffstat (limited to 'media')
-rw-r--r-- | media/jni/android_media_ImageReader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 5406130..cf69b8f 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -430,7 +430,7 @@ static void Image_getLockedBufferInfo(JNIEnv* env, CpuConsumer::LockedBuffer* bu pData = buffer->data; dataSize = Image_getJpegSize(buffer, usingRGBAOverride); break; - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: // Single plane 16bpp bayer data. bytesPerPixel = 2; ALOG_ASSERT(idx == 0, "Wrong index: %d", idx); @@ -517,7 +517,7 @@ static jint Image_imageGetPixelStride(JNIEnv* env, CpuConsumer::LockedBuffer* bu pixelStride = 0; break; case HAL_PIXEL_FORMAT_Y16: - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: case HAL_PIXEL_FORMAT_RGB_565: // Single plane 16bpp data. ALOG_ASSERT(idx == 0, "Wrong index: %d", idx); @@ -584,7 +584,7 @@ static jint Image_imageGetRowStride(JNIEnv* env, CpuConsumer::LockedBuffer* buff rowStride = buffer->stride; break; case HAL_PIXEL_FORMAT_Y16: - case HAL_PIXEL_FORMAT_RAW_SENSOR: + case HAL_PIXEL_FORMAT_RAW16: // In native side, strides are specified in pixels, not in bytes. // Single plane 16bpp bayer data. even width/height, // row stride multiple of 16 pixels (32 bytes) |