commit a7f9861dbb790a83631c4710fa3205e8d8ec0218
author Chien-Yu Chen <cychen@google.com> Tue Jun 20 16:54:10 2017 -0700
committer Chien-Yu Chen <cychen@google.com> Wed Jun 21 12:07:17 2017 -0700
tree fa4743f43c821a001a0d60c1c311ebe66f41b3ed
parent 666f51481dea8511cba3c1e20a5bef5f2d8fba83

QCamera3HWI: Separate reprocess shutters

Separate reprocess shutters from regular shutters
so reprocess shutters won't be blocked by regular
shutters.

Test: Camera CTS
Bug: 62232453
Change-Id: I95cfafb549659ce5bd39460273743284023859d8

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 9003437..527115e 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -5512,7 +5512,7 @@
 
     // Let shutter dispatcher and buffer dispatcher know shutter and output buffers are expected
     // for the frame number.
-    mShutterDispatcher.expectShutter(frameNumber);
+    mShutterDispatcher.expectShutter(frameNumber, request->input_buffer != nullptr);
     for (size_t i = 0; i < request->num_output_buffers; i++) {
         mOutputBufferDispatcher.expectBuffer(frameNumber, request->output_buffers[i].stream);
     }
@@ -14883,29 +14883,43 @@
 ShutterDispatcher::ShutterDispatcher(QCamera3HardwareInterface *parent) :
         mParent(parent) {}
 
-void ShutterDispatcher::expectShutter(uint32_t frameNumber)
+void ShutterDispatcher::expectShutter(uint32_t frameNumber, bool isReprocess)
 {
     std::lock_guard<std::mutex> lock(mLock);
-    mShutters.emplace(frameNumber, Shutter());
+
+    if (isReprocess) {
+        mReprocessShutters.emplace(frameNumber, Shutter());
+    } else {
+        mShutters.emplace(frameNumber, Shutter());
+    }
 }
 
 void ShutterDispatcher::markShutterReady(uint32_t frameNumber, uint64_t timestamp)
 {
     std::lock_guard<std::mutex> lock(mLock);
 
-    // Make this frame's shutter ready.
+    std::map<uint32_t, Shutter> *shutters = nullptr;
+
+    // Find the shutter entry.
     auto shutter = mShutters.find(frameNumber);
     if (shutter == mShutters.end()) {
-        // Shutter was already sent.
-        return;
+        shutter = mReprocessShutters.find(frameNumber);
+        if (shutter == mReprocessShutters.end()) {
+            // Shutter was already sent.
+            return;
+        }
+        shutters = &mReprocessShutters;
+    } else {
+        shutters = &mShutters;
     }
 
+    // Make this frame's shutter ready.
     shutter->second.ready = true;
     shutter->second.timestamp = timestamp;
 
     // Iterate throught the shutters and send out shuters until the one that's not ready yet.
-    shutter = mShutters.begin();
-    while (shutter != mShutters.end()) {
+    shutter = shutters->begin();
+    while (shutter != shutters->end()) {
         if (!shutter->second.ready) {
             // If this shutter is not ready, the following shutters can't be sent.
             break;
@@ -14917,7 +14931,7 @@
         msg.message.shutter.timestamp = shutter->second.timestamp;
         mParent->orchestrateNotify(&msg);
 
-        shutter = mShutters.erase(shutter);
+        shutter = shutters->erase(shutter);
     }
 }
 
@@ -14925,6 +14939,7 @@
 {
     std::lock_guard<std::mutex> lock(mLock);
     mShutters.erase(frameNumber);
+    mReprocessShutters.erase(frameNumber);
 }
 
 void ShutterDispatcher::clear()
@@ -14937,7 +14952,16 @@
             __FUNCTION__, shutter.first, shutter.second.ready,
             shutter.second.timestamp);
     }
+
+    // Log errors for stale reprocess shutters.
+    for (auto &shutter : mReprocessShutters) {
+        ALOGE("%s: stale reprocess shutter: frame number %u, ready %d, timestamp %" PRId64,
+            __FUNCTION__, shutter.first, shutter.second.ready,
+            shutter.second.timestamp);
+    }
+
     mShutters.clear();
+    mReprocessShutters.clear();
 }
 
 OutputBufferDispatcher::OutputBufferDispatcher(QCamera3HardwareInterface *parent) :