Skip to content

S
solution
Commit c8d13a93 authored by linwenjin's avatar linwenjin
Browse files
Options

[UPDATE]SDK 2.5.0.7.0

parent 19c41439
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 246 deletions
6920_bsp_release/rt-thread-nano/bsp/sa692x/star/star_asic_defconfig_emmc
View file @ c8d13a93
......@@ -1069,7 +1069,7 @@ CONFIG_BSP_USING_I2C0=y
CONFIG_BSP_USING_I2C1=y
CONFIG_BSP_USING_I2C2=y
CONFIG_BSP_USING_I2C3=y
# CONFIG_SA_I2C_TEST is not set
CONFIG_SA_I2C_TEST=y
# CONFIG_BSP_USING_ANNE is not set
# CONFIG_BSP_USING_AUDIO_ALG is not set
# CONFIG_BSP_USING_AUDIO is not set
......
Release_Note.md
View file @ c8d13a93
# 2.5.0.7.0版本0.0
## 发布日期：2025年03月06日
### 更新内容
1. PQTOOL更新，增加手动控制场景，增加json文件批量转bin
2. 取消blc场景支持，解决拍照画面偏红问题
3. heif增加osd叠加
4. 减少SD识别的场景个数，从9个减少到6个
# 2.5.0.6.9版本0.0
## 发布日期：2025年2月27日
......
common/bin/media_imx681_cap_and_rec.json deleted 100644 → 0
View file @ 19c41439
{
"doc": "media",
"version": "1.0.0.1",
"#note": [
"scene: capture,record,captureaddrecord,visual"
],
"scene": "captureaddrecord",
"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": 3, "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, "Rotation": 0, "PyrOff": 0,
"Gdc": 0, "FilterColor": 0,
"IspFile": [ "/acme/conf/681/imx681_capture_Color_Outdoor.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin", "/acme/conf/681/imx681_capture_Color_Indoor_diff.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_capture_Color_Blc_diff.bin"],
"AinrFile": "/acme/conf/681/imx681_v01_001_800_rtl.bin",
"ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000,
"venc": [
{
"#note-capture channel": [
"SmartEncoder 0:none,1:roi,2:qp"
],
"Width": 4032, "Height": 3024, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"region": [
{
"#note": [
"Type 0:image,1:timestamp,2:timestamp+mode,3:timestamp+week,4:timestamp+week(EN)"
],
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
}
]
},
{
"#note-record channel": [
"CodeType 0:h264,1:h265,2:jpeg",
"RcMode 0:QP,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, "Qfactor": 80, "RcMode": 1,
"Width": 960, "Height": 688, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"region": [
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
}
]
}
],
"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": [
"SaveFormat 0:jpeg,1:heif"
],
"BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
"BeautyEnable": 0, "Strength": 50,
"SaveEnable": 1, "SaveFormat": 0, "SaveFilePath": "/mnt/sdcard"
},
"record":
{
"EISMode": 0,
"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": [
"SaveFormat 0:mp4,1:h265,2:h264,3:jpg"
],
"SaveEnable": 1, "SaveFormat": 1, "SaveFilePath": "/mnt/sdcard"
},
"svp":
{
"OCREnable": 0,
"QRCodeEnable": 0,
"FaceDetEnable": 0,
"PeopleDetEnable": 0,
"SmartAeEnable": 0
}
}
common/bin/media_imx681_capture.json
View file @ c8d13a93
......@@ -17,8 +17,10 @@
],
"ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "Rotation": 0, "PyrOff": 0,
"Gdc": 0, "FilterColor": 0,
"IspFile": [ "/acme/conf/681/imx681_capture_Color_Outdoor.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin", "/acme/conf/681/imx681_capture_Color_Indoor_diff.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_capture_Color_Blc_diff.bin"],
"AinrFile": "/acme/conf/681/imx681_v01_001_800_rtl.bin",
"IspFile": [ "/acme/conf/imx681/bin/12M_linear_Outdoor.bin",
"/acme/conf/imx681/bin/12M_linear_Indoor_diff.bin","","","",
""],
"AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",
"ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000,
"venc": [
{
......@@ -26,21 +28,21 @@
"SmartEncoder 0:none,1:roi,2:qp"
],
"Width": 4032, "Height": 3024, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"#note-record region": [
"Type 0:image,1:time,2:time and debug info"
],
"region": [
{
"#note": [
"Type 0:image,1:timestamp,2:timestamp+mode,3:timestamp+week,4:timestamp+week(EN)"
],
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.bgra"
},
{
"Enable": 1, "Type": 2,
"X":32, "Y": 2896, "Width": 1888, "Height": 48,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": ""
}
]
},
......@@ -52,18 +54,21 @@
],
"CodeType": 1, "Qfactor": 80, "RcMode": 1,
"Width": 1920, "Height": 1080, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"#note-record region": [
"Type 0:image,1:time,2:time and debug info"
],
"region": [
{
"Enable": 0, "Type": 0,
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.bgra"
},
{
"Enable": 1, "Type": 2,
"X":32, "Y": 1000, "Width": 1888, "Height": 48,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": ""
}
]
}
......@@ -90,7 +95,7 @@
],
"BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
"BeautyEnable": 0, "Strength": 50,
"SaveEnable": 1, "SaveFormat": 0, "SaveFilePath": "/mnt/sdcard"
"SaveEnable": 1, "SaveFormat": 1, "SaveFilePath": "/mnt/sdcard"
},
"record":
{
......
common/bin/media_imx681_record.json
View file @ c8d13a93
......@@ -17,8 +17,10 @@
],
"ViDev": 0, "MaxFps": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "Rotation": 0, "PyrOff": 0,
"Gdc": 0, "FilterColor": 0,
"IspFile": [ "/acme/conf/681/imx681_video_Color_Outdoor.bin","/acme/conf/681/imx681_video_Color_Outdoor_diff.bin", "/acme/conf/681/imx681_video_Color_Indoor_diff.bin","/acme/conf/681/imx681_video_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_video_Color_Blc_diff.bin"],
"AinrFile": "/acme/conf/681/imx681_v01_001_800_rtl.bin",
"IspFile": [ "/acme/conf/imx681/bin/3M_linear_Outdoor.bin",
"/acme/conf/imx681/bin/3M_linear_Indoor_diff.bin","","","",
""],
"AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",
"ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000,
"venc": [
{
......@@ -51,19 +53,22 @@
"SmartEncoder 0:none,1:roi,2:QP"
],
"CodeType": 1, "Qfactor": 80, "RcMode": 1,
"Width": 1920, "Height": 1080, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"Width": 2016, "Height": 1512, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"#note-record region": [
"Type 0:image,1:time,2:time and debug info"
],
"region": [
{
"Enable": 0, "Type": 0,
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.bgra"
},
{
"Enable": 1, "Type": 2,
"X":32, "Y": 1360, "Width": 1888, "Height": 48,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": ""
}
]
}
......
common/bin/media_imx681_stream.json
View file @ c8d13a93
......@@ -17,8 +17,10 @@
],
"ViDev": 0, "MaxFps": 15.0, "MinFps": 15.0, "Mirror": 0, "Flip": 0, "Rotation": 0, "PyrOff": 1,
"Gdc": 0, "FilterColor": 0,
"IspFile": [ "/acme/conf/681/imx681_video_Color_Outdoor.bin","/acme/conf/681/imx681_video_Color_Outdoor_diff.bin", "/acme/conf/681/imx681_video_Color_Indoor_diff.bin","/acme/conf/681/imx681_video_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_video_Color_Blc_diff.bin"],
"AinrFile": "/acme/conf/681/imx681_v01_001_800_rtl.bin",
"IspFile": [ "/acme/conf/imx681/bin/12M_linear_Outdoor.bin",
"/acme/conf/imx681/bin/12M_linear_Indoor_diff.bin","","","",
""],
"AinrFile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin",
"ProEnable": 0, "ISO": 100, "AWBCt": 5000, "SportEnable": 0, "MaxIntTime": 30000,
"venc": [
{
......@@ -26,21 +28,21 @@
"SmartEncoder 0:none,1:roi,2:qp"
],
"Width": 4032, "Height": 3024, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"#note-record region": [
"Type 0:image,1:time,2:time and debug info"
],
"region": [
{
"#note": [
"Type 0:image,1:timestamp,2:timestamp+mode,3:timestamp+week,4:timestamp+week(EN)"
],
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.bgra"
},
{
"Enable": 1, "Type": 2,
"X":32, "Y": 2896, "Width": 1888, "Height": 48,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": ""
}
]
},
......@@ -51,19 +53,22 @@
"SmartEncoder 0:none,1:roi,2:QP"
],
"CodeType": 1, "Qfactor": 80, "RcMode": 1,
"Width": 1920, "Height": 1080, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"Width": 1920, "Height": 1440, "Bitrate": 2048000, "SmartEncoder": 0, "SmartSEI": 0,
"#note-record region": [
"Type 0:image,1:time,2:time and debug info"
],
"region": [
{
"Enable": 0, "Type": 0,
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
},
{
"Enable": 0, "Type": 0,
"X": 32, "Y": 32, "Width": 256, "Height": 128,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.2bpp"
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": "/acme/bin/logo256x128.bgra"
},
{
"Enable": 1, "Type": 2,
"X":32, "Y": 1360, "Width": 1888, "Height": 48,
"Color0": 16777215, "Color1": 6171602, "Color2": 16745541,
"ImageFile": ""
}
]
}
......@@ -90,7 +95,7 @@
],
"BokehEnable": 0, "MFNREnable": 0, "HDREnable": 0, "ZSLEnable": 0,
"BeautyEnable": 0, "Strength": 50,
"SaveEnable": 1, "SaveFormat": 0, "SaveFilePath": "/mnt/sdcard"
"SaveEnable": 1, "SaveFormat": 1, "SaveFilePath": "/mnt/sdcard"
},
"record":
{
......
common/conf/681/user_imx681_captureLTM.json deleted 100644 → 0
View file @ 19c41439
This diff is collapsed.
common/conf/681/user_imx681_video_rotate90_30fps.json deleted 100644 → 0
View file @ 19c41439
This diff is collapsed.
common/conf/imx681/isp_build_bin.json 0 → 100644
View file @ c8d13a93
{
"build_rule": {
"list": [
{ "base": "12M_linear_Outdoor.bin", "origin": "12M_linear_Indoor.bin", "diff":"12M_linear_Indoor_diff.bin"},
{ "base": "12M_linear_Indoor.bin", "origin": "12M_linear_Aisp.bin", "diff":"12M_linear_Aisp_diff.bin"},
{ "base": "12M_linear_Aisp.bin", "origin": "12M_linear_Aisp_Ligth.bin", "diff":"12M_linear_Aisp_Ligth_diff.bin"},
{ "base": "12M_linear_Indoor.bin", "origin": "12M_linear_Blc.bin", "diff":"12M_linear_Blc_diff.bin"},
{ "base": "12M_linear_Indoor.bin", "origin": "12M_linear_Mono.bin", "diff":"12M_linear_Mono_diff.bin"},
{ "base": "3M_linear_Outdoor.bin", "origin": "3M_linear_Indoor.bin", "diff":"3M_linear_Indoor_diff.bin"},
{ "base": "3M_linear_Indoor.bin", "origin": "3M_linear_Aisp.bin", "diff":"3M_linear_Aisp_diff.bin"},
{ "base": "3M_linear_Aisp.bin", "origin": "3M_linear_Aisp_Ligth.bin", "diff":"3M_linear_Aisp_Ligth_diff.bin"},
{ "base": "3M_linear_Indoor.bin", "origin": "3M_linear_Blc.bin", "diff":"3M_linear_Blc_diff.bin"},
{ "base": "3M_linear_Indoor.bin", "origin": "3M_linear_Mono.bin", "diff":"3M_linear_Mono_diff.bin"},
{ "base": "12M_wdr_Outdoor.bin", "origin": "12M_wdr_Indoor.bin", "diff":"12M_wdr_Indoor_diff.bin"},
{ "base": "12M_wdr_Indoor.bin", "origin": "12M_wdr_Aisp.bin", "diff":"12M_wdr_Aisp_diff.bin"},
{ "base": "12M_wdr_Aisp.bin", "origin": "12M_wdr_Aisp_Ligth.bin", "diff":"12M_wdr_Aisp_Ligth_diff.bin"},
{ "base": "12M_wdr_Indoor.bin", "origin": "12M_wdr_Blc.bin", "diff":"12M_wdr_Blc_diff.bin"},
{ "base": "12M_wdr_Indoor.bin", "origin": "12M_wdr_Mono.bin", "diff":"12M_wdr_Mono_diff.bin"},
{ "base": "3M_wdr_Outdoor.bin", "origin": "3M_wdr_Indoor.bin", "diff":"3M_wdr_Indoor_diff.bin"},
{ "base": "3M_wdr_Indoor.bin", "origin": "3M_wdr_Aisp.bin", "diff":"3M_wdr_Aisp_diff.bin"},
{ "base": "3M_wdr_Aisp.bin", "origin": "3M_wdr_Aisp_Ligth.bin", "diff":"3M_wdr_Aisp_Ligth_diff.bin"},
{ "base": "3M_wdr_Indoor.bin", "origin": "3M_wdr_Blc.bin", "diff":"3M_wdr_Blc_diff.bin"},
{ "base": "3M_wdr_Indoor.bin", "origin": "3M_wdr_Mono.bin", "diff":"3M_wdr_Mono_diff.bin"}
]
}
}
common/conf/imx681/json/12M_linear_Blc.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
common/conf/imx681/json/12M_linear_Indoor.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
common/conf/imx681/json/12M_linear_Outdoor.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
common/conf/imx681/json/3M_linear_Blc.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
common/conf/imx681/json/3M_linear_Indoor.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
common/conf/imx681/json/3M_linear_Outdoor.json 0 → 100644
View file @ c8d13a93
This diff is collapsed.
run.sh
View file @ c8d13a93
......@@ -42,23 +42,21 @@ rootfs_copy_file() {
rm system_temp/lib/modules/isp*.ko
rm system_temp/lib/modules/vpss.ko
rm system_temp/lib/modules/sa6920-i2c.dtbo
mkdir system_temp/conf/681/ -p
cp common/modules/sa6920-i2c.dtbo system_temp/lib/modules/
cp common/conf/681/* system_temp/conf/681/
cp common/* 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/
fi
if [ "$type" == "emmc" ];then
mkdir system_temp/conf/681/ -p
cp common/conf/681/* system_temp/conf/681/
cp common/bin/lite_imx681* system_temp/bin/
cp sdk/bin/streamer system_temp/bin/
cp sdk/bin/user_imx681* system_temp/bin/
cp sdk/bin/user_os04d10_normal.json system_temp/bin/
cp sdk/lib/libsvp_*.so system_temp/lib/
cp sdk/conf system_temp/ -r
cp common/conf/* system_temp/conf/ -rf
fi
if [ "$type" == "qa" ];then
......@@ -295,6 +293,7 @@ copy_files "$1"
cp sdk/bin/controller system_temp/bin/
cp sdk/bin/HeronTest system_temp/bin/
cp sdk/bin/logo256x128.2bpp system_temp/bin/
cp sdk/bin/logo256x128.bgra system_temp/bin/
cp sdk/bin/sample_cli system_temp/bin/
cp sdk/bin/simhei.ttf system_temp/bin/
cp sdk/bin/tzc400 system_temp/bin/
......
sdk/MAPI.XLSX
View file @ c8d13a93
No preview for this file type
sdk/MAPI_ERROR_CODE.XLSX
View file @ c8d13a93
No preview for this file type
sdk/MAPI_ISP.XLSX
View file @ c8d13a93
No preview for this file type
sdk/bin/HeronTest
View file @ c8d13a93
No preview for this file type
sdk/bin/audioplayer
View file @ c8d13a93
No preview for this file type
sdk/bin/audioplayrecord
View file @ c8d13a93
No preview for this file type
sdk/bin/audiorecorder
View file @ c8d13a93
No preview for this file type
sdk/bin/cameraapp
View file @ c8d13a93
No preview for this file type
sdk/bin/camerafilter
View file @ c8d13a93
No preview for this file type
sdk/bin/cameraipc
View file @ c8d13a93
No preview for this file type
sdk/bin/camerasvp
View file @ c8d13a93
No preview for this file type
sdk/bin/cameravpu
View file @ c8d13a93
No preview for this file type
sdk/bin/controller
View file @ c8d13a93
No preview for this file type
sdk/bin/sample_aliyun
View file @ c8d13a93
No preview for this file type
sdk/bin/sample_cloud
View file @ c8d13a93
No preview for this file type
sdk/bin/streamer
View file @ c8d13a93
No preview for this file type
sdk/bin/streamer_ipc
View file @ c8d13a93
No preview for this file type
sdk/bin/transfer
View file @ c8d13a93
No preview for this file type
sdk/bin/tzc400
View file @ c8d13a93
No preview for this file type
sdk/conf/681/user_imx681_captureLTM.json deleted 100644 → 0
View file @ 19c41439
This diff is collapsed.
sdk/conf/681/user_imx681_video_rotate90_30fps.json deleted 100644 → 0
View file @ 19c41439
This diff is collapsed.
sdk/include/sa_comm_vi.h
View file @ c8d13a93
......@@ -106,6 +106,7 @@ typedef struct saGDC_WARP_PARAM_S {
SA_FLOAT f32FovScale;
SA_FLOAT f32CameraK[3][3];
SA_FLOAT f32UndistortCoefs[14];
SA_FLOAT f32UndistortScale;
} GDC_WARP_PARAM_S;
typedef struct saGDC_ROTATION_PARAM_S {
......
sdk/lib/libispalg.so
View file @ c8d13a93
libispalg.so.2.5.0.6.9
\ No newline at end of file
libispalg.so.2.5.0.7.0
\ No newline at end of file
sdk/lib/libive.so
View file @ c8d13a93
libive.so.2.5.0.6.9
\ No newline at end of file
libive.so.2.5.0.7.0
\ No newline at end of file
sdk/lib/liblapi.so 0 → 120000
View file @ c8d13a93
liblapi.so.2.5.0.7.0
\ No newline at end of file
sdk/lib/libmapi.so
View file @ c8d13a93
libmapi.so.2.5.0.6.9
\ No newline at end of file
libmapi.so.2.5.0.7.0
\ No newline at end of file
sdk/lib/libsdk_static.a
View file @ c8d13a93
No preview for this file type
sdk/lib/libvqe.so
View file @ c8d13a93
libvqe.so.2.5.0.6.9
\ No newline at end of file
libvqe.so.2.5.0.7.0
\ No newline at end of file
sdk/lib/modules/jpegd.ko
View file @ c8d13a93
No preview for this file type
sdk/lib/modules/jpege.ko
View file @ c8d13a93
No preview for this file type
sdk/lib/modules/venc.ko
View file @ c8d13a93
No preview for this file type
sdk/lib/modules/vnne.ko
View file @ c8d13a93
No preview for this file type
sdk/opensource/include/sa_hapi_ispscene.h
View file @ c8d13a93
......@@ -81,6 +81,12 @@ typedef enum{
SENSITIVITY_HIGH,
}SA_ISPSCENE_ICR_SENSITIVITY_E;
typedef enum{
ICR_STATE_COLOR = 0, //彩色
ICR_STATE_BLACK, //黑白
ICR_STATE_NUM,
}SA_ISPSCENE_ICR_STATE_E;
typedef enum{
LAMPPOWER_LOW = 0, //AO模式下不开灯
LAMPPOWER_MIDDLE, //AO模式下不开白光灯
......@@ -101,7 +107,7 @@ typedef struct {
typedef struct
{
SA_U32 u32OnISO; /* 开灯ISO，单位倍数*100，1倍为100 */
SA_U32 u32OffISO; /* 开灯ISO，单位倍数*100，1倍为100 */
SA_U32 u32OffISO; /* 关灯ISO，单位倍数*100，1倍为100 */
SA_U32 u32TargetISO; /* 目标ISO，单位倍数*100, 1倍为100。开灯后灯光朝着这个ISO调节过去 */
SA_U16 u16EVOff; /* 关灯的ev阈值 */
} SA_ISPSCENE_LAMP_THR_S;
......@@ -195,6 +201,22 @@ typedef struct {
WDR_MODE_E enAnlyResult; //AO/Normal/Night场景分析之后结果
WDR_MODE_E enSdResult; //反馈sd实际检测结果,用于AO->模式切换时指定初始模式
}SA_ISPSCENE_WDR_RESULT_S;
typedef struct {
SA_U32 u32IntTime;
SA_U32 u32Iso;
SA_U32 u32AeTarget;
SA_U32 u32Curluma;
SA_S32 s32RealBv;
SA_U32 u32ExpRatio;
SA_U32 u32Ct;
SA_U32 au32WbGain[4];
SA_U32 u32FrameId;
SA_U32 u32SceneType;
SA_ISPSCENE_ICR_STATE_E enIrcut;
SA_U32 u32IrLampFrq;
SA_U32 u32WhiteLampFrq;
} SA_ISPSCENE_INFO_S;
/******************************************************************************
* ERR Code
******************************************************************************/
......
sdk/opensource/include/sa_hapi_media.h
View file @ c8d13a93
......@@ -49,7 +49,7 @@ extern "C" {
#define SA_MEDIA_SVP_TARGET_MAX (8)
#define MEDIA_LTM_SIZE_WIDTH_MAX (3840)
#define MEDIA_LTM_SIZE_WIDTH_MAX (3648)
#define MEDIA_LTM_SIZE_HEIGHT_MAX (2736)
#define MEDIA_GTM_SIZE_WIDTH_ONLINE_MAX (2880)
#define MEDIA_GTM_SIZE_HEIGHT_ONLINE_MAX (1660)
......@@ -80,13 +80,9 @@ typedef enum {
} SA_MEDIA_SNS_MODE_E;
typedef enum {
SA_MEDIA_RGN_TYPE_IMAGE = 0, // 图片
SA_MEDIA_RGN_TYPE_TIMESTAMP = 1, // 1970-01-01 00:00:00 时间戳
SA_MEDIA_RGN_TYPE_TIMESTAMP_WITH_MODE = 2, // 1970-01-01 00:00:00 AOR 时间（模式）
SA_MEDIA_RGN_TYPE_TIMESTAMP_WITH_WEEK = 3, // 星期一 1970-01-01 00:00:00 时间（星期）
SA_MEDIA_RGN_TYPE_TIMESTAMP_WITH_WEEK_EN = 4, // Mon 1970-01-01 00:00:00 时间（星期）英文
SA_MEDIA_RGN_TYPE_TIMESTAMP_WITH_MODE_WEEK = 5, // 星期一 1970-01-01 00:00:00 AOR 时间（星期+模式）
SA_MEDIA_RGN_TYPE_TIMESTAMP_WITH_MODE_WEEK_EN = 6, // Mon 1970-01-01 00:00:00 AOR 时间（星期+模式）英文
SA_MEDIA_RGN_TYPE_IMAGE = 0, // 图片
SA_MEDIA_RGN_TYPE_TIMESTAMP = 1, // 1970-01-01 00:00:00 时间戳
SA_MEDIA_RGN_TYPE_TIMESTAMP_DEBUG = 2, // 1970-01-01 00:00:00 时间戳+ISP Info
SA_MEDIA_RGN_TYPE_NUM
} SA_MEDIA_RGN_TYPE_E;
......@@ -94,7 +90,7 @@ typedef struct {
SA_BOOL bEnable;
SA_MEDIA_RGN_TYPE_E enType;
SA_CHAR astrImageFile[128];
RECT_S stRect;
RECT_S stRect;
SA_U32 u32RgbColor[3];
} SA_MEDIA_RGN_CONFIG_S;
......@@ -121,10 +117,7 @@ typedef enum {
SA_MEDIA_SD_COLOR_INDOOR,
SA_MEDIA_SD_COLOR_AISP,
SA_MEDIA_SD_DN_NIGHT,
SA_MEDIA_SD_COLOR_LAMP,
SA_MEDIA_SD_WDR_OUTDOOR,
SA_MEDIA_SD_WDR_INDOOR,
SA_MEDIA_SD_WDR_NIGHT,
SA_MEDIA_SD_COLOR_LAMP,
SA_MEDIA_SD_BACKLIGHT,
SA_MEDIA_SD_TYPE_NUM,
} SA_MEDIA_SD_TYPE_E;
......@@ -188,16 +181,12 @@ typedef struct {
} SA_MEDIA_SD_CONFIG_S;
typedef enum {
SA_MEDIA_ISP_BIN_PATH_BASE = 0,
SA_MEDIA_ISP_BIN_PATH_COLOR_OUTDOOR = 1,
SA_MEDIA_ISP_BIN_PATH_COLOR_INDOOR = 2,
SA_MEDIA_ISP_BIN_PATH_COLOR_AISP = 3,
SA_MEDIA_ISP_BIN_PATH_DN_NIGHT = 4,
SA_MEDIA_ISP_BIN_PATH_COLOR_LAMP = 5,
SA_MEDIA_ISP_BIN_PATH_WDR_OUTDOOR = 6,
SA_MEDIA_ISP_BIN_PATH_WDR_INDOOR = 7,
SA_MEDIA_ISP_BIN_PATH_WDR_NIGHT = 8,
SA_MEDIA_ISP_BIN_PATH_COLOR_BACKLIGHT = 9,
SA_MEDIA_ISP_BIN_PATH_COLOR_OUTDOOR = 0,
SA_MEDIA_ISP_BIN_PATH_COLOR_INDOOR = 1,
SA_MEDIA_ISP_BIN_PATH_COLOR_AISP = 2,
SA_MEDIA_ISP_BIN_PATH_DN_NIGHT = 3,
SA_MEDIA_ISP_BIN_PATH_COLOR_LAMP = 4,
SA_MEDIA_ISP_BIN_PATH_COLOR_BACKLIGHT = 5,
SA_MEDIA_ISP_BIN_PATH_NUM
} SA_MEDIA_ISP_BIN_PATH_E;
......@@ -435,8 +424,8 @@ typedef struct {
SA_BOOL bEnable;
RGN_HANDLE u32HandleId;
MPP_CHN_S stSrc;
RGN_ATTR_S stAttr;
RGN_CHN_ATTR_S stChnAttr;
RECT_S stRect;
SA_U32 u32FontSize;
SA_MEDIA_RGN_TYPE_E enType;
SA_CHAR astrImageFile[128];
} SA_MEDIA_RGN_CHN_ATTR_S;
......@@ -590,12 +579,30 @@ typedef struct saHEIF_FRAME_INFO_S
SA_U32 u32DataLen;
} HEIF_FRAME_INFO_S;
typedef enum {
SA_MEDIA_SD_DYN_GET,
SA_MEDIA_SD_DYN_SET,
} SA_MEDIA_SD_DYN_E;
typedef enum {
SA_MEDIA_DUMP_YUV,
SA_MEDIA_DUMP_RAW,
SA_MEDIA_DUMP_MAX
} SA_MEDIA_DUMP_E;
typedef struct {
SA_U32 u32IntTime;
SA_U32 u32Iso;
SA_U32 u32AeTarget;
SA_U32 u32Curluma;
SA_S32 s32RealBv;
SA_U32 u32ExpRatio;
SA_U32 u32Ct;
SA_U32 au32WbGain[4];
SA_U32 u32FrameId;
SA_MEDIA_ISP_BIN_PATH_E enSceneType;
} SA_MEDIA_SD_INFO_S;
typedef SA_VOID (*SA_HAPI_DUMPCALLBACK)(SA_MEDIA_DUMP_E, VIDEO_FRAME_INFO_S*);
SA_S32 SA_HAPI_MEDIA_GetAttr(SA_MEDIA_SCENE_E enScene, SA_MEDIA_CONFIG_S *pstSceneConfig, SA_MEDIA_ATTR_S *pstMediaAttr);
......@@ -609,6 +616,7 @@ SA_S32 SA_HAPI_MEDIA_GetAudioStream(SA_MEDIA_AUDIO_STREAM_S *pstStream, SA_S32 s
SA_S32 SA_HAPI_MEDIA_ReleaseAudioStream(SA_MEDIA_AUDIO_STREAM_S *pstStream);
SA_S32 SA_HAPI_MEDIA_StartDump(VI_DEV s32DevId, SA_MEDIA_DUMP_E enDumpType, SA_HAPI_DUMPCALLBACK pFrameCallback);
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);
#ifdef __linux__
#define HAPI_MEDIA_MALLOC malloc
#define HAPI_MEDIA_CALLOC calloc
......
sdk/opensource/include/tool_comm.h
View file @ c8d13a93
......@@ -18,7 +18,16 @@ extern "C" {
#include "sa_comm_type.h"
SA_S32 COMM_Register_Dump(SA_VOID *fpnStartDump, SA_VOID *fpnStopDump, SA_VOID *fpnCaptureDump);
typedef enum _COMM_CALLBACK_E
{
COMM_CALLBACK_START_DUMP,
COMM_CALLBACK_STOP_DUMP,
COMM_CALLBACK_CAPTURE,
COMM_CALLBACK_SD_DYNATTR,
COMM_CALLBACK_BUTT
} COMM_CALLBACK_E;
SA_S32 COMM_Register_Callback(COMM_CALLBACK_E enCallback, SA_VOID *fpnCallback);
SA_S32 COMM_Send_Data(SA_U8 *pu8Data, SA_U32 u32Len);
SA_VOID COMM_Server_Deinit(SA_VOID);
SA_VOID COMM_Server_Init(SA_VOID);
......
sdk/opensource/lib/libdisplay_open.so
View file @ c8d13a93
libdisplay_open.so.2.5.0.6.9
\ No newline at end of file
libdisplay_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libhapi_open.so
View file @ c8d13a93
libhapi_open.so.2.5.0.6.9
\ No newline at end of file
libhapi_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libimu_open.so
View file @ c8d13a93
libimu_open.so.2.5.0.6.9
\ No newline at end of file
libimu_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libjson_open.so
View file @ c8d13a93
libjson_open.so.2.5.0.6.9
\ No newline at end of file
libjson_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/liblens_open.so
View file @ c8d13a93
liblens_open.so.2.5.0.6.9
\ No newline at end of file
liblens_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/librtsp_open.so
View file @ c8d13a93
librtsp_open.so.2.5.0.6.9
\ No newline at end of file
librtsp_open.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libsns_gc4103_soc.so
View file @ c8d13a93
libsns_gc4103_soc.so.2.5.0.6.9
\ No newline at end of file
libsns_gc4103_soc.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libsns_imx327_soc.so
View file @ c8d13a93
libsns_imx327_soc.so.2.5.0.6.9
\ No newline at end of file
libsns_imx327_soc.so.2.5.0.7.0
\ No newline at end of file
sdk/opensource/lib/libsns_imx681_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os02n10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04a10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04d10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04d10_soc13.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04d10_soc30.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04j10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os04l10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os05l10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os08a10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_os08d10_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_sc465sl_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_sc535_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libsns_sc8238_soc.so
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libtool_comm.so 100755 → 100644
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/lib/libtool_comm_static.a
View file @ c8d13a93
This diff is collapsed.
sdk/opensource/source/hapi/src/media/sa_inner_hapi_media_rgn.c 0 → 100644
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/audioplayer
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/audioplayrecord
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/audiorecorder
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/camerafilter
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/cameraipc
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/camerasvp
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/cameravpu
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/sample_audio_mapi
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/sample_hapi_media
View file @ c8d13a93
This diff is collapsed.
sdk/sample/bin/sample_isp
View file @ c8d13a93
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