Skip to content

S
solution
Commit 9fa158c4 authored by luo's avatar luo
Browse files
Options

[UPDATE]SDK 2.5.0.5.1.2

parent c1f9a37a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 421 additions and 58 deletions
6920_bsp_release/linux/kernel/linux-5.10.106/arch/arm/boot/dts/acme/sa6920-ipc-outdoor-ipc.dts
View file @ 9fa158c4
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}; };
chosen { chosen {
bootargs = "console=ttyS2,115200 mem=64M quiet"; bootargs = "console=ttyS2,115200 mem=96M quiet";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
common/bin/media_imx681_capture.json 0 → 100644
View file @ 9fa158c4
{
"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": 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,
"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": 1920, "Height": 1080, "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": 1, "SaveFilePath": "/mnt/sdcard"
},
"record":
{
"EISMode": 0,
"audio":
{
"#note": [
"SampleRate 8000 16000 32000 48000",
"SoundMode 1:mono,2:stereo",
"EncType 1:lcaac,2:g711a,3:g711u,4: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_record.json 0 → 100644
View file @ 9fa158c4
{
"doc": "media",
"version": "1.0.0.1",
"#note": [
"scene: capture,record,captureaddrecord,visual"
],
"scene": "record",
"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": 30.0, "MinFps": 30.0, "Mirror": 0, "Flip": 0, "Rotation": 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",
"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": 1920, "Height": 1080, "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": 1, "SaveFilePath": "/mnt/sdcard"
},
"record":
{
"EISMode": 0,
"audio":
{
"#note": [
"SampleRate 8000 16000 32000 48000",
"SoundMode 1:mono,2:stereo",
"EncType 1:lcaac,2:g711a,3:g711u,4: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
}
}
ota_pack/device_ota_pack/ota_burn.sh
View file @ 9fa158c4
...@@ -94,9 +94,9 @@ parse_and_upgrade() { ...@@ -94,9 +94,9 @@ parse_and_upgrade() {
if $force_upgrade || version_greater "$ota_version" "$current_ota_version"; then if $force_upgrade || version_greater "$ota_version" "$current_ota_version"; then
echo "OTA_VERSION is greater or force upgrade is enabled. Proceeding with OTA upgrade." echo "OTA_VERSION is greater or force upgrade is enabled. Proceeding with OTA upgrade."
parse_image_info "$content" parse_image_info "$content"
perform_wifi_fw_upgrade $first
perform_kernel_upgrade perform_kernel_upgrade
perform_system_upgrade perform_system_upgrade
perform_wifi_fw_upgrade $first
update_ota_version "$ota_version_full" update_ota_version "$ota_version_full"
else else
echo "OTA_VERSION is not greater and force upgrade is not enabled. No upgrade needed." echo "OTA_VERSION is not greater and force upgrade is not enabled. No upgrade needed."
......
run.sh
View file @ 9fa158c4
...@@ -54,6 +54,11 @@ rootfs_copy_file() { ...@@ -54,6 +54,11 @@ rootfs_copy_file() {
mkdir system_temp/conf/681/ -p mkdir system_temp/conf/681/ -p
cp common/conf/681/* system_temp/conf/681/ cp common/conf/681/* system_temp/conf/681/
cp common/bin/lite_imx681* system_temp/bin/ 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
fi fi
if [ "$type" == "qa" ];then if [ "$type" == "qa" ];then
......
run_longse.sh
View file @ 9fa158c4
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
#notice follows path in ota_pack #notice follows path in ota_pack
bootinfo_version="2.5.6" bootinfo_version="2.5.6"
OTA_VERSION="S04_16NRALXSW1Y1_V1.0.5_250123" OTA_VERSION="S04_16NRALXSW1Y1_V1.0.6_250213"
OTA_KERNEL_PATH="../burn_img_nor/bootimg-XIP-6920E-0P55-outdoor-ipc-linux.bin" OTA_KERNEL_PATH="../burn_img_nor/bootimg-XIP-6920E-0P55-outdoor-ipc-linux.bin"
OTA_SYSTEM_PATH="../burn_img_nor/system.squashfs.bin" OTA_SYSTEM_PATH="../burn_img_nor/system.squashfs.bin"
OTA_SDK_VERSION="V2.5.0.2.9" OTA_SDK_VERSION="V2.5.0.5.1"
OTA_WIFI_FW_PATH="../third_party/longse/wifi/AiW4211L_demo_ota_V2025.1.23.bin" OTA_WIFI_FW_PATH="../third_party/longse/wifi/AiW4211L_demo_ota_V2025.2.14.bin"
OTA_BURN_SH_PATH="./device_ota_pack/ota_burn.sh" OTA_BURN_SH_PATH="./device_ota_pack/ota_burn.sh"
OTA_EXT_SH_PATH="./device_ota_pack/sample_ota.sh" OTA_EXT_SH_PATH="./device_ota_pack/sample_ota.sh"
OTA_EXT_CMD="" OTA_EXT_CMD=""
......
sdk/opensource/include/sa_hapi_media.h
View file @ 9fa158c4
...@@ -313,7 +313,7 @@ typedef enum { ...@@ -313,7 +313,7 @@ typedef enum {
SA_MEDIA_RECORD_SAVE_MP4 = 0, SA_MEDIA_RECORD_SAVE_MP4 = 0,
SA_MEDIA_RECORD_SAVE_265 = 1, SA_MEDIA_RECORD_SAVE_265 = 1,
SA_MEDIA_RECORD_SAVE_264 = 2, SA_MEDIA_RECORD_SAVE_264 = 2,
SA_MEDIA_RECORD_SAVE_JPG = 2, SA_MEDIA_RECORD_SAVE_JPG = 3,
} SA_MEDIA_RECORD_SAVE_FORMAT_E; } SA_MEDIA_RECORD_SAVE_FORMAT_E;
typedef struct { typedef struct {
...@@ -360,7 +360,7 @@ typedef struct { ...@@ -360,7 +360,7 @@ typedef struct {
VI_DEV_ATTR_S stViDevAttr; VI_DEV_ATTR_S stViDevAttr;
VI_PIPE_ATTR_S stViPipeAttr; VI_PIPE_ATTR_S stViPipeAttr;
SA_BOOL bMdEnable; SA_BOOL bMdEnable;
VI_GDC_ROTATE_E enRotation; VI_GDC_ATTR_S stViGdcAttr;
VI_EIS_MODE_E enEisMode; VI_EIS_MODE_E enEisMode;
} SA_MEDIA_VI_ATTR_S; } SA_MEDIA_VI_ATTR_S;
......
sdk/opensource/source/hapi/include/mapi/sa_hapi_media.h
View file @ 9fa158c4
...@@ -313,7 +313,7 @@ typedef enum { ...@@ -313,7 +313,7 @@ typedef enum {
SA_MEDIA_RECORD_SAVE_MP4 = 0, SA_MEDIA_RECORD_SAVE_MP4 = 0,
SA_MEDIA_RECORD_SAVE_265 = 1, SA_MEDIA_RECORD_SAVE_265 = 1,
SA_MEDIA_RECORD_SAVE_264 = 2, SA_MEDIA_RECORD_SAVE_264 = 2,
SA_MEDIA_RECORD_SAVE_JPG = 2, SA_MEDIA_RECORD_SAVE_JPG = 3,
} SA_MEDIA_RECORD_SAVE_FORMAT_E; } SA_MEDIA_RECORD_SAVE_FORMAT_E;
typedef struct { typedef struct {
...@@ -360,7 +360,7 @@ typedef struct { ...@@ -360,7 +360,7 @@ typedef struct {
VI_DEV_ATTR_S stViDevAttr; VI_DEV_ATTR_S stViDevAttr;
VI_PIPE_ATTR_S stViPipeAttr; VI_PIPE_ATTR_S stViPipeAttr;
SA_BOOL bMdEnable; SA_BOOL bMdEnable;
VI_GDC_ROTATE_E enRotation; VI_GDC_ATTR_S stViGdcAttr;
VI_EIS_MODE_E enEisMode; VI_EIS_MODE_E enEisMode;
} SA_MEDIA_VI_ATTR_S; } SA_MEDIA_VI_ATTR_S;
......
sdk/opensource/source/hapi/src/media/sa_inner_hapi_media_video.c
View file @ 9fa158c4
...@@ -25,17 +25,19 @@ extern "C" { ...@@ -25,17 +25,19 @@ extern "C" {
#include "sa_inner_hapi_media_sd.h" #include "sa_inner_hapi_media_sd.h"
#endif #endif
// VI_GDC_ATTR_S MEDIA_GDC_PARAM_DEFAULT = VI_GDC_ATTR_S MEDIA_GDC_PARAM_DEFAULT =
// { {
// .bGdcEn = SA_TRUE, .enGdcMode = VI_GDC_WARP,
// .stGdcParam = { .stGdcWarpParam = {
// .bFishEye = 0, .bFishEye = 0,
// .f32CameraK = { {803.651143, 0.000000, 1280.500000}, .f32FovScale = 1.0,
// {0.000000, 803.651143, 720.500000}, .f32CameraK = { {803.651143, 0.000000, 1280.500000},
// {0.000000, 0.000000, 1.000000}}, {0.000000, 803.651143, 720.500000},
// .f32UndistortCoefs = {-0.064685, 0.003107, 0.000000, 0.000000, -0.000904, 0.0776239, -0.016690, 0.000808}, {0.000000, 0.000000, 1.000000}},
// }, .f32UndistortCoefs = {-0.064685, 0.003107, 0.000000, 0.000000, -0.000904, 0.0776239, -0.016690, 0.000808},
// }; },
};
#define MEDIA_LTM_SIZE_WIDTH_MAX (3840) #define MEDIA_LTM_SIZE_WIDTH_MAX (3840)
#define MEDIA_LTM_SIZE_HEIGHT_MAX (2736) #define MEDIA_LTM_SIZE_HEIGHT_MAX (2736)
#ifndef MEDIA_ALIGN_UP #ifndef MEDIA_ALIGN_UP
...@@ -709,19 +711,18 @@ static SA_S32 INNER_HAPI_VIN_GetAttr(SA_MEDIA_SCENE_E enScene, SA_MEDIA_VIDEO_CO ...@@ -709,19 +711,18 @@ static SA_S32 INNER_HAPI_VIN_GetAttr(SA_MEDIA_SCENE_E enScene, SA_MEDIA_VIDEO_CO
} }
// gdc // gdc
// if (pstSceneConfig->bGdc) { if (pstSceneConfig->bGdc) {
// memcpy(&pstVinAttr->stViAttr.stViGdcAttr, &MEDIA_GDC_PARAM_DEFAULT, sizeof(VI_GDC_ATTR_S)); memcpy(&pstVinAttr->stViAttr.stViGdcAttr, &MEDIA_GDC_PARAM_DEFAULT, sizeof(VI_GDC_ATTR_S));
// pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.enGdcRotate = pstSceneConfig->enRotation; if ((abs(stSnsRes.u32Width / 2 - (SA_S32)pstVinAttr->stViAttr.stViGdcAttr.stGdcWarpParam.f32CameraK[0][2]) > 100) ||
// if ((abs(stSnsRes.u32Width / 2 - (SA_S32)pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.f32CameraK[0][2]) > 100) || (abs(stSnsRes.u32Height / 2 - (SA_S32)pstVinAttr->stViAttr.stViGdcAttr.stGdcWarpParam.f32CameraK[1][2]) > 100)) {
// (abs(stSnsRes.u32Height / 2 - (SA_S32)pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.f32CameraK[1][2]) > 100)) { HAPI_MEDIA_LOG_E("gdc cameraK param is out of range, please check the param.\n");
// HAPI_MEDIA_LOG_E("gdc cameraK param is out of range, please check the param.\n"); pstVinAttr->stViAttr.stViGdcAttr.stGdcWarpParam.f32CameraK[0][2] = stSnsRes.u32Width / 2;
// pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.f32CameraK[0][2] = stSnsRes.u32Width / 2; pstVinAttr->stViAttr.stViGdcAttr.stGdcWarpParam.f32CameraK[1][2] = stSnsRes.u32Height / 2;
// pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.f32CameraK[1][2] = stSnsRes.u32Height / 2; }
// } } else if (pstSceneConfig->enRotation != VI_GDC_ROTATE_0) {
// } else if (pstSceneConfig->enRotation != VI_GDC_ROTATE_0) { pstVinAttr->stViAttr.stViGdcAttr.enGdcMode = VI_GDC_ROTATION;
// pstVinAttr->stViAttr.stViGdcAttr.bGdcEn = SA_TRUE; pstVinAttr->stViAttr.stViGdcAttr.stGdcRotationParam.enGdcRotate = pstSceneConfig->enRotation;
// pstVinAttr->stViAttr.stViGdcAttr.stGdcParam.enGdcRotate = pstSceneConfig->enRotation; }
// }
pstVinAttr->stIspAttr.u32IspPipeId = ViPipe; pstVinAttr->stIspAttr.u32IspPipeId = ViPipe;
memcpy(&pstVinAttr->stIspAttr.astrIspFile[pstVinAttr->stIspAttr.u32IspPipeId][0][0],pstSceneConfig->astrIspFile[0],SA_MEDIA_ISP_BIN_PATH_NUM*sizeof(pstSceneConfig->astrIspFile[0])); memcpy(&pstVinAttr->stIspAttr.astrIspFile[pstVinAttr->stIspAttr.u32IspPipeId][0][0],pstSceneConfig->astrIspFile[0],SA_MEDIA_ISP_BIN_PATH_NUM*sizeof(pstSceneConfig->astrIspFile[0]));
...@@ -1012,15 +1013,8 @@ static SA_S32 INNER_HAPI_VIN_SetPipeParam(VI_PIPE u32ViPipeId, SA_MEDIA_VIN_ATTR ...@@ -1012,15 +1013,8 @@ static SA_S32 INNER_HAPI_VIN_SetPipeParam(VI_PIPE u32ViPipeId, SA_MEDIA_VIN_ATTR
memcpy(&stPipeParam.stViMdAttr, &stMdAttr, sizeof(VI_MD_ATTR_S)); memcpy(&stPipeParam.stViMdAttr, &stMdAttr, sizeof(VI_MD_ATTR_S));
} }
if (pstChnAttr->stViAttr.enRotation) { if (pstChnAttr->stViAttr.stViGdcAttr.enGdcMode) {
VI_GDC_ATTR_S stGdcAttr = { memcpy(&stPipeParam.stViGdcAttr, &pstChnAttr->stViAttr.stViGdcAttr, sizeof(VI_GDC_ATTR_S));
.enGdcMode = VI_GDC_ROTATION,
.stGdcRotationParam = {
.enGdcRotate = pstChnAttr->stViAttr.enRotation,
}
};
memcpy(&stPipeParam.stViGdcAttr, &stGdcAttr, sizeof(VI_GDC_ATTR_S));
} }
if(pstChnAttr->stViAttr.enEisMode) { if(pstChnAttr->stViAttr.enEisMode) {
...@@ -1031,7 +1025,6 @@ static SA_S32 INNER_HAPI_VIN_SetPipeParam(VI_PIPE u32ViPipeId, SA_MEDIA_VIN_ATTR ...@@ -1031,7 +1025,6 @@ static SA_S32 INNER_HAPI_VIN_SetPipeParam(VI_PIPE u32ViPipeId, SA_MEDIA_VIN_ATTR
memcpy(&stPipeParam.stViEisAttr, &eis_attr, sizeof(VI_EIS_ATTR_S)); memcpy(&stPipeParam.stViEisAttr, &eis_attr, sizeof(VI_EIS_ATTR_S));
} }
stPipeParam.stViPyrAttr.bPyrBypass = 2;
stPipeParam.stViPyrAttr.u32Depth = (pstChnAttr->stSensorAttr.f32Fps >= 20.0) ? 3 : 0; stPipeParam.stViPyrAttr.u32Depth = (pstChnAttr->stSensorAttr.f32Fps >= 20.0) ? 3 : 0;
s32Ret = SA_MAPI_VI_SetPipeParam(u32ViPipeId, &stPipeParam); s32Ret = SA_MAPI_VI_SetPipeParam(u32ViPipeId, &stPipeParam);
......
sdk/opensource/source/sensor/Makefile
View file @ 9fa158c4
...@@ -302,7 +302,7 @@ ifeq ("$(SNS_SUPPORT_OS05L10_SOC)","y") ...@@ -302,7 +302,7 @@ ifeq ("$(SNS_SUPPORT_OS05L10_SOC)","y")
CFLAGS += -DSNS_OS05L10 CFLAGS += -DSNS_OS05L10
SRC_OS05L10_SOC := $(wildcard $(src)/os05l10_soc/*.c) SRC_OS05L10_SOC := $(wildcard $(src)/os05l10_soc/*.c)
SRC_OS05L10_SOC += $(wildcard $(src)/os05l10_soc/driver/*.c) SRC_OS05L10_SOC += $(wildcard $(src)/os05l10_soc/driver/*.c)
JSON_SOC += $(src)/os05l10_soc/user_os05l10.json #JSON_SOC += $(src)/os05l10_soc/user_os05l10.json
TARGET_MAKE += LIB_OS05L10_SOC TARGET_MAKE += LIB_OS05L10_SOC
TARGET_CLEAN += LIB_OS05L10_SOC_CLEAN TARGET_CLEAN += LIB_OS05L10_SOC_CLEAN
OBJ_OS05L10_SOC := $(patsubst %.c, %.o, ${SRC_OS05L10_SOC}) OBJ_OS05L10_SOC := $(patsubst %.c, %.o, ${SRC_OS05L10_SOC})
......
sdk/scripts/sdk_script/update_system.sh
View file @ 9fa158c4
...@@ -18,19 +18,25 @@ if [ $# -ne 1 ]; then ...@@ -18,19 +18,25 @@ if [ $# -ne 1 ]; then
else else
printf "convert image ...\n" printf "convert image ...\n"
${simg2img} $1 /mnt/sdcard/system.raw ${simg2img} $1 /mnt/sdcard/system.raw
rm ${simg2img}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
printf "convert image failed!\n" printf "convert image failed!\n"
exit exit
fi fi
rm ${simg2img}
printf "write image ...\n" printf "write image ...\n"
lsof |grep "/acme" |awk '{print $1}' |xargs kill -9
umount /acme
lsof
dd if=/mnt/sdcard/system.raw of=/dev/mmcblk0p2 bs=1M dd if=/mnt/sdcard/system.raw of=/dev/mmcblk0p2 bs=1M
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
printf "write image failed!\n" printf "write image failed!\n"
exit exit
fi fi
sync sync
rm -rf /mnt/sdcard/system.raw dd if=/dev/mmcblk0p2 of=/mnt/sdcard/system.raw.new bs=1M
sync
md5sum /mnt/sdcard/system.raw*
rm -rf /mnt/sdcard/system.raw*
printf "write image success!\n" printf "write image success!\n"
fi fi
exit exit
third_party/longse/patch/opensource.patch
View file @ 9fa158c4
diff --git a/sdk/opensource/lib/libhapi_open.so.2.5.0.4.9 b/sdk/opensource/lib/libhapi_open.so.2.5.0.4.9
index d5cc4fd72..e0b6e3261 100755
Binary files a/sdk/opensource/lib/libhapi_open.so.2.5.0.4.9 and b/sdk/opensource/lib/libhapi_open.so.2.5.0.4.9 differ
diff --git a/sdk/opensource/lib/libhapi_open_static.a b/sdk/opensource/lib/libhapi_open_static.a
index 31c5f3d77..51ecf1b5b 100644
Binary files a/sdk/opensource/lib/libhapi_open_static.a and b/sdk/opensource/lib/libhapi_open_static.a differ
diff --git a/sdk/opensource/lib/libsns_os04d10_soc30.so.2.5.0.4.9 b/sdk/opensource/lib/libsns_os04d10_soc30.so.2.5.0.4.9
index a76baabbb..93fec0e57 100755
Binary files a/sdk/opensource/lib/libsns_os04d10_soc30.so.2.5.0.4.9 and b/sdk/opensource/lib/libsns_os04d10_soc30.so.2.5.0.4.9 differ
diff --git a/sdk/opensource/source/sensor/comm/isp_ext.c b/sdk/opensource/source/sensor/comm/isp_ext.c diff --git a/sdk/opensource/source/sensor/comm/isp_ext.c b/sdk/opensource/source/sensor/comm/isp_ext.c
index 9939fff8a..b847aaf7a 100755 index 9939fff8a..b847aaf7a 100755
--- a/sdk/opensource/source/sensor/comm/isp_ext.c --- a/sdk/opensource/source/sensor/comm/isp_ext.c
......
third_party/longse/scripts/enable_sdio_wifi_longse.sh
View file @ 9fa158c4
...@@ -6,6 +6,17 @@ max_retries=20 ...@@ -6,6 +6,17 @@ max_retries=20
check_interval=2 check_interval=2
retries=0 retries=0
check_ip_address() {
ip_address=$(ifconfig wlan0 | grep 'inet ' | awk '{print $2}')
if [ "$ip_address" = "0.0.0.0" ]; then
echo "WIFI IP address is 0.0.0.0, indicating a problem with the connection."
return 1
else
echo "WIFI IP address is $ip_address."
return 0
fi
}
if lsmod | grep -q socchannel; then if lsmod | grep -q socchannel; then
echo "Module socchannel has already been installed." echo "Module socchannel has already been installed."
else else
...@@ -42,7 +53,7 @@ while [ ! -f "$file_path" ]; do ...@@ -42,7 +53,7 @@ while [ ! -f "$file_path" ]; do
done done
echo "link......." echo "link......."
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 for i in 1 2 3 4 5 6
do do
sample_cli getmac sample_cli getmac
sample_cli getip sample_cli getip
...@@ -52,6 +63,8 @@ do ...@@ -52,6 +63,8 @@ do
exit 1 exit 1
else else
echo "WIFI access to internet error, wait sometime!" echo "WIFI access to internet error, wait sometime!"
exit 0
fi fi
done done
echo "Failed to access the internet after multiple attempts."
exit 0
\ No newline at end of file
third_party/longse/scripts/load_longse_linux_all.sh 0 → 100755
View file @ 9fa158c4
#!/bin/sh
#if [ -e "/sys/devices/system/cpu/cpufreq/policy0/scaling_governor" ]; then
#echo "performance" >/sys/devices/system/cpu/cpufreq/policy0/scaling_governor
#fi
ko_dir=/acme/lib/modules
echo 1 >/proc/acme-wdt
# Enable TMI8150B
if [ ! -e /sys/class/gpio/gpio89 ]; then
echo 89 >/sys/class/gpio/export
fi
echo out >/sys/class/gpio/gpio89/direction
echo 1 >/sys/class/gpio/gpio89/value
machine=`uname -m`
if [ ${machine} = "aarch64" ];then
/sbin/insmod ${ko_dir}/osal/osaldrv.ko anony=1 mmz_allocator=superacme mmz=anonymous,0,0x68000000,128M:sram,0,0x201E0000,4352K
else
/sbin/insmod ${ko_dir}/osal/osaldrv.ko anony=1 mmz_allocator=superacme mmz=anonymous,0,0x66000000,160M:sram,0,0x201E0000,4352K
fi
# dtbo
mkdir -p /sys/kernel/config/device-tree/overlays/sdk
cat ${ko_dir}/sa6920-ipc-sdk.dtbo >/sys/kernel/config/device-tree/overlays/sdk/dtbo
# common ko
/sbin/insmod ${ko_dir}/hwticks.ko
/sbin/insmod ${ko_dir}/osal/savdma.ko
/sbin/insmod ${ko_dir}/osal/sys.ko
/sbin/insmod ${ko_dir}/dvfs.ko
# vpu drivers
/sbin/insmod ${ko_dir}/venc.ko
/sbin/insmod ${ko_dir}/jpege.ko
/sbin/insmod ${ko_dir}/jpegd.ko
/sbin/insmod ${ko_dir}/vi.ko
/sbin/insmod ${ko_dir}/sa_mipi_rx.ko
/sbin/insmod ${ko_dir}/imu_i2c.ko
# ISP drivers
/sbin/insmod ${ko_dir}/isp_lli.ko
/sbin/insmod ${ko_dir}/isp_h3a.ko
/sbin/insmod ${ko_dir}/isp_fe.ko
/sbin/insmod ${ko_dir}/vpss.ko
/sbin/insmod ${ko_dir}/isp_pe.ko
/sbin/insmod ${ko_dir}/isp_be.ko
/sbin/insmod ${ko_dir}/isp_gdc.ko
/sbin/insmod ${ko_dir}/isp.ko
# filter drivers
/sbin/insmod ${ko_dir}/isplite.ko
/sbin/insmod ${ko_dir}/ispctrl.ko
# anne drivers & audio drivers
model=$(cat /proc/device-tree/model)
echo $model
if echo "$model" | grep -q "pt2l" ; then
/sbin/insmod ${ko_dir}/snd-soc-sa8901.ko async_probe=1
elif echo "$model" | grep -q "c2" ; then
/sbin/insmod ${ko_dir}/snd-soc-sa8901.ko async_probe=1
elif echo "$model" | grep -q "bc4e" ; then
/sbin/insmod ${ko_dir}/snd-soc-sa8901.ko async_probe=1
else
/sbin/insmod ${ko_dir}/snd-soc-sa8900.ko async_probe=1
fi
/sbin/insmod ${ko_dir}/designware_i2s.ko async_probe=1
/sbin/insmod ${ko_dir}/snd-soc-simple-card-utils.ko async_probe=1
/sbin/insmod ${ko_dir}/snd-soc-simple-card.ko async_probe=1
/sbin/insmod ${ko_dir}/anne.ko
/sbin/insmod ${ko_dir}/audio_ctrl.ko
# bpm
/sbin/insmod ${ko_dir}/osal/bpm.ko
# sensor i2c
mkdir -p /sys/kernel/config/device-tree/overlays/i2c
cat ${ko_dir}/sa6920-i2c.dtbo >/sys/kernel/config/device-tree/overlays/i2c/dtbo
#dmatest
#/sbin/insmod ${ko_dir}/dmatest.ko
# vnne
/sbin/insmod ${ko_dir}/vnne.ko
# npu
/sbin/insmod ${ko_dir}/npu_heron_svp.ko g_phy_addr=0xa0000000
# aisp
/sbin/insmod ${ko_dir}/aisp.ko
# pwm
/sbin/insmod ${ko_dir}/pwm-acme.ko
#pstore
/sbin/insmod ${ko_dir}/pstore.ko
/sbin/insmod ${ko_dir}/reed_solomon.ko
/sbin/insmod ${ko_dir}/ramoops.ko
# bus qos
/acme/bin/tzc400 -R 0x5d042100 -V 0x1 # filter read qos
/acme/bin/tzc400 -R 0x5d042104 -V 0x1 # filter write qos
/acme/bin/tzc400 -R 0x5d043100 -V 0x0 # cpu read qos
/acme/bin/tzc400 -R 0x5d043104 -V 0x0 # cpu write qos
/acme/bin/tzc400 -R 0x5d044100 -V 0x1 # isp read qos
/acme/bin/tzc400 -R 0x5d044104 -V 0x1 # isp write qos
/acme/bin/tzc400 -R 0x5d047100 -V 0x0 # vpu read qos
/acme/bin/tzc400 -R 0x5d047104 -V 0x0 # vpu write qos
/acme/bin/tzc400 -R 0x5d048100 -V 0x0 # npu read qos
/acme/bin/tzc400 -R 0x5d048104 -V 0x0 # npu write qos
third_party/longse/scripts/sdk_script/S91LongseApp
View file @ 9fa158c4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/usr/bin/head -n 9 /dev/mtdblock5 > /tmp/devinfo.config /usr/bin/head -n 9 /dev/mtdblock5 > /tmp/devinfo.config
/sbin/insmod /acme/lib/modules/acme_rpmsg_rpc_app.ko /sbin/insmod /acme/lib/modules/acme_rpmsg_rpc_app.ko
/sbin/insmod /acme/lib/modules/pt_motor.ko /sbin/insmod /acme/lib/modules/pt_motor.ko
/bin/sh /acme/scripts/load_pt2_linux_all.sh /bin/sh /acme/scripts/load_longse_linux_all.sh
/sbin/insmod /acme/lib/modules/socchannel.ko int_gpio=25 /sbin/insmod /acme/lib/modules/socchannel.ko int_gpio=25
/acme/bin/vlink_socchannel_main > /dev/null 2>&1 & /acme/bin/vlink_socchannel_main > /dev/null 2>&1 &
......
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