commit 3ecc52ca6a43e1027319ff0059a0e2747966f239
author Shuzhen Wang <shuzhenwang@google.com> Mon Aug 07 13:28:02 2017 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Mon Aug 07 14:18:21 2017 -0700
tree 76fb6a1aff4413ce5950601ddee2e246f3d2365e
parent 48c509a47e132a995e28f15d644550caf50eb126

QCamera2: HAL3: Avoid blindly invalidating buffers

ImageReader buffers are invalidated when calling lock when buffer is
consumed, and it's not necessary to unconditionally invalidating them
when they return to HAL.

For HAL internal buffers, if they are consumed by reprocessing, they are
invalidated with postproc.

Test: Camera CTS
Bug: 63950311
Change-Id: I80e4a992e29a314dae444db958f8307c8a54fdb6

msm8998/QCamera2/HAL3/QCamera3Stream.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3Stream.cpp b/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
index 083cd2b..3cb2298 100644
--- a/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
@@ -803,13 +803,9 @@
     if (UNLIKELY(mBatchSize)) {
         rc = aggregateBufToBatch(mBufDefs[index]);
     } else {
-        // By default every buffer that goes to camera should be invalidated
-        // except Metadata/Preview/Video buffers
-        if ((getMyType() != CAM_STREAM_TYPE_METADATA) &&
-                (getMyType() != CAM_STREAM_TYPE_PREVIEW) &&
-                (getMyType() != CAM_STREAM_TYPE_VIDEO)) {
-            mBufDefs[index].cache_flags |= CPU_HAS_READ;
-        }
+        // Cache invalidation should happen in lockNextBuffer or during
+        // reprocessing. No need to invalidate every buffer without knowing
+        // which buffer is accessed by CPU.
         rc = mCamOps->qbuf(mCamHandle, mChannelHandle, &mBufDefs[index]);
         if (rc < 0) {
             return FAILED_TRANSACTION;