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

am 8c52d9a0: Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev

Browse Source 
* commit '8c52d9a092452837e7222d8416c3b4accf9a99d7':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
This commit is contained in:
Ruben Brunk
2015-01-09 23:37:07 +00:00
committed by Android Git Automerger
parent 68dabada9e 8c52d9a092
commit 0f647c19f9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_hardware_camera2_DngCreator.cpp
View File

@@ -35,6 +35,7 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include <string.h> #include <string.h>
#include <inttypes.h>
#include "android_runtime/AndroidRuntime.h" #include "android_runtime/AndroidRuntime.h"
#include "android_runtime/android_hardware_camera2_CameraMetadata.h" #include "android_runtime/android_hardware_camera2_CameraMetadata.h"
@@ -360,15 +361,18 @@ ssize_t JniInputByteBuffer::read(uint8_t* buf, size_t offset, size_t count) {
realCount = count; realCount = count;
} }
mEnv->CallObjectMethod(mInBuf, gInputByteBufferClassInfo.mGetMethod, mByteArray, 0, jobject chainingBuf = mEnv->CallObjectMethod(mInBuf, gInputByteBufferClassInfo.mGetMethod, mByteArray, 0,
realCount); realCount);
mEnv->DeleteLocalRef(chainingBuf);
if (mEnv->ExceptionCheck()) { if (mEnv->ExceptionCheck()) {
ALOGE("%s: Exception while reading from input into byte buffer.", __FUNCTION__);
return BAD_VALUE; return BAD_VALUE;
} }
mEnv->GetByteArrayRegion(mByteArray, 0, realCount, reinterpret_cast<jbyte*>(buf + offset)); mEnv->GetByteArrayRegion(mByteArray, 0, realCount, reinterpret_cast<jbyte*>(buf + offset));
if (mEnv->ExceptionCheck()) { if (mEnv->ExceptionCheck()) {
ALOGE("%s: Exception while reading from byte buffer.", __FUNCTION__);
return BAD_VALUE; return BAD_VALUE;
} }
return realCount; return realCount;
@@ -469,15 +473,17 @@ status_t InputStripSource::writeToStream(Output& stream, uint32_t count) {
for (uint32_t i = 0; i < mHeight; ++i) { for (uint32_t i = 0; i < mHeight; ++i) {
size_t rowFillAmt = 0; size_t rowFillAmt = 0;
size_t rowSize = mPixStride; size_t rowSize = mRowStride;
while (rowFillAmt < mRowStride) { while (rowFillAmt < mRowStride) {
ssize_t bytesRead = mInput->read(rowBytes, rowFillAmt, rowSize); ssize_t bytesRead = mInput->read(rowBytes, rowFillAmt, rowSize);
if (bytesRead <= 0) { if (bytesRead <= 0) {
if (bytesRead == NOT_ENOUGH_DATA || bytesRead == 0) { if (bytesRead == NOT_ENOUGH_DATA || bytesRead == 0) {
ALOGE("%s: Early EOF on row %" PRIu32 ", received bytesRead %zd",
__FUNCTION__, i, bytesRead);
jniThrowExceptionFmt(mEnv, "java/io/IOException", jniThrowExceptionFmt(mEnv, "java/io/IOException",
"Early EOF encountered, not enough pixel data for image of size %u", "Early EOF encountered, not enough pixel data for image of size %"
fullSize); PRIu32, fullSize);
bytesRead = NOT_ENOUGH_DATA; bytesRead = NOT_ENOUGH_DATA;
} else { } else {
if (!mEnv->ExceptionCheck()) { if (!mEnv->ExceptionCheck()) {