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

resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp.

Browse Source 
Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
This commit is contained in:
Ruben Brunk
2015-01-09 17:19:45 -08:00
parent f3ac99f2e0 0f647c19f9
commit 8f8dc4882b
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/jni/android_hardware_camera2_DngCreator.cpp
View File

@@ -37,6 +37,17 @@
#include <img_utils/StripSource.h> #include <img_utils/StripSource.h>
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include <utils/Log.h>
#include <utils/Errors.h>
#include <utils/StrongPointer.h>
#include <utils/RefBase.h>
#include <utils/Vector.h>
#include <cutils/properties.h>
#include <string.h>
#include <inttypes.h>
#include "android_runtime/AndroidRuntime.h"
#include "android_runtime/android_hardware_camera2_CameraMetadata.h" #include "android_runtime/android_hardware_camera2_CameraMetadata.h"
#include <jni.h> #include <jni.h>
@@ -360,15 +371,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;
@@ -468,15 +482,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()) {