summaryrefslogtreecommitdiff
authorbrian.zhu <brian.zhu@amlogic.com>2012-10-10 07:41:41 (GMT)
committer brian.zhu <brian.zhu@amlogic.com>2012-10-10 07:41:41 (GMT)
commitfc07c4ecb18947732add7c583b18a4644b938243 (patch)
treecdfc46c105600031279b0db6dfe5f1eeff37ecc2
parent1c472b1519e72a4dfd5d2c50f1b07dcc62c9c892 (diff)
downloadcamera-fc07c4ecb18947732add7c583b18a4644b938243.zip
camera-fc07c4ecb18947732add7c583b18a4644b938243.tar.gz
camera-fc07c4ecb18947732add7c583b18a4644b938243.tar.bz2
fix take picture crash
Diffstat
-rwxr-xr-xAppCallbackNotifier.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/AppCallbackNotifier.cpp b/AppCallbackNotifier.cpp
index 7842e79..be492bd 100755
--- a/AppCallbackNotifier.cpp
+++ b/AppCallbackNotifier.cpp
@@ -115,6 +115,10 @@ void AppCallbackNotifier::EncoderDoneCb(void* main_jpeg, void* thumb_jpeg, Camer
mRawAvailable = false;
}
+ if (mNotifierState == AppCallbackNotifier::NOTIFIER_STARTED) {
+ mFrameProvider->returnFrame(src, type);
+ }
+
// Send the callback to the application only if the notifier is started and the message is enabled
if(picture && (mNotifierState==AppCallbackNotifier::NOTIFIER_STARTED) &&
(mCameraHal->msgTypeEnabled(CAMERA_MSG_COMPRESSED_IMAGE)))
@@ -163,7 +167,7 @@ void AppCallbackNotifier::EncoderDoneCb(void* main_jpeg, void* thumb_jpeg, Camer
gEncoderQueue.removeItem(src);
encoder.clear();
}
- mFrameProvider->returnFrame(src, type);
+ //mFrameProvider->returnFrame(src, type);
}
LOG_FUNCTION_NAME_EXIT;