android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure shutter callback is called before raw callback.

Browse Source
This commit is contained in:
Wu-cheng Li 2009-07-21 12:28:45 +08:00
parent 3e4574a187
commit a21ec0f3d3
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libcamera2/QualcommCameraHardware.cpp
View File

@ -1263,6 +1263,14 @@ status_t QualcommCameraHardware::takePicture(shutter_callback shutter_cb,
raw_cb, jpeg_cb);
Mutex::Autolock l(&mLock);
// Wait for old snapshot thread to complete.
mSnapshotThreadWaitLock.lock();
while (mSnapshotThreadRunning) {
LOGV("takePicture: waiting for old snapshot thread to complete.");
mSnapshotThreadWait.wait(mSnapshotThreadWaitLock);
LOGV("takePicture: old snapshot thread completed.");
}
stopPreviewInternal();
if (!initRaw(jpeg_cb != NULL)) {
@ -1278,12 +1286,9 @@ status_t QualcommCameraHardware::takePicture(shutter_callback shutter_cb,
mPictureCallbackCookie = user;
}
mSnapshotThreadWaitLock.lock();
while (mSnapshotThreadRunning) {
LOGV("takePicture: waiting for old snapshot thread to complete.");
mSnapshotThreadWait.wait(mSnapshotThreadWaitLock);
LOGV("takePicture: old snapshot thread completed.");
}
mShutterLock.lock();
mShutterPending = true;
mShutterLock.unlock();
pthread_attr_t attr;
pthread_attr_init(&attr);
@ -1554,8 +1559,12 @@ bool QualcommCameraHardware::recordingEnabled()
void QualcommCameraHardware::notifyShutter()
{
if (mShutterCallback)
mShutterLock.lock();
if (mShutterPending && mShutterCallback) {
mShutterCallback(mPictureCallbackCookie);
mShutterPending = false;
}
mShutterLock.unlock();
}
static void receive_shutter_callback()
@ -1572,14 +1581,17 @@ void QualcommCameraHardware::receiveRawPicture()
{
LOGV("receiveRawPicture: E");
int ret,rc,rete;
Mutex::Autolock cbLock(&mCallbackLock);
if (mRawPictureCallback != NULL) {
if(native_get_picture(mCameraControlFd, &mCrop)== false) {
if(native_get_picture(mCameraControlFd, &mCrop) == false) {
LOGE("getPicture failed!");
return;
}
// By the time native_get_picture returns, picture is taken. Call
// shutter callback if cam config thread has not done that.
notifyShutter();
mRawPictureCallback(mRawHeap->mBuffers[0],
mPictureCallbackCookie);
}

3
libcamera2/QualcommCameraHardware.h
View File

@ -168,6 +168,9 @@ private:
friend void *frame_thread(void *user);
void runFrameThread(void *data);
bool mShutterPending;
Mutex mShutterLock;
bool mSnapshotThreadRunning;
Mutex mSnapshotThreadWaitLock;
Condition mSnapshotThreadWait;