Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: fix expectation of BLOB buffer size" into nyc-dev

Browse Source
This commit is contained in:
Yin-Chia Yeh
2016-03-15 00:16:57 +00:00
committed by Android (Google) Code Review
parent 13e22319e4 7b79090252
commit b00df4192b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/android_media_Utils.cpp
View File

@@ -735,8 +735,15 @@ status_t getLockedImageInfo(LockedImage* buffer, int idx,
case HAL_PIXEL_FORMAT_BLOB:
// Used for JPEG data, height must be 1, width == size, single plane.
LOG_ALWAYS_FATAL_IF(idx != 0, "Wrong index: %d", idx);
LOG_ALWAYS_FATAL_IF(buffer->height != 1,
"BLOB format buffer should has height value %d", buffer->height);
// When RGBA override is being used, buffer height will be equal to width
if (usingRGBAOverride) {
LOG_ALWAYS_FATAL_IF(buffer->height != buffer->width,
"RGBA override BLOB format buffer should have height == width");
} else {
LOG_ALWAYS_FATAL_IF(buffer->height != 1,
"BLOB format buffer should have height value 1");
}
pData = buffer->data;
dataSize = Image_getJpegSize(buffer, usingRGBAOverride);