diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-08-27 23:47:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-27 23:47:43 +0000 |
| commit | 01b9256a1358110ed718c1a83c2a1808d4afbb92 (patch) | |
| tree | c22693bee5808f71ff4412dc9c5cafef9067c391 /services/camera | |
| parent | 13d98f419c614c5d389b06232ff99f7fe00dabf7 (diff) | |
| parent | 690895cfe0f128ee3fc375a357ab99b0b98394b6 (diff) | |
| download | frameworks_av-01b9256a1358110ed718c1a83c2a1808d4afbb92.zip frameworks_av-01b9256a1358110ed718c1a83c2a1808d4afbb92.tar.gz frameworks_av-01b9256a1358110ed718c1a83c2a1808d4afbb92.tar.bz2 | |
Merge "cameraservice: decrease zsl metadata queue size by 1" into lmp-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp index 3999047..2d31275 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp @@ -78,8 +78,12 @@ ZslProcessor3::ZslProcessor3( ALOGV("%s: Initialize buffer queue and frame list depth based on max pipeline depth (%d)", __FUNCTION__, pipelineMaxDepth); - mBufferQueueDepth = pipelineMaxDepth + 1; - mFrameListDepth = pipelineMaxDepth + 1; + // Need to keep buffer queue longer than metadata queue because sometimes buffer arrives + // earlier than metadata which causes the buffer corresponding to oldest metadata being + // removed. + mFrameListDepth = pipelineMaxDepth; + mBufferQueueDepth = mFrameListDepth + 1; + mZslQueue.insertAt(0, mBufferQueueDepth); mFrameList.insertAt(0, mFrameListDepth); |