rockchip: ae and awb convege states are ready. [chromiumos/platform/arc-camera : release-R65-10323.B]

[ChromeOS Commit Bot (Gerrit)]

ChromeOS Commit Bot merged this change.

View Change

Approvals: Ricky Liang: Looks good to me, approved; Ready; Verified

rockchip: ae and awb convege states are ready.

get ae and awb converge states from 3A algorithm results.

BUG=b:69276988
TEST=android.hardware.camera2.cts.StillCaptureTest#
      testAePrecaptureTriggerCancelJpegCapture

Change-Id: I701bd0e3687855b6cdcd6b93c53b977fcfcfcd0e
Signed-off-by: ZhongYiChong <z...@rock-chips.com>
Previous-Reviewed-on: https://chromium-review.googlesource.com/853814
(cherry picked from commit bc2866bc367370589e3e05f26d0d50145d8f8634)
Reviewed-on: https://chromium-review.googlesource.com/945277
Tested-by: Ricky Liang <jcl...@chromium.org>
Reviewed-by: Ricky Liang <jcl...@chromium.org>
Commit-Queue: Ricky Liang <jcl...@chromium.org>
---
M hal/rockchip/common/3a/RkAEStateMachine.cpp
M hal/rockchip/common/3a/RkAWBStateMachine.cpp
2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/hal/rockchip/common/3a/RkAEStateMachine.cpp b/hal/rockchip/common/3a/RkAEStateMachine.cpp
index 327e8fe..f343b38 100644
--- a/hal/rockchip/common/3a/RkAEStateMachine.cpp
+++ b/hal/rockchip/common/3a/RkAEStateMachine.cpp
@@ -272,9 +272,7 @@
     case ANDROID_CONTROL_AE_STATE_SEARCHING:
     case ANDROID_CONTROL_AE_STATE_CONVERGED:
     case ANDROID_CONTROL_AE_STATE_FLASH_REQUIRED:
-        // HACK: for capture, since ae status is not ready yet
-        // if (aeResults.converged) {
-        if (!aeResults.converged) {
+         if (aeResults.converged) {
             mEvChanged = false; // converged -> reset
             if (mLastAeControls.aeLock) {
                 mCurrentAeState = ANDROID_CONTROL_AE_STATE_LOCKED;
@@ -293,9 +291,7 @@
         }
         break;
     case ANDROID_CONTROL_AE_STATE_PRECAPTURE:
-        // HACK: for capture, since ae status is not ready yet
-        // if (aeResults.converged) {
-        if (!aeResults.converged) {
+         if (aeResults.converged) {
             mEvChanged = false; // converged -> reset
             if (mLastAeControls.aeLock) {
                 mCurrentAeState = ANDROID_CONTROL_AE_STATE_LOCKED;
diff --git a/hal/rockchip/common/3a/RkAWBStateMachine.cpp b/hal/rockchip/common/3a/RkAWBStateMachine.cpp
index 7a92abe..ad6d28f 100644
--- a/hal/rockchip/common/3a/RkAWBStateMachine.cpp
+++ b/hal/rockchip/common/3a/RkAWBStateMachine.cpp
@@ -225,9 +225,7 @@
         case ANDROID_CONTROL_AWB_STATE_INACTIVE:
         case ANDROID_CONTROL_AWB_STATE_SEARCHING:
         case ANDROID_CONTROL_AWB_STATE_CONVERGED:
-            // HACK: for capture, since awb status is not ready yet
-            // if (awbResults.converged)
-            if (!awbResults.converged)
+            if (awbResults.converged)
                 mCurrentAwbState = ANDROID_CONTROL_AWB_STATE_CONVERGED;
             else
                 mCurrentAwbState = ANDROID_CONTROL_AWB_STATE_SEARCHING;

To view, visit change 945277. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: chromiumos/platform/arc-camera

Gerrit-Branch: release-R65-10323.B

Gerrit-Change-Id: I701bd0e3687855b6cdcd6b93c53b977fcfcfcd0e

Gerrit-Change-Number: 945277

Gerrit-PatchSet: 2

Gerrit-Owner: Ricky Liang <jcl...@chromium.org>

Gerrit-Reviewer: ChromeOS Commit Bot <chromeos-...@chromium.org>

Gerrit-Reviewer: Jeffy Chen <jeffy...@rock-chips.com>

Gerrit-Reviewer: Ricky Liang <jcl...@chromium.org>

Gerrit-Reviewer: yichong zhong <z...@rock-chips.com>

Gerrit-MessageType: merged