Commit 8ffde126 authored by luo's avatar luo

[UPDATE]SDK 2.7.0.4.8

parent ebfd250c
......@@ -152,6 +152,10 @@
groups = "i2c3_grp";
function = "i2c3";
};
conf {
pins = "PORTF3", "PORTF4";
bias-pull-up;
};
};
pinctrl_emmc_pmux: emmc-pmux {
mux {
......
......@@ -161,6 +161,7 @@
};
&i2c3ACME {
i2c-use-request = <1>;
status = "disabled";
};
......
......@@ -8,4 +8,16 @@
status = "okay";
};
};
fragment@1 {
target-path = "/soc/i2c2ACME@50080000";
__overlay__ {
status = "okay";
};
};
fragment@2 {
target-path = "/soc/i2c3ACME@50090000";
__overlay__ {
status = "okay";
};
};
};
# 2.7.0.4.8版本0.0
## 发布日期:2025年04月03日
### 更新内容
1. 新增spi升级功能
2. 修复EV抓图的效果噪声大等问题
3. 提高AE的收敛速度
# 2.7.0.4.6版本0.0
## 发布日期:2025年03月31日
......
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -27,7 +27,7 @@
"cameraK: camera intrinsic matrix",
"undistortCoefs: wide:k1,k2,p1,p2,k3,k4,k5,k6; fisheys:k0,k1,k2,k3"
],
"bGdcEn": 0,
"bGdcEn": 1,
"Rotation": 0,
"bFishEye": 0,
"FovScale": 1.0,
......@@ -166,7 +166,7 @@
],
"Detect": [
{
"Enable": 1,
"Enable": 0,
"DevType": 0,
"SvpChn": 0,
"ModelFile": "/acme/conf/ao_npu_yolox_nano_4class_480x800.hir",
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -27,7 +27,7 @@
"cameraK: camera intrinsic matrix",
"undistortCoefs: wide:k1,k2,p1,p2,k3,k4,k5,k6; fisheys:k0,k1,k2,k3"
],
"bGdcEn": 0,
"bGdcEn": 1,
"Rotation": 0,
"bFishEye": 0,
"FovScale": 1.0,
......@@ -166,7 +166,7 @@
],
"Detect": [
{
"Enable": 1,
"Enable": 0,
"DevType": 0,
"SvpChn": 0,
"ModelFile": "/acme/conf/ao_npu_yolox_nano_4class_480x800.hir",
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -195,7 +195,6 @@
"#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"
],
......@@ -203,7 +202,6 @@
"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/"
}
}
......@@ -208,7 +208,6 @@
"#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"
],
......@@ -216,7 +215,6 @@
"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/"
}
}
......@@ -195,7 +195,6 @@
"#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"
],
......@@ -203,7 +202,6 @@
"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/"
}
}
......@@ -195,7 +195,6 @@
"#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"
],
......@@ -203,7 +202,6 @@
"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/"
}
}
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -83,6 +83,7 @@ rootfs_copy_file() {
echo *****ONLY TEST****
cp sdk/lib/libsvp_*.so system_temp/lib/
cp sdk/conf system_temp/ -r
cp common/conf/* system_temp/conf/ -rf
cp sdk/opensource/source/sensor/libsns_os04d10_soc30.so system_temp/lib/libsns_os04d10_soc30.so.$(ls sdk/opensource/lib/libsns_os04d10_soc30.so.* | sed -n 's/.*\.so\.\(.*\)/\1/p' | head -n 1)
cp sdk/opensource/source/sensor/libsns_os04d10_soc30.so system_temp/lib/libsns_os04d10_soc30.so
cp sdk/opensource/source/sensor/libsns_imx681_soc.so system_temp/lib/libsns_imx681_soc.so.$(ls sdk/opensource/lib/libsns_imx681_soc.so.* | sed -n 's/.*\.so\.\(.*\)/\1/p' | head -n 1)
......@@ -149,7 +150,7 @@ make_module() {
make
set +e
cd -
cp $1/$2 $target_path
mv $1/$2 $target_path
}
# Change directory to the 6920_bsp_release directory
......@@ -200,9 +201,11 @@ copy_files "$1"
mkdir system_temp/lib/modules -p
mkdir system_temp/usr -p
# Get new controller
# make_module tools/controller/ controller sdk/bin/
# make_module tools/comm/ libtool_comm.so sdk/opensource/lib/
if [ -d "tools" ]; then
# Get new controller
make_module tools/controller/ controller sdk/bin/
make_module tools/comm/ libtool_comm.so sdk/opensource/lib/
fi
# Copy libraries and scripts
cp common/lib/libcrypto.so* system_temp/lib/
......@@ -376,10 +379,15 @@ copy_files "$1"
make clean
make
cd -
cd sdk/sample/source/sample_svp/
make clean
make
cd -
set +e
git checkout sdk/sample/source/mkconfig
cp sdk/sample/source/sample_hapi_streamer/sample_hapi_streamer system_temp/bin/streamer_ipc
cp sdk/sample/source/sample_hapi_media/streamer_media system_temp/bin/streamer_media
cp sdk/sample/source/sample_svp/sample_svp system_temp/bin/sample_svp
cp common/configs system_temp/ -r
cp common/usr/* system_temp/usr/ -rf
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
libispalg.so.2.7.0.4.6
\ No newline at end of file
libispalg.so.2.7.0.4.8
\ No newline at end of file
libive.so.2.7.0.4.6
\ No newline at end of file
libive.so.2.7.0.4.8
\ No newline at end of file
liblapi.so.2.7.0.4.6
\ No newline at end of file
liblapi.so.2.7.0.4.8
\ No newline at end of file
libmapi.so.2.7.0.4.6
\ No newline at end of file
libmapi.so.2.7.0.4.8
\ No newline at end of file
No preview for this file type
libvqe.so.2.7.0.4.6
\ No newline at end of file
libvqe.so.2.7.0.4.8
\ No newline at end of file
......@@ -187,7 +187,7 @@ alias symbol:osal_notifier_call osaldrv
alias symbol:osal_timer_create osaldrv
alias symbol:osal_dmaengine_prep_dma_cyclic osaldrv
alias symbol:osal_set_dma_async_tx_descriptor osaldrv
alias symbol:acme_get_mmz_reserved_info arpmsg
alias symbol:acme_get_mmz_reserved_info osaldrv
alias symbol:osal_poll_requested_events osaldrv
alias symbol:osal_free_irq osaldrv
alias symbol:mmz_check_memerr osaldrv
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -542,9 +542,6 @@ typedef struct {
SA_BOOL bBinn;
SA_U16 u16BinnWidth;
SA_U16 u16BinnHeight;
SA_BOOL bScale;
SA_U16 u16ScaleWidth;
SA_U16 u16ScaleHeight;
SA_U32 u32DumpStreamNum;
SA_CHAR strDumpStreamFilePath[128];
} SA_MEDIA_VISUAL_CONFIG_S;
......@@ -679,8 +676,9 @@ typedef struct {
SA_U32 u32SmartAEClassId; // SmartAE的分类
SA_FLOAT fTriggerMoveThreshold; // 运动阈值,设为0则不过滤,>0则
SA_MEDIA_STRUCTURED_CONFIG_S stStructured[SA_MEDIA_STRUCTURED_CHN_MAX]; // NPU结构化
MOD_ID_E enSrcModId; // 源模块ID
SA_U32 u32DetectChnNum; // 检测通道数
SA_U32 s32DetectVpssChn[SA_MEDIA_DETECT_CHN_NAX]; // 检测VPSS通道
SA_U32 s32DetectSrcDevChn[SA_MEDIA_DETECT_CHN_NAX]; // 检测源模块通道
SA_U32 s32DetectSvpChn[SA_MEDIA_DETECT_CHN_NAX]; // 检测SVP通道
SA_U32 u32TriggerChnNum; // 触发结构化通道数
SA_U32 u32TriggerVpssChn; // 结构化的VPSS通道
......@@ -844,6 +842,7 @@ typedef enum {
typedef enum {
SA_MEDIA_DUMP_YUV,
SA_MEDIA_DUMP_RAW,
SA_MEDIA_DUMP_COMPRESS,
SA_MEDIA_DUMP_MAX
} SA_MEDIA_DUMP_E;
......@@ -875,6 +874,7 @@ SA_S32 SA_HAPI_MEDIA_StartDump(VI_DEV s32DevId, SA_MEDIA_DUMP_E enDumpType, SA_H
SA_VOID SA_HAPI_MEDIA_StopDump(VI_DEV s32DevId, SA_MEDIA_DUMP_E enDumpType);
SA_S32 SA_HAPI_MEDIA_SdDynCtrAttr(SA_MEDIA_SD_DYN_E enDynMode, SA_MEDIA_SD_MODE_E *enSdMode, SA_MEDIA_SD_TYPE_E *enSdType);
SA_S32 SA_HAPI_MEDIA_AeEvConvert(ISP_PIPE u32IspPipeId, SA_MEDIA_EV_S *pstEv);
SA_S32 SA_HAPI_MEDIA_GetImuData(VI_DEV s32DevId, IMU_ALG_DATA_S *pstImuData, IMU_GET_DATA_MODE_E enMode);
#ifdef __linux__
#define HAPI_MEDIA_MALLOC malloc
#define HAPI_MEDIA_CALLOC calloc
......
libdisplay_open.so.2.7.0.4.6
\ No newline at end of file
libdisplay_open.so.2.7.0.4.8
\ No newline at end of file
libhapi_open.so.2.7.0.4.6
\ No newline at end of file
libhapi_open.so.2.7.0.4.8
\ No newline at end of file
libimu_open.so.2.7.0.4.6
\ No newline at end of file
libimu_open.so.2.7.0.4.8
\ No newline at end of file
libjson_open.so.2.7.0.4.6
\ No newline at end of file
libjson_open.so.2.7.0.4.8
\ No newline at end of file
liblcdJT60559_6920.so.2.7.0.4.6
\ No newline at end of file
liblcdJT60559_6920.so.2.7.0.4.8
\ No newline at end of file
liblcdPV023YLUN80_6920.so.2.7.0.4.6
\ No newline at end of file
liblcdPV023YLUN80_6920.so.2.7.0.4.8
\ No newline at end of file
liblens_open.so.2.7.0.4.6
\ No newline at end of file
liblens_open.so.2.7.0.4.8
\ No newline at end of file
liblens_pe918.so.2.7.0.4.6
\ No newline at end of file
liblens_pe918.so.2.7.0.4.8
\ No newline at end of file
liblens_yt50002.so.2.7.0.4.6
\ No newline at end of file
liblens_yt50002.so.2.7.0.4.8
\ No newline at end of file
librtsp_open.so.2.7.0.4.6
\ No newline at end of file
librtsp_open.so.2.7.0.4.8
\ No newline at end of file
libsns_gc4103_soc.so.2.7.0.4.6
\ No newline at end of file
libsns_gc4103_soc.so.2.7.0.4.8
\ No newline at end of file
libsns_imx327_soc.so.2.7.0.4.6
\ No newline at end of file
libsns_imx327_soc.so.2.7.0.4.8
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment