summaryrefslogtreecommitdiff
path: root/media/jni/android_media_ImageReader.cpp
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-09-30 03:42:13 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-09-30 13:54:20 -0700
commit0c79884076405bc36c0fb4f1bce27f883b97d64c (patch)
treed340d650e22d13fdd346c2d5504a8ee798a4170f /media/jni/android_media_ImageReader.cpp
parentbc156ba430d286aaab8deb7bbb3bccc655cd2e92 (diff)
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Bug: 17675571 - All of the mistakes were made. Unmake them. Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
Diffstat (limited to 'media/jni/android_media_ImageReader.cpp')
-rw-r--r--media/jni/android_media_ImageReader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index f4eb4594e198..aaff9a2ce217 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -294,7 +294,7 @@ static uint32_t Image_getJpegSize(CpuConsumer::LockedBuffer* buffer, bool usingR
uint8_t* jpegBuffer = buffer->data;
if (usingRGBAOverride) {
- width *= 4;
+ width = (buffer->width + buffer->stride * (buffer->height - 1)) * 4;
}
// First check for JPEG transport header at the end of the buffer