diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-07-24 14:56:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-24 14:56:33 -0700 |
| commit | 9bcc890e7dde4c994a52d30246a64a33bb8a99f9 (patch) | |
| tree | a93bc9b8b8d79edc0cc1218a99aeaf6df454de1c /libcamera | |
| parent | abc28ea135621af9735021ea27763cdf624aada5 (diff) | |
| parent | 4626825c2f52c2875735b34e84301cf759c2d571 (diff) | |
| download | device_samsung_crespo-9bcc890e7dde4c994a52d30246a64a33bb8a99f9.zip device_samsung_crespo-9bcc890e7dde4c994a52d30246a64a33bb8a99f9.tar.gz device_samsung_crespo-9bcc890e7dde4c994a52d30246a64a33bb8a99f9.tar.bz2 | |
Merge "Fix black preview in Goggles."
Diffstat (limited to 'libcamera')
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index b400be0..d0ea6a3 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -484,17 +484,6 @@ void CameraHardwareSec::enableMsgType(int32_t msgType) __func__, msgType, mMsgEnabled); mMsgEnabled |= msgType; - mPreviewLock.lock(); - if ((msgType & (CAMERA_MSG_PREVIEW_FRAME | CAMERA_MSG_VIDEO_FRAME)) && - mPreviewRunning && mPreviewStartDeferred) { - LOGV("%s: starting deferred preview", __func__); - if (startPreviewInternal() == OK) { - mPreviewStartDeferred = false; - mPreviewCondition.signal(); - } - } - mPreviewLock.unlock(); - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); } @@ -747,9 +736,7 @@ status_t CameraHardwareSec::startPreview() mPreviewRunning = true; mPreviewStartDeferred = false; - if (!mPreviewWindow && - !(mMsgEnabled & CAMERA_MSG_PREVIEW_FRAME) && - !(mMsgEnabled & CAMERA_MSG_VIDEO_FRAME)) { + if (!mPreviewWindow) { LOGI("%s : deferring", __func__); mPreviewStartDeferred = true; mPreviewLock.unlock(); |