diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-01-16 21:01:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 21:01:24 +0000 |
| commit | b88450ebc784b5cf4c1e243280aeb3570d2e0bf8 (patch) | |
| tree | 24ba6782f3cd685a77cef947a2765ef1223ff106 | |
| parent | 11172b8a54cbc5b2a5832f794ffebd4e4d759da7 (diff) | |
| parent | f2eb959463914d0928d20fda3fb860365e57ea9f (diff) | |
| download | exynos5-b88450ebc784b5cf4c1e243280aeb3570d2e0bf8.tar.gz | |
am f2eb9594: manta: libcamera2: fix copy-and-paste regression
* commit 'f2eb959463914d0928d20fda3fb860365e57ea9f':
manta: libcamera2: fix copy-and-paste regression
| -rw-r--r-- | libcamera2/ExynosCameraHWInterface2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp index cead739..fa6c8d3 100644 --- a/libcamera2/ExynosCameraHWInterface2.cpp +++ b/libcamera2/ExynosCameraHWInterface2.cpp @@ -3529,7 +3529,8 @@ void ExynosCameraHWInterface2::m_sensorThreadFunc(SignalDrivenThread * self) if (shot_ext->shot.ctl.request.outputStreams[0] & STREAM_MASK_JPEG) { void *shot = shot_ext; if (m_ctlInfo.flash.m_flashCnt < IS_FLASH_STATE_CAPTURE) { - shot = m_requestManager->GetInternalShotExtByFrameCnt(m_reprocessingFrameCnt); + shot = m_requestManager->GetInternalShotExtByFrameCnt( + shot_ext->shot.ctl.request.frameCount); if (!shot) { // m_isRequestQueueNull reuse current ALOGD("(%s): request_scc: " "m_reprocessingFrameCnt missing, using shot_ext", |