commit 9257e29ea5fa955cd0c135d584c2ccc452189712
author Younghwan Joo <yhwan.joo@samsung.com> Sat Sep 08 21:11:18 2012 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> Mon Sep 10 13:08:31 2012 -0700
tree 263ae85d01b97faf2b48ad32ae31d1e583b22f30
parent 2bbbf0c1c2e7170c99b188434147852f1de577c4

hardware: samsung_slsi: libcamera2: change flash sequence

This patch is to change flash sequence
- seperate ae/awb lock and flashMode checking routine
- apply flash status to EXIF

Change-Id: I02796340ad317327f22b2e833058a3665ef1334e
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>

libcamera2/ExynosCameraHWInterface2.h

diff --git a/libcamera2/ExynosCameraHWInterface2.h b/libcamera2/ExynosCameraHWInterface2.h
index a5929b8..1afd72c 100644
--- a/libcamera2/ExynosCameraHWInterface2.h
+++ b/libcamera2/ExynosCameraHWInterface2.h
@@ -131,7 +131,8 @@
 enum is_flash_scenario_state {
     IS_FLASH_ON = 1,
     IS_FLASH_ON_DONE = 2,
-    IS_FLASH_AUTO_AE_AWB_LOCK = 10,
+    IS_FLASH_AE_AWB_LOCK_WAIT = 10,
+    IS_FLASH_AUTO_WAIT = 10,
     IS_FLASH_CAPTURE,
     IS_FLASH_CAPTURE_WAIT,
     IS_FLASH_CAPTURE_JPEG,
@@ -145,6 +146,7 @@
     IS_FLASH_AF_ON_DONE,
     IS_FLASH_AF_AUTO_AE_AWB_LOCK,
     IS_FLASH_AF_AUTO_AE_AWB_LOCK_WAIT,
+    IS_FLASH_AF_AUTO_OFF_WAIT,
     IS_FLASH_AF_AUTO_END,
     IF_FLASH_AF_OFF,
     IS_FLASH_AF_MAX
@@ -586,8 +588,8 @@
     void            m_setExifChangedAttribute(exif_attribute_t *exifInfo, ExynosRect *rect,
                          camera2_shot *currentEntry);
     void            flashSetter(struct camera2_shot_ext * shot_ext);
-    void            flashListener(struct camera2_shot_ext * shot_ext);
-    void            flashListenerCapture(struct camera2_shot_ext * shot_ext);
+    void            flashListenerSensor(struct camera2_shot_ext * shot_ext);
+    void            flashListenerISP(struct camera2_shot_ext * shot_ext);
     void               *m_exynosPictureCSC;
     void               *m_exynosVideoCSC;