diff options
| author | Jeong-Seok Yang <jseok.yang@samsung.com> | 2011-01-27 15:04:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 15:04:11 -0800 |
| commit | ff93a1bc8935a649893782d24bffa940ba450a2f (patch) | |
| tree | 30a3bd87fb46ba2f9cb727c9455d494bae617d9a /libcamera | |
| parent | d66488ef3647d698bd252b43b1eb0eb4f9fafc72 (diff) | |
| parent | 68733d5982bc905c9668547659d84e75a908a996 (diff) | |
| download | device_samsung_crespo-ff93a1bc8935a649893782d24bffa940ba450a2f.zip device_samsung_crespo-ff93a1bc8935a649893782d24bffa940ba450a2f.tar.gz device_samsung_crespo-ff93a1bc8935a649893782d24bffa940ba450a2f.tar.bz2 | |
am 68733d59: libcamera: Add lock for recording video
* commit '68733d5982bc905c9668547659d84e75a908a996':
libcamera: Add lock for recording video
Diffstat (limited to 'libcamera')
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 5 | ||||
| -rw-r--r-- | libcamera/SecCameraHWInterface.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index 7e36a9d..50d43a0 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -510,6 +510,7 @@ int CameraHardwareSec::previewThread() mDataCb(CAMERA_MSG_PREVIEW_FRAME, buffer, mCallbackCookie); } + Mutex::Autolock lock(mRecordLock); if (mRecordRunning == true) { index = mSecCamera->getRecordFrame(); if (index < 0) { @@ -684,6 +685,8 @@ status_t CameraHardwareSec::startRecording() { LOGV("%s :", __func__); + Mutex::Autolock lock(mRecordLock); + if (mRecordRunning == false) { if (mSecCamera->startRecord() < 0) { LOGE("ERR(%s):Fail on mSecCamera->startRecord()", __func__); @@ -698,6 +701,8 @@ void CameraHardwareSec::stopRecording() { LOGV("%s :", __func__); + Mutex::Autolock lock(mRecordLock); + if (mRecordRunning == true) { if (mSecCamera->stopRecord() < 0) { LOGE("ERR(%s):Fail on mSecCamera->stopRecord()", __func__); diff --git a/libcamera/SecCameraHWInterface.h b/libcamera/SecCameraHWInterface.h index 724d1bc..75526c6 100644 --- a/libcamera/SecCameraHWInterface.h +++ b/libcamera/SecCameraHWInterface.h @@ -201,6 +201,7 @@ private: int32_t mMsgEnabled; bool mRecordRunning; + mutable Mutex mRecordLock; int mPostViewWidth; int mPostViewHeight; int mPostViewSize; |