From 4b51e51ed8ae22ed51748fd2a59a839c9c656f4e Mon Sep 17 00:00:00 2001
From: Sampath Vangaveti <sampathv@codeaurora.org>
Date: Wed, 30 Sep 2015 20:39:05 +0530
Subject: [PATCH] QCamera2: HAL: Check feature mask for thumbnail reprocess

Issue :
Reprocess for thumbnail is triggered even though
feature mask is zero. So, Config stream is failing.

Fix :
Unmask all the features which are already applied
on online streams(preview/postview).
And then check feature mask for triggering thumbnail
reprocess

Change-Id: I189f558e5a00b4fae4987410296f7d40e1e216f5
---
 camera/QCamera2/HAL/QCameraChannel.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/camera/QCamera2/HAL/QCameraChannel.cpp b/camera/QCamera2/HAL/QCameraChannel.cpp
index 34c4437..32ef247 100644
--- a/camera/QCamera2/HAL/QCameraChannel.cpp
+++ b/camera/QCamera2/HAL/QCameraChannel.cpp
@@ -934,8 +934,12 @@ int32_t QCameraReprocessChannel::addReprocStreamsFromSource(
                 if (!param.needThumbnailReprocess(&feature_mask)) {
                     continue;
                 }
-                //Don't do WNR for thumbnail
-                feature_mask &= ~CAM_QCOM_FEATURE_DENOISE2D;
+                // CAC, SHARPNESS, FLIP and WNR would have been already applied -
+                // on preview/postview stream in realtime. Need not apply again.
+                feature_mask &= ~(CAM_QCOM_FEATURE_DENOISE2D |
+                        CAM_QCOM_FEATURE_CAC |
+                        CAM_QCOM_FEATURE_SHARPNESS |
+                        CAM_QCOM_FEATURE_FLIP);
                 if (!feature_mask) {
                     // Skip thumbnail stream reprocessing since no other
                     //reprocessing is enabled.