diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-20 01:03:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-20 01:03:42 +0000 |
| commit | 7ecd2601c0b48df7a3b983d2a7027918bc929328 (patch) | |
| tree | 5fbbbf58de1fedb9c4380b66d9b5536a7bb57efe /media | |
| parent | 081eba6e666c909106505fbcd33dc4cece59ed1a (diff) | |
| parent | 64cc1d03596bcda1f2d0bdc35d92546bb03eb406 (diff) | |
| download | frameworks_base-7ecd2601c0b48df7a3b983d2a7027918bc929328.zip frameworks_base-7ecd2601c0b48df7a3b983d2a7027918bc929328.tar.gz frameworks_base-7ecd2601c0b48df7a3b983d2a7027918bc929328.tar.bz2 | |
Merge "ImageReader: Switch to RAW16 from RAW_SENSOR"
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) |