diff --git a/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts b/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts index dd0becea5..c1c2eb704 100755 --- a/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts +++ b/device/config/chips/v851s/configs/fastboot_sl100_back/board.dts @@ -1570,7 +1570,7 @@ &usbc0 { device_type = "usbc0"; - usb_port_type = <0x2>; + usb_port_type = <0x1>; usb_detect_type = <0x1>; usb_detect_mode = <0x0>; /*usb_id_gpio = <&pio PH 14 0 1 0xffffffff 0xffffffff>;*/ @@ -1802,7 +1802,7 @@ lcd_bl_0_percent = <0>; lcd_bl_40_percent = <23>; lcd_bl_100_percent = <100>; - lcd_backlight = <150>; + lcd_backlight = <0>; lcd_if = <4>; lcd_x = <720>; @@ -1814,7 +1814,7 @@ lcd_pwm_used = <1>; lcd_pwm_ch = <6>; lcd_pwm_freq = <50000>; - lcd_pwm_pol = <1>; + lcd_pwm_pol = <0>; lcd_pwm_max_limit = <255>; lcd_hbp = <40>; diff --git a/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/libisp/isp_cfg/isp_ini_parse.c b/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/libisp/isp_cfg/isp_ini_parse.c index a65fe943c..08d329730 100755 --- a/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/libisp/isp_cfg/isp_ini_parse.c +++ b/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/libisp/isp_cfg/isp_ini_parse.c @@ -56,8 +56,8 @@ #endif #ifdef SENSOR_GC2083 -#include "SENSOR_H/gc2083/gc2083_mipi_isp600_20241010_color.h" -#include "SENSOR_H/gc2083/gc2083_mipi_isp600_20240911_ir.h" +#include "SENSOR_H/gc2083/gc2083_mipi_2_isp600_20231212_103735_gj_rgb.h" +#include "SENSOR_H/gc2083/gc2083_mipi_2_isp600_20230913_015805_gj_ir.h" #endif #ifdef SENSOR_F37P @@ -1030,8 +1030,8 @@ struct isp_cfg_array cfg_arr[] = { #endif #ifdef SENSOR_GC2083 - {"gc2083_mipi", "gc2083_mipi_isp600_20241010_color", 1920, 1088, 15, 0, 0, &gc2083_mipi_isp_cfg}, - {"gc2083_mipi", "gc2083_mipi_isp600_20240911_ir", 1920, 1088, 15, 0, 1, &gc2083_mipi_ir_isp_cfg}, + {"gc2083_mipi", "gc2083_mipi_2_isp600_20231212_103735_gj_rgb", 1920, 1088, 15, 0, 0, &gc2083_mipi_rgb_isp_cfg}, + {"gc2083_mipi", "gc2083_mipi_2_isp600_20230913_015805_gj_ir", 1920, 1088, 15, 0, 1, &gc2083_mipi_ir_isp_cfg}, #endif #ifdef SENSOR_GC4663 diff --git a/lichee/linux-4.9/drivers/media/platform/sunxi-vin/modules/sensor/gc2083_mipi.c b/lichee/linux-4.9/drivers/media/platform/sunxi-vin/modules/sensor/gc2083_mipi.c index bf7fa3c85..dec2d8a97 100644 --- a/lichee/linux-4.9/drivers/media/platform/sunxi-vin/modules/sensor/gc2083_mipi.c +++ b/lichee/linux-4.9/drivers/media/platform/sunxi-vin/modules/sensor/gc2083_mipi.c @@ -50,7 +50,7 @@ MODULE_LICENSE("GPL"); #define SENSOR_NAME "gc2083_mipi" #define SENSOR_NAME_2 "gc2083_mipi_2" -// #define GC2083_1920X1088_20FPS +//#define GC2083_1920X1088_20FPS #define GC2083_1920X1088_15FPS //#define GC2083_1920X360_120FPS /* diff --git a/lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/isp_ini_parse.c b/lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/isp_ini_parse.c index 453551a08..05175a313 100755 --- a/lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/isp_ini_parse.c +++ b/lichee/rtos-hal/hal/source/vin/vin_isp/isp_server/isp_cfg/isp_ini_parse.c @@ -110,8 +110,8 @@ #endif // CONFIG_SENSOR_OV02B10_MIPI #ifdef CONFIG_SENSOR_GC2083_MIPI -#include "SENSOR_H/gc2083_mipi_isp600_20241010_color.h" -#include "SENSOR_H/gc2083_mipi_isp600_20240911_ir.h" +#include "SENSOR_H/gc2083_mipi_2_isp600_20231212_103735_gj_rgb.h" +#include "SENSOR_H/gc2083_mipi_2_isp600_20230913_015805_gj_ir.h" #endif #else @@ -191,8 +191,8 @@ struct isp_cfg_array cfg_arr[] = { #endif // CONFIG_SENSOR_OV02B10_MIPI #ifdef CONFIG_SENSOR_GC2083_MIPI - {"gc2083_mipi", "gc2083_mipi_isp600_20241010_color", 1920, 1088, 15, 0, 0, &gc2083_mipi_isp_cfg}, - {"gc2083_mipi", "gc2083_mipi_isp600_20240911_ir", 1920, 1088, 15, 0, 1, &gc2083_mipi_ir_isp_cfg}, + {"gc2083_mipi", "gc2083_mipi_2_isp600_20231212_103735_gj_rgb", 1920, 1088, 15, 0, 0, &gc2083_mipi_rgb_isp_cfg}, + {"gc2083_mipi", "gc2083_mipi_2_isp600_20230913_015805_gj_ir", 1920, 1088, 15, 0, 1, &gc2083_mipi_ir_isp_cfg}, #endif #ifdef CONFIG_SENSOR_GC1084_MIPI diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/SL100BACKPANEL b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/SL100BACKPANEL index ab13d313b..d29272a9e 100755 Binary files a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/SL100BACKPANEL and b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/SL100BACKPANEL differ diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/has_mpp_video.conf b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/has_mpp_video.conf index ff173bf83..406762312 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/has_mpp_video.conf +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/has_mpp_video.conf @@ -32,7 +32,8 @@ drop_frm_num = 0 src_width = 1920 src_height = 1080 -src_framerate = 20 +# src_framerate = 20 +src_framerate = 15 vi_buffer_num = 3 @@ -50,8 +51,11 @@ color_space = "rec709_part_range" #venc dev channel id. venc_ch_id = 0 -video_framerate = 20 -video_bitrate = 1572864 +# video_framerate = 20 +video_framerate = 15 +# video_bitrate = 1572864 +# video_bitrate = 1572864 +video_bitrate = 1048576 ##### 1280x720->720p, 1920x1080->1080p, 2304x1296->3M, 2560×1440->2k, 3840x2160->4k, 7680x4320->8k video_width = 1920 @@ -71,7 +75,7 @@ ve_ref_lbc_mode = "aw_lbc_1_5x" product_mode = 0 #key frame interval, 0:=frameRate, >0:interval -key_frame_interval = 100 +key_frame_interval = 30 #Enable GDC, 0:disable(default), 1:enable. enable_gdc = 0 @@ -81,9 +85,9 @@ rc_mode = 1 init_qp = 37 min_i_qp = 25 -max_i_qp = 45 +max_i_qp = 50 min_p_qp = 25 -max_p_qp = 45 +max_p_qp = 50 moving_th = 20 mb_qp_limit_en = 1 quality = 1 diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/cn_lowerpower.aac b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/cn_lowerpower.aac new file mode 100755 index 000000000..0ecb3f588 Binary files /dev/null and b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/cn_lowerpower.aac differ diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/en_lowerpower.aac b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/en_lowerpower.aac new file mode 100755 index 000000000..547210cb5 Binary files /dev/null and b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/APP/voice/en_lowerpower.aac differ diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile index ff075b4c9..96712757e 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-files/etc/profile @@ -13,7 +13,7 @@ export HOME=${HOME:-/root} export PS1='\u@\h:\w\$ ' export LD_LIBRARY_PATH=/usr/lib/eyesee-mpp:${LD_LIBRARY_PATH} ulimit -c unlimited -mount -t debugfs none /sys/kernel/debug +#mount -t debugfs none /sys/kernel/debug [ -x /bin/more ] || alias more=less [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/APP/SL100BACKPANEL b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/APP/SL100BACKPANEL index 1ed3a196e..b6288fe06 100755 Binary files a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/APP/SL100BACKPANEL and b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/APP/SL100BACKPANEL differ diff --git a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/etc/profile b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/etc/profile index ff075b4c9..96712757e 100755 --- a/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/etc/profile +++ b/target/allwinner/v851s-fastboot_sl100_back/busybox-init-base-ota-files/etc/profile @@ -13,7 +13,7 @@ export HOME=${HOME:-/root} export PS1='\u@\h:\w\$ ' export LD_LIBRARY_PATH=/usr/lib/eyesee-mpp:${LD_LIBRARY_PATH} ulimit -c unlimited -mount -t debugfs none /sys/kernel/debug +#mount -t debugfs none /sys/kernel/debug [ -x /bin/more ] || alias more=less [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi