isp: weekly rls 2024.07.20

-45c372, fix bin path config bug.
-b9a829, split module vpu.

Change-Id: Ie6818b83823ab4198c56d1332b1a5024320abb2c

middleware/v2/modules/isp/common/raw_replay/Makefile

@@ -10,7 +10,7 @@ ISP_BASE_PATH = $(PWD)/../../$(isp_chip_name)
 SDIR = $(PWD)
 SRCS = $(wildcard $(SDIR)/*.c)
 
-INCS = -I$(MW_INC) -I$(ISP_INC) -I$(KERNEL_INC) -I$(SYS_INC) -I$(VPU_INC) -I../../algo
+INCS = -I$(MW_INC) -I$(ISP_INC) -I$(KERNEL_INC) -I$(SYS_INC)  -I../../algo
 
 # SOC Architecture
 ifeq ($(CHIP_ARCH), CV183X)
@@ -21,9 +21,19 @@ else ifeq ($(CHIP_ARCH), CV182X)
 	DEFS += -DCHIP_ARCH_CV182X
 else ifeq ($(CHIP_ARCH), CV181X)
 	INCS += -I$(ISP_BASE_PATH)/isp/inc
+	INCS += -I$(VI_INC)
+	INCS += -I$(VPSS_INC)
+	INCS += -I$(VO_INC)
+	INCS += -I$(GDC_INC)
+	INCS += -I$(RGN_INC)
 	DEFS += -DCHIP_ARCH_CV181X
 else ifeq ($(CHIP_ARCH), CV180X)
 	INCS += -I$(ISP_BASE_PATH)/isp/inc
+	INCS += -I$(VI_INC)
+	INCS += -I$(VPSS_INC)
+	INCS += -I$(VO_INC)
+	INCS += -I$(GDC_INC)
+	INCS += -I$(RGN_INC)
 	DEFS += -DCHIP_ARCH_CV180X
 else
 	$(error Un-support SOC Architecture)

middleware/v2/modules/isp/cv181x/32bit/libjson-c.so

@@ -0,0 +1 @@
+libjson-c.so.5

middleware/v2/modules/isp/cv181x/32bit/libjson-c.so.5

@@ -0,0 +1 @@
+libjson-c.so.5.1.0

middleware/v2/modules/isp/cv181x/isp-tool-daemon/isp_daemon_tool/Makefile

@@ -44,7 +44,7 @@ REQUIRES = cvi_common cvi_sample cvi_vdec cvi_misc
 MW_LIBS = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs --define-variable=mw_dir=$(MW_PATH) $(REQUIRES))
 
 LIBS += $(MW_LIBS) -latomic
-LIBS += -lsys -lvenc -lvdec -lvpu -lisp -lisp_algo -lawb -lae -laf -lsample -lcvi_bin -lcvi_bin_isp -lsns_full -lini
+LIBS += -lsys -lvenc -lvdec -lvi -lvpss -lvo -lrgn -lgdc -lisp -lisp_algo -lawb -lae -laf -lsample -lcvi_bin -lcvi_bin_isp -lsns_full -lini
 LIBS += -ljson-c -lcvi_ispd2
 LIBS += -lraw_dump
 LIBS += -lcvi_dnvqe -lcvi_ssp2
@@ -159,7 +159,7 @@ uninstall:
 	-@rm -f $(DESTDIR)/usr/bin/cfg_64M.json
 	-@rm -f $(DESTDIR)/usr/bin/cfg_128M.json
 	-@rm -f $(DESTDIR)/usr/bin/vc_param_64M.json
-	-@rm -f $(DESTDIR)/usr/bin/vc_param_128M.json	
+	-@rm -f $(DESTDIR)/usr/bin/vc_param_128M.json
 	-@rm -f $(DESTDIR)/usr/bin/pqtool_definition.json
 
 sdk_release: package

middleware/v2/modules/isp/cv181x/isp-tool-daemon/isp_daemon_tool/Makefile.releaseList

@@ -25,7 +25,11 @@ file += $(MW_LIB)/libsns_full.so
 file += $(MW_LIB)/libsys.so
 file += $(MW_LIB)/libvdec.so
 file += $(MW_LIB)/libvenc.so
-file += $(MW_LIB)/libvpu.so
+file += $(MW_LIB)/libvi.so
+file += $(MW_LIB)/libvpss.so
+file += $(MW_LIB)/libvo.so
+file += $(MW_LIB)/libgdc.so
+file += $(MW_LIB)/librgn.so
 file += $(MW_LIB)/libraw_replay.so
 file += $(MW_LIB)/libraw_dump.so
 file += $(MW_LIB)/3rd/libini.so
@@ -39,3 +43,5 @@ file += $(MW_LIB)/libcvi_RES1.so
 file += $(MW_LIB)/libtinyalsa.so
 file += $(MW_LIB)/libcvi_ssp.so
 file += $(MW_LIB)/libmisc.so
+file += $(MW_LIB)/libcvi_dnvqe.so
+file += $(MW_LIB)/libcvi_ssp2.so

middleware/v2/modules/isp/cv181x/isp-tool-daemon/isp_daemon_tool/src/cvi_streamer.cpp

@@ -89,7 +89,7 @@ static CVI_S32 parse_handler(void *user, const char *section, const char *name,
 static CVI_S32 parseIspToolDaemonIni(void)
 {
 	//0. init
-	CVI_S32 ret = 0;
+	CVI_S32 ret = CVI_SUCCESS;
 	ISP_CONFIG_ST stIspConfig;
 	SAMPLE_INI_CFG_S stIniCfg = {};
 
@@ -121,7 +121,7 @@ static CVI_S32 parseIspToolDaemonIni(void)
 		ret = SAMPLE_COMM_VI_ParseIni(&stIniCfg);
 		if (stIspConfig.isEnableSetPQBin == 1) {
 			// read wdr mode from sensor_cfg.ini
-			if (ret) {
+			if (ret == CVI_SUCCESS) {
 				if (stIniCfg.enWDRMode[0] <= WDR_MODE_QUDRA) {
 					CVI_BIN_SetBinName(stIniCfg.enWDRMode[0], stIspConfig.SDR_PQBinName);
 					ISP_DAEMON_TOOL_LOG(LOG_INFO, "SdrMode[%d] Set SdrPqBin[%s] done",
@@ -152,12 +152,12 @@ static CVI_S32 parseIspToolDaemonIni(void)
 	}
 
 	//3. we call CVI_VI_SetDevNum because of isp_tool_daemon.tar.gz will rmmod & insmod ko file
-	if (ret) {
+	if (ret == CVI_SUCCESS) {
 		CVI_VI_SetDevNum(stIniCfg.devNum);
 		ISP_DAEMON_TOOL_LOG(LOG_INFO, "%s %d", "CVI_VI_SetDevNum:", stIniCfg.devNum);
 	} else {
 		ret = SAMPLE_COMM_VI_ParseIni(&stIniCfg);
-		if (ret) {
+		if (ret == CVI_SUCCESS) {
 			CVI_VI_SetDevNum(stIniCfg.devNum);
 			ISP_DAEMON_TOOL_LOG(LOG_INFO, "%s %d", "CVI_VI_SetDevNum:", stIniCfg.devNum);
 		} else {

middleware/v2/modules/isp/cv181x/isp/Makefile

@@ -6,7 +6,8 @@ endif
 
 TMP_FOLDER = $(PWD)/tmp
 SDIR = $(PWD)/src
-INCS = -I$(MW_INC) -I$(ISP_INC) -I$(KERNEL_INC) -I$(SYS_INC) -I$(VPU_INC) -Iinc -Isrc -I../isp_algo/inc
+INCS = -I$(MW_INC) -I$(ISP_INC) -I$(KERNEL_INC) -I$(SYS_INC) -I$(VI_INC) -I$(VPSS_INC) -I$(VO_INC) \
+	   -I$(GDC_INC) -I$(RGN_INC) -Iinc -Isrc -I../isp_algo/inc
 INCS += -I../../common/clog
 INCS += -I$(TOP_DIR)/osdrv/interdrv/v2/rtos_cmdqu
 

middleware/v2/modules/isp/cv181x/isp/inc/isp_version.h

@@ -1 +1 @@
-#define ISP_VERSION "T(2024-06-12), V(I800c07, 3ccabe5)"
+#define ISP_VERSION "T(2024-07-19), V(Ic20fc8, e8295c79)"

middleware/v2/modules/isp/cv181x/isp/src/isp_tnr_ctrl.c

@@ -455,6 +455,8 @@ static CVI_S32 isp_tnr_ctrl_preprocess(VI_PIPE ViPipe, ISP_ALGO_RESULT_S *algoRe
 			tmpRatio = (CVI_U16) ((CVI_FLOAT) u32RatioTNRbase * algoResult->afAEEVRatio[j]);
 			if (tmpRatio > tmpMaxThr || tmpRatio < tmpMinThr) {
 				runtime->GainCompensateRatio[j][i] = TNR_BASE_1X_GAIN;
+			} else {
+				runtime->GainCompensateRatio[j][i] = tmpRatio;
 			}
 		}
 	}