diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig index c9b90874..d2a8df98 100644 --- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig @@ -111,7 +111,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y BR2_PACKAGE_RTL8812AU_OPENIPC=y # FPV -# BR2_PACKAGE_VDEC_OPENIPC is not set +BR2_PACKAGE_VDEC_OPENIPC=y BR2_PACKAGE_DATALINK=y BR2_PACKAGE_WIFIBROADCAST=y # BR2_PACKAGE_WFBOPENHD is not set diff --git a/general/package/datalink/files/gs/channels.sh b/general/package/datalink/files/gs/channels.sh new file mode 100755 index 00000000..2bb8d868 --- /dev/null +++ b/general/package/datalink/files/gs/channels.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exit 1 diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_adec.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_adec.ko index 0cff28e6..92506f8f 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_adec.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_adec.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aenc.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aenc.ko index ed3af569..576e5dbf 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aenc.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aenc.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ai.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ai.ko index 51f5d937..040dd528 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ai.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ai.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aio.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aio.ko index 8c37a2ab..f1987a16 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aio.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_aio.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ao.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ao.ko index d2b9d77e..51d7d667 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ao.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_ao.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_base.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_base.ko index a6737b9d..f78931e0 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_base.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_base.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_chnl.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_chnl.ko index eb88f150..342c8a8d 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_chnl.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_chnl.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_hdmi.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_hdmi.ko index 919cf9dd..691abc04 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_hdmi.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_hdmi.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpegd.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpegd.ko index 4ec5a885..4fe1ed1c 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpegd.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpegd.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpege.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpege.ko index 5b51d1f1..6f464bd5 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpege.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_jpege.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_region.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_region.ko index 4ef7abc4..ee278cd0 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_region.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_region.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_sys.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_sys.ko index 6ef3da63..d819bf78 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_sys.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_sys.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_tde.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_tde.ko index 7cffe5e3..c7323117 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_tde.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_tde.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vdec.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vdec.ko index 972fb343..c02c8716 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vdec.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vdec.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_venc.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_venc.ko index 541630a9..8a3d3622 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_venc.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_venc.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vfmw.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vfmw.ko index 2381d3bb..5b4914f0 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vfmw.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vfmw.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vgs.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vgs.ko index 2856aa97..ada3c5f4 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vgs.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vgs.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vou.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vou.ko index e2d8bfc2..f13d72df 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vou.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vou.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vpss.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vpss.ko index d0162a36..5bb0e5dc 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vpss.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi3536dv100_vpss.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_acodec.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_acodec.ko index 1ef191ef..81fcde0d 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_acodec.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_acodec.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_osal.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_osal.ko index 301c849a..b356c9c0 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_osal.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hi_osal.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hifb.ko b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hifb.ko index 9e36e229..b405f9d7 100644 Binary files a/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hifb.ko and b/general/package/hisilicon-osdrv-hi3536dv100/files/kmod/hifb.ko differ diff --git a/general/package/hisilicon-osdrv-hi3536dv100/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3536dv100/files/script/load_hisilicon index 2948e037..17a131ff 100755 --- a/general/package/hisilicon-osdrv-hi3536dv100/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3536dv100/files/script/load_hisilicon @@ -14,6 +14,14 @@ os_mem_size=${os_mem_size:=32} mmz_start=0 mmz_size=0 +MEM_ALL=256 +MEM_START=0x800 +MEM_SAMALL_LIN=0x1 +MEM_MODE=0 +b_arg_demb=1 +VOU_LEN=22 + + report_error() { echo "******* Error: There's something wrong, please check! *****" exit 1 @@ -38,7 +46,18 @@ remove_audio() { } insert_ko() { - insmod hi_osal.ko mmz=anonymous,0,$mmz_start,$mmz_size anony=1 || report_error + HVRMEM=`cat /proc/cmdline | awk '{print $1}' | sed s/mem=//` + HVRMEM_OS=`echo $HVRMEM | sed s/M//` + + MEM_LEN=`echo "$MEM_ALL $HVRMEM_OS $VOU_LEN"|awk '{printf("%d",$1-$2-$3)}'`M + VOU_START=`echo "$MEM_START $HVRMEM_OS $MEM_LEN "|awk '{printf("0x%03x00000",$1+$2+$3)}'` + MEM_START=`echo "$MEM_START $MEM_SAMALL_LIN $HVRMEM_OS"|awk '{printf("0x%03x00000",$1+$2*$3)}'` + VOU_LEN=`echo $VOU_LEN`M + + echo MEM_START=$MEM_START HVRMEM=$HVRMEM MEM_LEN=$MEM_LEN VOU_START=$VOU_START VOU_LEN=$VOU_LEN + + + insmod hi_osal.ko mmz=anonymous,0,$mmz_start,$mmz_size:vou,0,$VOU_START,$VOU_LEN anony=1 || report_error insmod hi3536dv100_base.ko insmod hi3536dv100_sys.ko mem_total=$mem_total @@ -46,7 +65,7 @@ insert_ko() { exit; fi - insmod hi3536dv100_vdec.ko + insmod hi3536dv100_vdec.ko VBSource=0 u32ProtocolSwitch=0 StreamCompaMode=1 MiniBufMode=0 insmod hi3536dv100_vfmw.ko insmod hi3536dv100_jpegd.ko @@ -54,9 +73,10 @@ insert_ko() { insmod hi3536dv100_region.ko insmod hi3536dv100_vgs.ko - insmod hi3536dv100_vpss.ko - insmod hi3536dv100_vou.ko - insmod hifb.ko video="hifb:vram0_size:8100,vram1_size:128" softcursor="off" + insmod hi3536dv100_vpss.ko vpss_vb_source=0 vpss_en_ratio=0 + insmod hi3536dv100_vou.ko bSaveBufMode=1 + #insmod hifb.ko video="hifb:vram0_size:8100,vram1_size:128" softcursor="off" + insmod hifb.ko video="hifb:vram0_size:7200,vram1_size:128" softcursor="off" insmod hi3536dv100_hdmi.ko insmod hi3536dv100_venc.ko diff --git a/general/package/wifibroadcast/files/gs/wfb.conf b/general/package/wifibroadcast/files/gs/wfb.conf index b4dc809c..46314cd6 100644 --- a/general/package/wifibroadcast/files/gs/wfb.conf +++ b/general/package/wifibroadcast/files/gs/wfb.conf @@ -8,7 +8,7 @@ stream=0 link_id=7669206 # tab_wlan=wlan1 # udp_addr=auto -udp_addr=192.168.0.100 +udp_addr=127.0.0.1 udp_port=5600 use_hdmi=false telemetry=true