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

am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.

Browse Source 
* commit '5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b':
  Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
This commit is contained in:
Wu-cheng Li
2011-09-21 02:21:26 -07:00
committed by Android Git Automerger
parent eb15bb31c7 5f0ef5fb0c
commit a08ff8f3a7
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/jni/android_hardware_Camera.cpp
View File

@@ -234,34 +234,23 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
if (heapBase != NULL) {
const jbyte* data = reinterpret_cast<const jbyte*>(heapBase + offset);
if (!mManualBufferMode) {
LOGV("Allocating callback buffer");
obj = env->NewByteArray(size);
} else {
switch (msgType) {
case CAMERA_MSG_PREVIEW_FRAME: {
obj = getCallbackBuffer(env, &mCallbackBuffers, size);
if (msgType == CAMERA_MSG_RAW_IMAGE) {
obj = getCallbackBuffer(env, &mRawImageCallbackBuffers, size);
} else if (msgType == CAMERA_MSG_PREVIEW_FRAME && mManualBufferMode) {
obj = getCallbackBuffer(env, &mCallbackBuffers, size);
if (mCallbackBuffers.isEmpty()) {
LOGV("Out of buffers, clearing callback!");
mCamera->setPreviewCallbackFlags(CAMERA_FRAME_CALLBACK_FLAG_NOOP);
mManualCameraCallbackSet = false;
if (mCallbackBuffers.isEmpty()) {
LOGV("Out of buffers, clearing callback!");
mCamera->setPreviewCallbackFlags(CAMERA_FRAME_CALLBACK_FLAG_NOOP);
mManualCameraCallbackSet = false;
if (obj == NULL) {
return;
}
}
break;
}
case CAMERA_MSG_RAW_IMAGE: {
obj = getCallbackBuffer(env, &mRawImageCallbackBuffers, size);
break;
}
default: {
jniThrowRuntimeException(env, "Unsupported message type");
if (obj == NULL) {
return;
}
}
} else {
LOGV("Allocating callback buffer");
obj = env->NewByteArray(size);
}
if (obj == NULL) {