From a10147e64d3814e2a8800a5cb7a713fcb219a2b5 Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Wed, 12 Jul 2023 09:41:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A0=B9=E6=8D=AE=E5=91=A8=E6=80=BB=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=9C=80=E5=B0=8F350ms,=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7420ms=E4=B9=8B=E9=97=B4=E8=B0=83=E6=95=B4AE=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9AE=20table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cardv/SrcCode/FastFlow/flow_preview.c      | 18 +++++++++---------
 .../cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c  | 17 ++++++++++++++++-
 .../cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h  |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c
index 2e128f624..65f85f840 100644
--- a/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c
+++ b/rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c
@@ -1100,15 +1100,15 @@ static UINT32 ae_adc_tbl[57][3] = {
 	{945,  99, 1130},
 	{930,  103, 1000},
 	{910,  126, 1070},
-	{900,  135, 1020},
-	{885,  203, 1010},
-	{870,  381, 1020},
-	{859,  499, 1000},
-	{854,  512, 1010},
-	{849,  826, 1010},
-	{845,  1021, 1000},
-	{842,  1128, 1000},
-	{839,  1372, 1000},
+	{900,  203, 1020},
+	{885,  267, 1000},
+	{870,  320, 1010},
+	{859,  524, 1000},
+	{854,  826, 1000},
+	{849,  1128, 1000},
+	{845,  1372, 1000},
+	{842,  2236, 1000},
+	{839,  3459, 1000},
 	{830,  2236, 1000},
 	{828,  3459, 1000},
 	{824,  5213, 1000},
diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
index 96b6b03f8..5b1ae84bb 100644
--- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
+++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
@@ -1446,7 +1446,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
 
 
 	PhotoFast_SliceEncode2_Open(vprc_path, max_cnt);
-	nvt_cmdsys_runcmd("ae set_speed 0 128 600 600 100 ");
+	nvt_cmdsys_runcmd("ae set_speed 0 128 700 700 100 ");
 
 #endif
 #if (FASTCAPTURE_AE_DEBUG == 1)
@@ -1999,6 +1999,7 @@ void Set_NIGHTMODE(UINT32 id, UINT8 isSnapVideo)
 void Set_AEMODE(UINT32 id)
 {
     AET_MANUAL ae_manual = {0};
+	AWBT_MANUAL manual = {0};
 	AWBT_STATUS status = {0};
     ISPT_C_GAIN c_gain = {0};
 	HD_RESULT hd_ret;
@@ -2067,6 +2068,20 @@ void Set_AEMODE(UINT32 id)
 			c_gain.gain[1] = status.status.cur_g_gain;
 			c_gain.gain[2] = status.status.cur_b_gain;
 			vendor_isp_set_common(ISPT_ITEM_C_GAIN, &c_gain);
+			manual.id = 0;
+            if (id == 1)
+            {
+                manual.manual.en = 1;
+                manual.manual.r_gain = status.status.cur_r_gain;
+                manual.manual.g_gain = status.status.cur_g_gain;
+                manual.manual.b_gain = status.status.cur_b_gain;
+            
+            }
+            else
+            {
+                manual.manual.en = 0;
+            }
+    		vendor_isp_set_awb(AWBT_ITEM_MANUAL, &manual);			
 		}
 	}
 		if ((hd_ret = vendor_isp_uninit()) != HD_OK) {
diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h
index ac16bca03..20f56df13 100644
--- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h
+++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.h
@@ -9,7 +9,7 @@
 #define FLGPHOTOFAST_SHUTDOWN      0x00000002
 
 #define FLGPHOTOFAST_MASK          FLGPTN_BIT_ALL
-#define PHOTOFAST_AE_PRESET_FRAME_CNT		6		/* lock AE */
+#define PHOTOFAST_AE_PRESET_FRAME_CNT		11		/* lock AE */
 #define PHOTOFAST_START_CAP_FRAME_CNT		(PHOTOFAST_AE_PRESET_FRAME_CNT + 3*2)		/* capture frame, it should be larger than PHOTOFAST_AE_PRESET_FRAME_CNT by 3 */
 #define PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS 3000