diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-07 09:07:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 09:07:13 -0700 |
| commit | 3576742a2bb3dc10bf8256579d600d85f17c3835 (patch) | |
| tree | ac0bc2a73208f4703ce37f2232d49618e9ed2ba9 | |
| parent | 4d85afad335ded1019ec7697b9f37241a839efa1 (diff) | |
| parent | 4d410ede659448557398c84552eb0bf50ef09cbc (diff) | |
| download | frameworks_av-3576742a2bb3dc10bf8256579d600d85f17c3835.zip frameworks_av-3576742a2bb3dc10bf8256579d600d85f17c3835.tar.gz frameworks_av-3576742a2bb3dc10bf8256579d600d85f17c3835.tar.bz2 | |
am 4d410ede: Camera2: Fix off-by-one error in ZSL selection.
* commit '4d410ede659448557398c84552eb0bf50ef09cbc':
Camera2: Fix off-by-one error in ZSL selection.
| -rw-r--r-- | services/camera/libcameraservice/camera2/ZslProcessor.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/camera2/ZslProcessor.cpp b/services/camera/libcameraservice/camera2/ZslProcessor.cpp index 5208574..1937955 100644 --- a/services/camera/libcameraservice/camera2/ZslProcessor.cpp +++ b/services/camera/libcameraservice/camera2/ZslProcessor.cpp @@ -254,11 +254,14 @@ status_t ZslProcessor::pushToReprocess(int32_t requestId) { if (mZslQueueTail != mZslQueueHead) { CameraMetadata request; size_t index = mZslQueueTail; - while (request.isEmpty() && index != mZslQueueHead) { - request = mZslQueue[index].frame; + while (index != mZslQueueHead) { + if (!mZslQueue[index].frame.isEmpty()) { + request = mZslQueue[index].frame; + break; + } index = (index + 1) % kZslBufferDepth; } - if (request.isEmpty()) { + if (index == mZslQueueHead) { ALOGV("%s: ZSL queue has no valid frames to send yet.", __FUNCTION__); return NOT_ENOUGH_DATA; |