[UPDATE]SDK 2.7.0.4.5

6920_bsp_release/linux/kernel/linux-5.10.106/arch/arm/configs/sa6920_release_defconfig

@@ -105,9 +105,9 @@ CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_CDC_EEM=m
 # CONFIG_USB_NET_NET1080 is not set
+CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_USB_BELKIN is not set
 # CONFIG_USB_ARMLINUX is not set
-CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_WLAN is not set
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
@@ -291,30 +291,11 @@ CONFIG_MEDIA_SUPPORT=m
 # CONFIG_DVB_HELENE is not set
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_DVB_SP2 is not set
-# CONFIG_SOUND=y
-# CONFIG_SND=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-# CONFIG_SND_SOC=y
-# CONFIG_SND_DESIGNWARE_I2S=m
-# CONFIG_SND_DESIGNWARE_PCM=y
-# CONFIG_SND_SUPERACME_PDM=m
-# CONFIG_SND_SUPERACME_PCM=y
-# CONFIG_SND_SUPERACME_CODEC=m
-# CONFIG_SND_SOC_ES8328_I2C=m
-# CONFIG_SND_SOC_SA8900=m
-# CONFIG_SND_SOC_SA8901=m
-# CONFIG_SND_SOC_WM8978=m
-# CONFIG_SND_SIMPLE_CARD=m
 CONFIG_USB=m
+CONFIG_USB_ACM=m
 CONFIG_USB_DWC2=m
 CONFIG_PHY_ACME_USB=m
 CONFIG_USB_GADGET=m
-CONFIG_USB_ACM=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_ECM=y
 CONFIG_USB_CONFIGFS_RNDIS=y
@@ -339,12 +320,10 @@ CONFIG_MAILBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_RPMSG_CHAR=y
 CONFIG_ACME_RPMSG=y
-CONFIG_ACME_RPMSG_CP_LOG=y
-CONFIG_ACME_RPMSG_RPC=y
+# CONFIG_ACME_RPMSG_CP_LOG is not set
 CONFIG_ACME_RPMSG_I2C=y
 CONFIG_ACME_PVTM=y
 CONFIG_ACME_WDH32=y
-CONFIG_ACME_M_SERVER=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
 CONFIG_SA6920_ADC=m

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

@@ -772,16 +772,16 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,
 	hw_desc->lli->ctl_hi = cpu_to_le32(ctlhi);
 
 	if (chan->direction == DMA_MEM_TO_DEV) {
-		// if(device_addr == 0x5a020060)
-		// 	write_desc_sar(hw_desc, 0x20160000);
-		// else
+		if(device_addr == 0x5a020060)
+			write_desc_sar(hw_desc, 0x20160000);
+		else
 			write_desc_sar(hw_desc, mem_addr);		
 		write_desc_dar(hw_desc, device_addr);
 	} else {
 		write_desc_sar(hw_desc, device_addr);
-		// if(device_addr == 0x5a020060)
-		// 	write_desc_dar(hw_desc, 0x20161000);
-		// else
+		if(device_addr == 0x5a020060)
+			write_desc_dar(hw_desc, 0x20161000);
+		else
 			write_desc_dar(hw_desc, mem_addr);		
 	}
 

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/pinctrl/acme/pinctrl-sa6920.c

@@ -1200,7 +1200,7 @@ static int sa6920_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 /* pinconfig */
 #define SA6920_PINCONF_INPUT_ENABLE		BIT(0)
 #define SA6920_PINCONF_OPEN_DRAIN		BIT(1)
-#define SA6920_PINCONF_BIAS_PULL_DOWN	BIT(2)
+#define SA6920_PINCONF_BIAS_PULLUP_DOWN_DISABLE	BIT(2)
 #define SA6920_PINCONF_PULLUP			BIT(3)
 #define SA6920_PINCONF_DRIVE_STRENGTH_L	BIT(4)
 #define SA6920_PINCONF_DRIVE_STRENGTH_H	BIT(5)
@@ -1387,11 +1387,14 @@ static int sa6920_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
 			val |= SA6920_PINCONF_OPEN_DRAIN;
 			break;
 		case PIN_CONFIG_BIAS_PULL_UP:
-			if (arg)
 			val |= SA6920_PINCONF_PULLUP;
-			else
+			break;
+		case PIN_CONFIG_BIAS_PULL_DOWN:
 			val &= ~SA6920_PINCONF_PULLUP;
 			break;
+		case PIN_CONFIG_BIAS_DISABLE:
+			val &= ~SA6920_PINCONF_BIAS_PULLUP_DOWN_DISABLE;
+			break;
 		case PIN_CONFIG_DRIVE_STRENGTH:
 			val |= ((arg << SA6920_PINCONF_DRIVE_STRENGTH_SHIFT) & 
 				(SA6920_PINCONF_DRIVE_STRENGTH_L + SA6920_PINCONF_DRIVE_STRENGTH_H)) ;

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/rpmsg/Kconfig

@@ -80,13 +80,6 @@ config ACME_RPMSG_CP_LOG
 	help
 	  ACME RPMSG star log driver
 
-config ACME_RPMSG_RPC
-	tristate "ACME RPMSG RPC driver"
-	default m
-	depends on ACME_RPMSG
-	help
-	  ACME RPMSG RPC driver
-
 config ACME_RPMSG_I2C
 	tristate "RPMSG i2c driver"
 	depends on ACME_RPMSG

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/rpmsg/Makefile

@@ -9,7 +9,7 @@ obj-$(CONFIG_RPMSG_QCOM_GLINK_SMEM) += qcom_glink_smem.o
 obj-$(CONFIG_RPMSG_QCOM_SMD)	+= qcom_smd.o
 obj-$(CONFIG_RPMSG_VIRTIO)	+= virtio_rpmsg_bus.o
 obj-$(CONFIG_ACME_RPMSG)	+= acme_rpmsg.o
-obj-$(CONFIG_ACME_RPMSG_RPC)	+= acme_rpmsg_rpc.o
+#obj-$(CONFIG_ACME_RPMSG_RPC)	+= acme_rpmsg_rpc.o
 obj-$(CONFIG_ACME_RPMSG_CP_LOG)	+= acme_cp_msg.o
 obj-$(CONFIG_ACME_RPMSG_I2C)	+= acme_rpmsg_i2c.o
 obj-$(CONFIG_ACME_RPMSG_TEST)	+= acme_rpmsg_test.o
@@ -19,4 +19,4 @@ obj-m   += acme_rpmsg_rpc_app.o
 
 obj-m   += acme_rpmsg_rpc_media.o
 
-obj-$(CONFIG_ACME_SPI_RPMSG)	+= acme_spi.o
+obj-m	+= acme_spi.o
\ No newline at end of file

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/rpmsg/acme_rpmsg_rpc.c

@@ -249,7 +249,7 @@ int acme_i2c_async_cmd(uint32_t dev, void *data, uint32_t len, uint32_t delay_ms
 	return 0;
 };
 EXPORT_SYMBOL(acme_i2c_async_cmd);
-
+#if 0
 static uint8_t read_sa9710_acked = 0;
 int acme_sa9710_reg_read(uint8_t reg, uint8_t *val)
 {
@@ -303,7 +303,7 @@ exit:
 	return ret;
 }
 EXPORT_SYMBOL(acme_sa9710_reg_read);
-
+#endif
 static uint8_t wakeup_source_acked = 0;
 int acme_wakeup_source_read(uint32_t code, void* wakeup_data, uint32_t length)
 {
@@ -569,12 +569,13 @@ static int rpmsg_rpc_cb(struct rpmsg_device *rpdev, void *data, int len,
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);
 				wake_up(&rpc_dev.rpc_ack_waitq);
 				break;	
-#endif
+
 			case RPMSG_CMD_9710_REG_READ:
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);
 				read_sa9710_acked = 1;
 				wake_up(&rpc_dev.rpc_ack_waitq);
 				break;
+#endif				
 				//move wakeup_source_acked after kfifo_in_spinlocked,fix recv date but kfifo_out_spinlocked return 0@2021-09-06 zmh
 			case RPMSG_CMD_WAKEUP_SRC_READ:
 				kfifo_in_spinlocked(&rpc_dev.rx_fifo, data, len, &rpc_dev.fifo_lock);

6920_bsp_release/linux/kernel/linux-5.10.106/drivers/soc/acme/acme_wdt.c

@@ -470,7 +470,7 @@ static void acme_wdt0_timeout(struct acme_wdt *wdt)
 	wdt->enable[WDT0] = 0;
 }
 
-extern int acme_sa9710_reg_read(uint8_t reg, uint8_t *val);
+// extern int acme_sa9710_reg_read(uint8_t reg, uint8_t *val);
 static int acme_wdt_proc_show(struct seq_file *m, void *v)
 {
 	struct acme_wdt *wdt = acme_a55_wdt;
@@ -506,12 +506,12 @@ static int acme_wdt_proc_show(struct seq_file *m, void *v)
 	else if ((reboot_reason & 0x003f0000) == 0x00180000)
 		seq_printf(m,"last reboot reason: star wdt timeout\n");
 	else if ((reboot_reason & 0x001f0000) == 0x00000000){	
-		if(0 == acme_sa9710_reg_read(0x5d, &val) && (val & 0x2)){
-				seq_printf(m,"last reboot reason: extern wdt timeout\n");	
-		}
-		else{
+		// if(0 == acme_sa9710_reg_read(0x5d, &val) && (val & 0x2)){
+		// 		seq_printf(m,"last reboot reason: extern wdt timeout\n");	
+		// }
+		// else{
 			seq_printf(m,"last reboot reason: first boot\n");
-		}
+		// }
 	}
 	else if ((reboot_reason & 0x000f0000) == 0x000C0000)
 		seq_printf(m,"last reboot reason: wake up\n");

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/applications/filter/icr/service_icr.c

@@ -336,10 +336,14 @@ int tm8150b_reg_write(int fd, uint8_t reg, uint8_t val)
 #endif
 
 #ifdef ICR_CTRL_GPIO
-#if (BOARD_PLATFORM==PLAT_BC22E) || (BOARD_PLATFORM==PLAT_BC6)
+#if (BOARD_PLATFORM==PLAT_BC22E)
     #define HW_ICR_DAY_GPIO             GPIO_PORT_D_PIN_6 //PD6
     #define HW_ICR_NIGHT_GPIO           GPIO_PORT_D_PIN_5 //PD5
     #define HW_PWM1_SWITCH_GPIO         GPIO_PORT_A_PIN_0 //PA0
+#elif (BOARD_PLATFORM==PLAT_BC6)
+    #define HW_ICR_DAY_GPIO             GPIO_PORT_D_PIN_5 //PD5
+    #define HW_ICR_NIGHT_GPIO           GPIO_PORT_D_PIN_6 //PD6
+    #define HW_PWM1_SWITCH_GPIO         GPIO_PORT_A_PIN_0 //PA0   
 #else
     #define HW_ICR_DAY_GPIO             (-1)
     #define HW_ICR_NIGHT_GPIO           (-1)
@@ -989,8 +993,15 @@ int isp_led_ctrl(LAMP_TYPE_E type, SA_U16 frq)
 	/*3. cfg pwm para , bc22e only 1 channel to control 2 fill lights */
 	chipID = PWM_ID_WL;
 #endif
-
+#if (BOARD_PLATFORM==PLAT_BC6)
+    if(rt_pin_read(GPIO_PORT_D_PIN_1)){
+        rt_pwm_set(pwm_dev, chipID, 20000, dstFrq*2/5);   
+    }else{
+        rt_pwm_set(pwm_dev, chipID, 1000000, dstFrq * 20);
+    }
+#else
     rt_pwm_set(pwm_dev, chipID, 50000, dstFrq);
+#endif
     rt_thread_mdelay(1);
 
     if (0 == dstFrq) {

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/applications/main.c

@@ -551,6 +551,10 @@ static void MX_GPIO_Init(void)
     sa_set_padcfs(PADCONF_GPIO_D6 ,PADC_FS_GPIO_D6);
     sa_set_padcfs(PADCONF_GPIO_D5 ,PADC_FS_GPIO_D5);
 #endif
+#if (BOARD_PLATFORM==PLAT_BC6)
+    sa_set_padcfs(PADCONF_GPIO_D1,PADC_FS_GPIO_D1); //detect board version
+    rt_pin_mode(GPIO_PORT_D_PIN_1, PIN_MODE_INPUT);
+#endif
 }
 
 static void MX_ICACHE_Init(void)

6920_bsp_release/rt-thread-nano/bsp/sa692x/star/rtconfig.h

@@ -68,7 +68,7 @@
 #define FINSH_USING_MSH
 #define FINSH_THREAD_NAME "tshell"
 #define FINSH_THREAD_PRIORITY 20
-#define FINSH_THREAD_STACK_SIZE 2048
+#define FINSH_THREAD_STACK_SIZE 4096
 #define FINSH_USING_HISTORY
 #define FINSH_HISTORY_LINES 5
 #define FINSH_USING_SYMTAB
@@ -287,11 +287,12 @@
 #define BSP_USING_PWM5
 #define BSP_USING_PWM6
 #define BSP_USING_PWM7
-#define BSP_USING_PWM10
-#define BSP_USING_PWM11
 #define BSP_USING_I2C
 #define BSP_USING_I2C0
 #define BSP_USING_I2C1
+#define BSP_USING_I2C2
+#define BSP_USING_I2C3
+#define SA_I2C_TEST
 #define BSP_USING_STAR
 #define BSP_USING_WDT
 #define BSP_MOUDLE_WITHIN_WDT
@@ -300,17 +301,21 @@
 #define BSP_USING_NANO_FILTER
 #define PWM_ID_WL 10
 #define PWM_ID_IR 11
-#define IRCUT_DRV_EN_PIN 89
-#define IRCUT_DRV_SPI_CSN_PIN 86
+#define IRCUT_DRV_EN_PIN -1
+#define IRCUT_DRV_SPI_CSN_PIN -1
 #define SNS_OS04D10
-#define BSP_USING_SNS_RST_PIN 27
+#define BSP_USING_SNS_RST_PIN 5
 #define BSP_USING_SNS_SEL_PIN 36
 #define BSP_USING_SPI
 #define BSP_USING_PIN
+#define BSP_USE_TESTMODULE
 
 /* Board extended module Drivers */
 
 #define BSP_USING_RPMSG
+#define BSP_USING_PMIC
+#define PMIC_SA9710
+#define BSP_TEST_PMIC
 #define DEFAULT_SELECT
 
 /* sa692x ext Config */
@@ -320,7 +325,7 @@
 #define SA_USEING_LISTENING_PROCEE
 #define RT_USING_CPU_USAGE
 #define BSP_USING_SIMPLE_CMD
-#define BOARD_PLATFORM 2
+#define BOARD_PLATFORM 1
 #define BOOT_FROM_SFC
 
 #endif

Release_Note.md

+# 2.7.0.4.5版本0.0
+## 发布日期：2025年03月29日
+
+### 更新内容
+
+1. EV抓图支持到15fps
+2. 修复录像旋转丢帧问题
+
 # 2.5.0.7.1版本0.2
 ## 发布日期：2025年03月20日
 

common/bin/media_imx681_stream_12M_EV.json → common/bin/media_imx681_EV.json

@@ -4,7 +4,7 @@
     "#note": [
         "scene: capture,record,captureaddrecord,visual"
     ],
-    "scene": "captureaddrecord",
+    "scene": "capture",
     "video": {
         "#note0": [
             "SensorType  0:4d10,1:4a10,2:2n10,3:imx681,4:5l10,5:sc535,6:4j10,7:4l10",
@@ -15,8 +15,8 @@
             "Rotation  0:0,1:90,2:180,3:270",
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
-        "ViDev": 0, "MaxFps": 5.0, "MinFps": 5.0, "Mirror": 0, "Flip": 0, "PyrOff": 1, "TnrOff": 0, "AinrOff": 0, "GtmOff": 1, "LtmOff": 1,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 3, "DebugCmd": 1,
+        "ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 3, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 0, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -73,8 +73,8 @@
                     "RcMode  0:constQP,1:cbr,2:vbr,3:low latency,4:capped vbr,5:adaptive vbr,7:min br,63:bypass,64:jpeg fxiQP",
                     "SmartEncoder  0:none,1:roi,2:QP"
                 ],
-                "CodeType": 1, "Qp": 26, "RcMode": 2,
-                "Width": 960, "Height": 720, "Bitrate": 1024000, "SmartEncoder": 0, "SmartSEI": 0,
+                "CodeType": 1, "Qp": 26, "RcMode": 0,
+                "Width": 1920, "Height": 1080, "Bitrate": 4096000, "SmartEncoder": 0, "SmartSEI": 0,
                 "#note-record region": [
                     "Type  0:image,1:time,2:time and debug info"
                 ],
@@ -86,8 +86,8 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
-                        "X":32, "Y": 656, "Width": 880, "Height": 48,
+                        "Enable": 1, "Type": 2, "Style": 1,
+                        "X":32, "Y": 1000, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
                     }
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 0, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {
@@ -151,7 +153,7 @@
                 "ThumbFormat    0:jpeg,1:heif"
             ],
             "RecordEnable": 1, "RecordFormat": 1, "RecordFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 0, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 0, "ThumbFilePath": "/mnt/sdcard"
         },
     "svp":
         {
@@ -164,7 +166,20 @@
             ],
             "Detect": [
                 {
-                    "Enable": 0
+                    "Enable": 0,
+                    "DevType": 0,
+                    "SvpChn": 0,
+                    "ModelFile": "/acme/conf/ao_npu_yolox_nano_4class_480x800.hir",
+                    "ModelSize" : {
+                        "Width": 800,
+                        "Height": 480
+                    },
+                    "OutputType": 1,
+                    "PostProcessLib": "/acme/lib/libsvp_npu_od_iq.so",
+                    "Param": {
+                        "ConfThreshold": [0.5, 0.5, 0.5, 0.5],
+                        "NmsThreshold": 0.65
+                    }
                 },
                 {
                     "Enable": 0
@@ -172,8 +187,9 @@
             ],
             "SmartDependChn": 0,
             "SmartSync": 0,
-            "SmartAE": 1,
+            "SmartAE": 0,
             "SmartAEClassId": 0,
+            "TriggerMoveThreshold": 0,
             "Structured": [
                 {
                     "Enable": 0

common/bin/media_imx681_capture.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1000, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_imx681_record.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_imx681_lp.json → common/bin/media_imx681_record_2M.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 0, "Type": 2,
+                        "Enable": 0, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_imx681_stream_12M.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 656, "Width": 880, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_imx681_stream_3M.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_imx681_visual.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_os04d10_EV.json

+{
+    "doc": "media",
+    "version": "1.0.0.1",
+    "#note": [
+        "scene: capture,record,captureaddrecord,visual"
+    ],
+    "scene": "capture",
+    "video": {
+        "#note0": [
+            "SensorType  0:4d10,1:4a10,2:2n10,3:imx681,4:5l10,5:sc535,6:4j10,7:4l10",
+            "SensorMode  0:linear,1:hdr"
+        ],
+        "SensorType": 0, "SensorMode": 0,
+        "#note1": [
+            "Rotation  0:0,1:90,2:180,3:270",
+            "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
+        ],
+        "ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 10, "DebugCmd": 0,
+        "Gdc":
+            {
+                "#note": [
+                    "bGdcEn  0:disable, 1:enable undistortion",
+                    "Rotation  0->0, 1->90, 2->180, 3->270",
+                    "FovScale: calib result",
+                    "UndistortScale: undistort level, 0:no undistort; 1:full undistort",
+                    "cameraK: camera intrinsic matrix",
+                    "undistortCoefs: wide:k1,k2,p1,p2,k3,k4,k5,k6; fisheys:k0,k1,k2,k3"
+                ],
+                "bGdcEn": 0,
+                "Rotation": 0,
+                "bFishEye": 0,
+                "FovScale": 1.0,
+                "UndistortScale": 1.0,
+                "cameraK": [1904.28, 0.000000, 1839.27, 0.000000, 1904.28, 1345.59, 0.000000, 0.000000, 1.000000],
+                "undistortCoefs": [-0.0332275, 0.00558411, -0.000856258, 0.000567322, 0.016966]
+            },
+        "IspFile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin",
+                     "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin",
+                     "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin","","",""],
+        "AinrFile": "/acme/conf/4d10/aisp_4M.bin",
+        "ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000,
+        "venc": [
+            {
+                "#note-capture channel": [
+                    "Qp jpeg:0-100;heif:0-51",
+                    "SmartEncoder  0:none,1:roi,2:qp"
+                ],
+                "Qp": 26,
+                "Width": 2560, "Height": 1440, "Bitrate": 4096000, "SmartEncoder": 0, "SmartSEI": 0,
+                "#note-record region": [
+                    "Type  0:image,1:time,2:time and debug info"
+                ],
+                "region": [
+                    {
+                        "Enable": 0, "Type": 0,
+                        "X": 32, "Y": 32, "Width": 256, "Height": 128,
+                        "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
+                        "ImageFile": "/acme/bin/logo256x128.bgra"
+                    },
+                    {
+                        "Enable": 0, "Type": 2,
+                        "X":32, "Y": 2896, "Width": 1888, "Height": 48,
+                        "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
+                        "ImageFile": ""
+                    }
+                ]
+            },
+            {
+                "#note-record channel": [
+                    "CodeType  0:h264,1:h265,2:jpeg",
+                    "Qp jpeg:0-100;heif:0-51",
+                    "RcMode  0:constQP,1:cbr,2:vbr,3:low latency,4:capped vbr,5:adaptive vbr,7:min br,63:bypass,64:jpeg fxiQP",
+                    "SmartEncoder  0:none,1:roi,2:QP"
+                ],
+                "CodeType": 1, "Qp": 26, "RcMode": 0,
+                "Width": 1920, "Height": 1080, "Bitrate": 4096000, "SmartEncoder": 0, "SmartSEI": 0,
+                "#note-record region": [
+                    "Type  0:image,1:time,2:time and debug info"
+                ],
+                "region": [
+                    {
+                        "Enable": 0, "Type": 0,
+                        "X": 32, "Y": 32, "Width": 256, "Height": 128,
+                        "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
+                        "ImageFile": "/acme/bin/logo256x128.bgra"
+                    },
+                    {
+                        "Enable": 0, "Type": 2,
+                        "X":32, "Y": 1000, "Width": 1888, "Height": 48,
+                        "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
+                        "ImageFile": ""
+                    }
+                ]
+            }
+        ],
+        "sd":
+            {
+                "#note": [
+                    "SdMode  0:auto,1:manual",
+                    "SceneType  0:outdoor,1:indoor,2:ainr,8:backlight",
+                    "WdrMode  0:linear,1:hdr,2:auto",
+                    "StrategyMode  0:normal,1:blc,2:hs"
+                ],
+                "SdMode": 0, "SceneType": 0, "WdrMode": 0,
+                "MaxInttimeEnable": 0, "IntTimeMax": 30000,
+                "RoiEnable": 0, "X": 0, "Y": 0, "Width": 1920, "Height": 1080,
+                "StrategyMode": 0, "Strength": 100,
+                "FlickerEnable": 0, "Frequency": 50
+            }
+    },
+    "capture":
+        {
+            "#note": [
+                "CaptureFormat  0:jpeg,1:heif",
+                "ThumbFormat    0:jpeg,1:heif"
+            ],
+            "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
+            "BeautyEnable": 0, "Strength": 50,
+            "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
+        },
+    "record":
+        {
+            "eis":
+                {
+                    "#note": [
+                        "EISMode  0:disable, 1:imu_enable, 2:eis_enable",
+                        "CameraOutK:camera-imu extrinsic matrix",
+                        "ImuCalibData: imu calib data, bias(accX, accY, accZ, gyroX, gyroY, gyroZ, radius, cam-imu time offset)"
+                    ],
+                    "EISMode": 0,
+                    "CameraOutK": [0.0, -1.0, 0.0, -1.0, 0.0, 0.0, 0.0, 0.0, -1.0],
+                    "ImuCalibData": [0, 0, 0, 0, 0, 0, 9.83855, 0.0065]
+                },
+            "audio":
+                {
+                    "#note": [
+                        "SampleRate  8000 16000 32000 48000",
+                        "SoundMode  1:mono,2:stereo",
+                        "EncType  0:lcaac,1:g711a,2:g711u,3:pcm"
+                    ],
+                    "AudioEnable": 0,
+                    "SampleRate": 16000,
+                    "SoundMode": 1,
+                    "EncType": 0,
+                    "VqeEnable": 0,"VqeParamFile": "/acme/bin/vqe.bin"
+                },
+            "#note": [
+                "RecordFormat  0:mp4,1:h265,2:h264,3:jpg",
+                "ThumbFormat    0:jpeg,1:heif"
+            ],
+            "RecordEnable": 1, "RecordFormat": 1, "RecordFilePath": "/mnt/sdcard",
+            "ThumbEnable": 0, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 0, "ThumbFilePath": "/mnt/sdcard"
+        },
+    "svp":
+        {
+            "#note-svp": [
+                "DevType  0:NPU,1:VNNE",
+                "PreProcessType  0:WARPAFFINE,1:CROPANDRESIZE,2:STRAIGHTEN",
+                "OutputType  0:RAW,1:RECT,2:POLYGON,3:TEXT",
+                "TriggerClassId   -1:Whole image detection, >=0:Specify target trigger",
+                "ConfThreshold & NmsThreshold   Only Detect Model Needed"
+            ],
+            "Detect": [
+                {
+                    "Enable": 0,
+                    "DevType": 0,
+                    "SvpChn": 0,
+                    "ModelFile": "/acme/conf/ao_npu_yolox_nano_4class_480x800.hir",
+                    "ModelSize" : {
+                        "Width": 800,
+                        "Height": 480
+                    },
+                    "OutputType": 1,
+                    "PostProcessLib": "/acme/lib/libsvp_npu_od_iq.so",
+                    "Param": {
+                        "ConfThreshold": [0.5, 0.5, 0.5, 0.5],
+                        "NmsThreshold": 0.65
+                    }
+                },
+                {
+                    "Enable": 0
+                }
+            ],
+            "SmartDependChn": 0,
+            "SmartSync": 0,
+            "SmartAE": 0,
+            "SmartAEClassId": 0,
+            "TriggerMoveThreshold": 0,
+            "Structured": [
+                {
+                    "Enable": 0
+                },
+                {
+                    "Enable": 0
+                }
+            ],
+            "StructuredSize": {
+                "Width": 0,
+                "Height": 0
+            }
+        },
+    "visual":
+        {
+            "#note": [
+                "EncTpye  0:h264, 1:h265, 2:jpeg",
+                "Binning  Width: max 960, Height: max 536, from Crop size of 1/2 1/4, eg: 2560/4=640 && 1408/4=352, 1920/2=960 && 1072/2=536",
+                "Scale    Width: max 416, Height: max 416",
+                "DumpStreamNum  0:disable, n:save n frames",
+                "DumpStreamFilePath : h264/h265 stream file path to save"
+            ],
+            "Fps": 30.0,
+            "EncTpye": 1,
+            "Crop": { "X": 0, "Y": 0, "Width": 1920, "Height": 1072 },
+            "Binning": { "Enable": 1, "Width": 960, "Height": 536 },
+            "Scale": { "Enable": 0, "Width": 416, "Height": 416 },
+            "DumpStreamNum": 0, "DumpStreamFilePath": "/mnt/sdcard/"
+        }
+}

common/bin/media_os04d10_record.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -35,7 +35,7 @@
                 "cameraK": [2005.7305, 0.000000, 1307.7425, 0.000000, 2005.3343, 725.1173, 0.000000, 0.000000, 1.000000],
                 "undistortCoefs": [20.2289239, 8.70511799, -0.00236280463, -0.00261569320, 5.47216753, 20.4867706, 16.0324546, 10.3635631]
             },
-        "IspFile": [ "/acme/conf/4d10/os04d10_Linear_Color_Outdoor.bin",
+        "IspFile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin",
                      "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin","","","",
                      ""],
         "AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",
@@ -47,7 +47,7 @@
                     "SmartEncoder  0:none,1:roi,2:qp"
                 ],
                 "Qp": 26,
-                "Width": 2560, "Height": 1440, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
+                "Width": 2560, "Height": 1440, "Bitrate": 4096000, "SmartEncoder": 0, "SmartSEI": 0,
                 "#note-record region": [
                     "Type  0:image,1:time,2:time and debug info"
                 ],
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/bin/media_os04d10_visual.json

@@ -16,7 +16,7 @@
             "FilterColor  0:off,1:pink,2:blue,3:cowboy,4:cyantone,5:prettypure,6:moody"
         ],
         "ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "PyrOff": 0, "TnrOff": 0, "AinrOff": 0, "GtmOff": 0, "LtmOff": 0,
-        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 1,
+        "FilterColor": 0, "ViDumpDepth": 1, "VpssDumpDepth": 1, "DebugCmd": 0,
         "Gdc":
             {
                 "#note": [
@@ -35,7 +35,7 @@
                 "cameraK": [2005.7305, 0.000000, 1307.7425, 0.000000, 2005.3343, 725.1173, 0.000000, 0.000000, 1.000000],
                 "undistortCoefs": [20.2289239, 8.70511799, -0.00236280463, -0.00261569320, 5.47216753, 20.4867706, 16.0324546, 10.3635631]
             },
-        "IspFile": [ "/acme/conf/4d10/os04d10_Linear_Color_Outdoor.bin",
+        "IspFile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin",
                      "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin","","","",
                      ""],
         "AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",
@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 2896, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },
                     {
-                        "Enable": 1, "Type": 2,
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
                         "ImageFile": ""
@@ -118,7 +118,9 @@
             "BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
             "BeautyEnable": 0, "Strength": 50,
             "CaptureEnable": 1, "CaptureFormat": 1, "CaptureFilePath": "/mnt/sdcard",
-            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard"
+            "ThumbEnable": 1, "ThumbWidth": 384, "ThumbHeight": 216, "ThumbFormat": 1, "ThumbFilePath": "/mnt/sdcard",
+            "EvEnable": 0, "EVNum": 0, "EvSaveFormat": 0,
+            "EV": [0,0,0,0,0,0,0,0,0,0]
         },
     "record":
         {

common/script/load_glasses_all.sh

@@ -19,6 +19,7 @@ cat ${ko_dir}/sa6920-ipc-sdk.dtbo >/sys/kernel/config/device-tree/overlays/sdk/d
 
 # common ko
 /sbin/insmod ${ko_dir}/hwticks.ko
+/sbin/insmod ${ko_dir}/osal/arpmsg.ko
 /sbin/insmod ${ko_dir}/osal/savdma.ko
 /sbin/insmod ${ko_dir}/osal/sys.ko
 /sbin/insmod ${ko_dir}/dvfs.ko

common/script/uvc-gadget.sh

+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+#set -x
+
+CONFIGFS="/sys/kernel/config"
+GADGET="$CONFIGFS/usb_gadget"
+VID="0x0525"
+PID="0xa4a2"
+SERIAL="0123456789"
+MANUF=$(hostname)
+PRODUCT="UVC Gadget"
+ko_dir=/acme/lib/modules/usb
+
+create_frame() {
+	# Example usage:
+	# create_frame <function name> <width> <height> <format> <name>
+
+	FUNCTION=$1
+	WIDTH=$2
+	HEIGHT=$3
+	FORMAT=$4
+	NAME=$5
+
+	wdir=functions/$FUNCTION/streaming/$FORMAT/$NAME/${HEIGHT}p
+
+	mkdir -p $wdir
+	echo $WIDTH > $wdir/wWidth
+	echo $HEIGHT > $wdir/wHeight
+	echo $(( $WIDTH * $HEIGHT * 2 )) > $wdir/dwMaxVideoFrameBufferSize
+	cat <<EOF > $wdir/dwFrameInterval
+666666
+EOF
+}
+
+create_uvc() {
+	# Example usage:
+	#	create_uvc <target config> <function name>
+	#	create_uvc config/c.1 uvc.0
+	CONFIG=$1
+	FUNCTION=$2
+
+	echo "	Creating UVC gadget functionality : $FUNCTION"
+	mkdir functions/$FUNCTION
+
+	create_frame $FUNCTION 960 540 mjpeg m
+	create_frame $FUNCTION 1920 1080 mjpeg m
+	create_frame $FUNCTION 2560 1440 mjpeg m
+
+	mkdir functions/$FUNCTION/streaming/header/h
+	cd functions/$FUNCTION/streaming/header/h
+	ln -s ../../mjpeg/m
+	cd ../../class/fs
+	ln -s ../../header/h
+	cd ../../class/hs
+	ln -s ../../header/h
+	cd ../../class/ss
+	ln -s ../../header/h
+	cd ../../../control
+	mkdir header/h
+	ln -s header/h class/fs
+	ln -s header/h class/ss
+	cd ../../../
+
+	# Set the packet size: uvc gadget max size is 3k...
+	echo 3072 > functions/$FUNCTION/streaming_maxpacket
+	echo 2048 > functions/$FUNCTION/streaming_maxpacket
+	echo 1024 > functions/$FUNCTION/streaming_maxpacket
+
+	ln -s functions/$FUNCTION configs/c.1
+}
+
+delete_uvc() {
+	# Example usage:
+	#	delete_uvc <target config> <function name>
+	#	delete_uvc config/c.1 uvc.0
+	CONFIG=$1
+	FUNCTION=$2
+
+	echo "	Deleting UVC gadget functionality : $FUNCTION"
+	rm $CONFIG/$FUNCTION
+
+	rm functions/$FUNCTION/control/class/*/h
+	rm functions/$FUNCTION/streaming/class/*/h
+	rm functions/$FUNCTION/streaming/header/h/u
+	rm -rf functions/$FUNCTION/streaming/mjpeg/m/*/
+	rm -rf functions/$FUNCTION/streaming/mjpeg/m
+	rmdir functions/$FUNCTION/streaming/header/h
+	rmdir functions/$FUNCTION/control/header/h
+	rmdir functions/$FUNCTION
+}
+
+case "$1" in
+    start)
+	echo "Creating the USB gadget"
+
+	/sbin/insmod ${ko_dir}/acme_phy.ko
+	/sbin/insmod ${ko_dir}/usb-common.ko
+	/sbin/insmod ${ko_dir}/udc-core.ko
+	/sbin/insmod ${ko_dir}/roles.ko
+	/sbin/insmod ${ko_dir}/usbcore.ko
+	/sbin/insmod ${ko_dir}/dwc2.ko
+	/sbin/insmod ${ko_dir}/libcomposite.ko
+	/sbin/insmod ${ko_dir}/usb_f_fs.ko
+	#/sbin/insmod ${ko_dir}/mc.ko
+	/sbin/insmod ${ko_dir}/videodev.ko
+	/sbin/insmod ${ko_dir}/videobuf2-common.ko
+	/sbin/insmod ${ko_dir}/videobuf2-memops.ko
+	/sbin/insmod ${ko_dir}/videobuf2-v4l2.ko
+	/sbin/insmod ${ko_dir}/videobuf2-vmalloc.ko
+	/sbin/insmod ${ko_dir}/usb_f_uvc.ko
+
+	UDC=`ls /sys/class/udc` # will identify the 'first' UDC
+	UDC_ROLE=/dev/null # Not generic
+
+	echo "Creating gadget directory g1"
+	mkdir -p $GADGET/g1
+
+	cd $GADGET/g1
+	if [ $? -ne 0 ]; then
+	    echo "Error creating usb gadget in configfs"
+	    exit 1;
+	else
+	    echo "OK"
+	fi
+
+	echo "Setting Vendor and Product ID's"
+	echo $VID > idVendor
+	echo $PID > idProduct
+	echo "OK"
+
+	echo "Setting English strings"
+	mkdir -p strings/0x409
+	echo $SERIAL > strings/0x409/serialnumber
+	echo $MANUF > strings/0x409/manufacturer
+	echo $PRODUCT > strings/0x409/product
+	echo "OK"
+
+	echo "Creating Config"
+	mkdir configs/c.1
+	mkdir configs/c.1/strings/0x409
+
+	echo "Creating functions..."
+	#create_msd configs/c.1 mass_storage.0 $USBFILE
+	create_uvc configs/c.1 uvc.0
+	#create_uvc configs/c.1 uvc.1
+	echo "OK"
+
+	echo "Binding USB Device Controller"
+	echo $UDC > UDC
+	echo peripheral > $UDC_ROLE
+	cat $UDC_ROLE
+	echo "OK"
+	;;
+
+    stop)
+	echo "Stopping the USB gadget"
+
+	set +e # Ignore all errors here on a best effort
+
+	cd $GADGET/g1
+
+	if [ $? -ne 0 ]; then
+	    echo "Error: no configfs gadget found"
+	    exit 1;
+	fi
+
+	echo "Unbinding USB Device Controller"
+	grep $UDC UDC && echo "" > UDC
+	echo "OK"
+
+	#delete_uvc configs/c.1 uvc.1
+	delete_uvc configs/c.1 uvc.0
+	#delete_msd configs/c.1 mass_storage.0
+
+	echo "Clearing English strings"
+	rmdir strings/0x409
+	echo "OK"
+
+	echo "Cleaning up configuration"
+	rmdir configs/c.1/strings/0x409
+	rmdir configs/c.1
+	echo "OK"
+
+	echo "Removing gadget directory"
+	cd $GADGET
+	rmdir g1
+	cd /
+	echo "OK"
+
+	#echo "Disable composite USB gadgets"
+	#modprobe -r libcomposite
+	/sbin/rmmod ${ko_dir}/usb_f_uvc.ko
+	/sbin/rmmod ${ko_dir}/videobuf2-vmalloc.ko
+	/sbin/rmmod ${ko_dir}/videobuf2-v4l2.ko
+	/sbin/rmmod ${ko_dir}/videobuf2-memops.ko
+	/sbin/rmmod ${ko_dir}/videobuf2-common.ko
+	/sbin/rmmod ${ko_dir}/videodev.ko
+	#/sbin/rmmod ${ko_dir}/mc.ko
+	/sbin/rmmod ${ko_dir}/usb_f_fs.ko
+	/sbin/rmmod ${ko_dir}/libcomposite.ko
+	/sbin/rmmod ${ko_dir}/dwc2.ko
+	/sbin/rmmod ${ko_dir}/usbcore.ko
+	/sbin/rmmod ${ko_dir}/roles.ko
+	/sbin/rmmod ${ko_dir}/udc-core.ko
+	/sbin/rmmod ${ko_dir}/usb-common.ko
+	/sbin/rmmod ${ko_dir}/acme_phy.ko
+
+	#echo "OK"
+	;;
+    *)
+	echo "Usage : $0 {start|stop}"
+esac

common/svp/media_imx681_stream_ocr.json

@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },                                              
                     {                                                            
-                        "Enable": 1, "Type": 2,                       
+                        "Enable": 1, "Type": 2, "Style": 1,  
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,       
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },                                              
                     {                                                            
-                        "Enable": 1, "Type": 2,                       
+                        "Enable": 1, "Type": 2, "Style": 1,      
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,       
                         "ImageFile": ""

common/svp/media_imx681_stream_smartAE.json

@@ -59,7 +59,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },                                              
                     {                                                            
-                        "Enable": 1, "Type": 2,                       
+                        "Enable": 1, "Type": 2, "Style": 1,
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,       
                         "ImageFile": ""
@@ -86,7 +86,7 @@
                         "ImageFile": "/acme/bin/logo256x128.bgra"
                     },                                              
                     {                                                            
-                        "Enable": 1, "Type": 2,                       
+                        "Enable": 1, "Type": 2, "Style": 1,  
                         "X":32, "Y": 1360, "Width": 1888, "Height": 48,
                         "Color0": 16777215, "Color1": 6171602, "Color2": 16745541,       
                         "ImageFile": ""

run.sh

@@ -45,18 +45,17 @@ rootfs_copy_file() {
     rm system_temp/lib/modules/vpss.ko
     rm system_temp/lib/modules/sa6920-i2c.dtbo
     cp common/modules/sa6920-i2c.dtbo system_temp/lib/modules/
-    cp common/bin* system_temp/ -rf
-    cp common/conf/* system_temp/ -rf
+    mkdir -p system_temp/bin
+    cp common/bin/* system_temp/bin -rf
+    cp common/conf system_temp/ -rf
     cp common/bin/lite_imx681* system_temp/bin/
     cp common/script/load_glasses_all.sh system_temp/scripts/
     cp sdk/lib/modules/isp_all.ko   system_temp/lib/modules/
     cp 6920_bsp_release/out_images/linux-5.10.106-build/drivers/rpmsg/acme_spi.ko   system_temp/lib/modules/
     # svp
-    cp common/svp/*.bin system_temp/conf/
-    cp common/svp/*.hir system_temp/conf/
-    cp common/svp/*.so system_temp/lib/
-    cp common/svp/*.json system_temp/bin/
-    cp common/svp/rec_word_dict.txt system_temp/bin/
+    cp common/svp/ao_npu_yolox_nano_4class_480x800.hir system_temp/conf/
+    cp common/svp/libsvp_npu_od_iq.so system_temp/lib/
+    cp common/svp/media_imx681_stream_smartAE.json system_temp/bin/
   fi
 
   if [ "$type" == "emmc" ];then
@@ -73,6 +72,11 @@ rootfs_copy_file() {
     cp common/svp/*.so system_temp/lib/
     cp common/svp/*.json system_temp/bin/
     cp common/svp/rec_word_dict.txt system_temp/bin/
+    # uvc
+    cp common/script/uvc-gadget.sh system_temp/scripts/
+    cp 6920_bsp_release/out_images/lib/modules/5.10.106/kernel/drivers/media/common/videobuf2/videobuf2-*.ko system_temp/lib/modules/usb/
+    cp 6920_bsp_release/out_images/lib/modules/5.10.106/kernel/drivers/media/v4l2-core/videodev.ko system_temp/lib/modules/usb/
+
   fi
 
   if [ "$type" == "qa" ];then

sdk/bin/user_os04d10_eis_be_gdc.json

@@ -144,7 +144,7 @@
             "gop": { "mode": 0, "numb": 0, "length": 15, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
             "#bitrate/mode": "0 - constQP, 1 - CBR, 2 - VBR, 5 - AVBR",
             "bitrate": {
-                "mode": 2, "avg": 2048000, "max": 3072000, "maxframe": 2048000,
+                "mode": 2, "avg": 8192000, "max": 12288000, "maxframe": 12288000,
                 "initQP": 30, "minPQP": 10, "maxPQP": 45, "minIQP": 10, "maxIQP": 45,
                 "maxPicBits": 0, "maxIPicBits": 0, "mvPercent": [ 2, 6, 30 ], "brCoef": [ 50, 70, 100, 120 ]
             },

sdk/bin/user_os04d10_eis_enable.json

@@ -144,7 +144,7 @@
             "gop": { "mode": 0, "numb": 0, "length": 15, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
             "#bitrate/mode": "0 - constQP, 1 - CBR, 2 - VBR, 5 - AVBR",
             "bitrate": {
-                "mode": 2, "avg": 2048000, "max": 3072000, "maxframe": 2048000,
+                "mode": 2, "avg": 8192000, "max": 12288000, "maxframe": 12288000,
                 "initQP": 30, "minPQP": 10, "maxPQP": 45, "minIQP": 10, "maxIQP": 45,
                 "maxPicBits": 0, "maxIPicBits": 0, "mvPercent": [ 2, 6, 30 ], "brCoef": [ 50, 70, 100, 120 ]
             },

sdk/include/sa_comm_sys.h

@@ -323,13 +323,6 @@ typedef enum {
     DDR_REFRESH_OFF  = 0x1,
 }DDR_REFRESH;
 
-typedef enum {
-    BOARD_VOL_075 = 0,
-    BOARD_VOL_060,
-    BOARD_VOL_055,
-    BOARD_VOL_050,
-    BOARD_VOL_047,
-}BOARD_VOL_E;
 
 
 /**

sdk/include/sa_comm_venc.h

@@ -119,6 +119,10 @@ typedef struct saVENC_PACK_S {
     VENC_SUPPLEMENT_S    stSupplement;                /* R; Supplement */
 } VENC_PACK_S;
 
+typedef struct saVENC_STATISTICS_S{
+    SA_U64               SumSSDY;
+    SA_U64               SumSSDC;
+}VENC_STATISTICS_S;
 
 /* Defines the features of an stream */
 typedef struct saVENC_STREAM_S {
@@ -128,6 +132,7 @@ typedef struct saVENC_STREAM_S {
     SA_U32              u32Seq;                        /* R; the list number of stream */
     SA_UL               u64Private;
     ISP_FRAME_INFO_S    stIspInfo;
+    VENC_STATISTICS_S   stStatistics;
 } VENC_STREAM_S;
 
 typedef struct saVENC_USER_BUF_PARAM_S

sdk/include/sa_comm_vpss.h

@@ -124,7 +124,8 @@ typedef enum saVPSS_SRC_E {
 
 typedef enum saVPSS_DST_E {
 	VPSS_ONLINE_OUT,
-	VPSS_MEM_OUT
+	VPSS_MEM_OUT,
+	VPSS_FIFO_KEEP_NEW = 0x100,
 } VPSS_DST_E;
 
 typedef enum saNSCL_MODE_E {

sdk/include/sa_mapi_vo.h

@@ -22,7 +22,7 @@ typedef struct VO_ATTR
 {
 	SA_U8 LayerIndex; 	//图层的个数
 	SA_U32 OutWidth; 	//输出图像的宽度
-	SA_U32 OutHgih; 	//输出图像的高度
+	SA_U32 OutHeight; 	//输出图像的高度
 	SA_U32 HBP;
 	SA_U32 HFP;
 	SA_U32 HSW;