commit 3a6556782f9a98ba6fd036529ea96bde523f97b5
author Mansoor Aftab <maftab@codeaurora.org> Tue Aug 04 22:43:49 2015 -0700
committer Zhijun He <zhijunhe@google.com> Tue Aug 04 23:07:21 2015 -0700
tree 3c870f720318b9cec089a833d6b51a25c9cc8a88
parent fbc4c285cddb731b23f4696125dfc3cc43de4a6e

Camera3: Fix condition check for PPROC bypass

We should bypass PPROC if both noise reduction and sharpening
mode is ZSL.

Change-Id: I1d1ee1e28c2e8848e8817830a9ad1240ee211af7

QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/QCamera2/HAL3/QCamera3Channel.cpp b/QCamera2/HAL3/QCamera3Channel.cpp
index 4179854..0755fb6 100644
--- a/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/QCamera2/HAL3/QCamera3Channel.cpp
@@ -2522,12 +2522,13 @@
         //gCamCapability[cameraId]->max_downscale_factor
     }
 
-    if (!(CAM_EDGE_MODE_OFF == mEdgeMode.edge_mode) ||
-            (CAM_EDGE_MODE_ZERO_SHUTTER_LAG == mEdgeMode.edge_mode)) {
+    if ((CAM_EDGE_MODE_OFF != mEdgeMode.edge_mode) &&
+            (CAM_EDGE_MODE_ZERO_SHUTTER_LAG != mEdgeMode.edge_mode)) {
         ppNeeded = true;
     }
-    if (!((CAM_NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG == mNoiseRedMode) ||
-             (CAM_NOISE_REDUCTION_MODE_OFF == mNoiseRedMode))) {
+    if ((CAM_NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG != mNoiseRedMode) &&
+            (CAM_NOISE_REDUCTION_MODE_OFF != mNoiseRedMode) &&
+            (CAM_NOISE_REDUCTION_MODE_MINIMAL != mNoiseRedMode)) {
         ppNeeded = true;
     }