From 6ba888f37ab98b380cdd0bce3b41d63f39d86086 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Tue, 30 Jan 2024 13:24:35 +0000 Subject: [PATCH] update --- README.md | 2 +- install.sh | 4 ++-- patch/stream.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4899b54e..96257252 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Releases带One-KVM前缀、burn后缀的为线刷镜像，可使用USB_Burning_T **方式二：One-KVM脚本安装** -一键脚本适用于玩客云Armbian 22.11.0-trunk Jammy Linux onecloud 5.10.xxx(如5.10.149 5.10.158)镜像、作者发布地基础镜像。 +一键脚本适用于玩客云Armbian 22.11.0-trunk Jammy Linux onecloud 5.10.xxx(如5.10.149 5.10.158)镜像.如若使用此项目发布的Armbian基础镜像，需注释掉脚本尾部的两个函数`override-uboot` `change-device-tree`。 ```bash git clone https://github.com/mofeng-git/One-KVM.git diff --git a/install.sh b/install.sh index 8ec0fd1c..62df56a8 100755 --- a/install.sh +++ b/install.sh @@ -118,7 +118,7 @@ kvmd-ffmpeg-h-264(){ #写入ffmpeg转码推流文件和janus streaming配置文件 cp -r /etc/kvmd/janus /etc/kvmd/janus2 rm /etc/kvmd/janus2/janus.plugin.ustreamer.jcfg - cat > /etc/kvmd/janus_2/janus.plugin.streaming.jcfg << EOF + cat > /etc/kvmd/janus2/janus.plugin.streaming.jcfg << EOF kvmd-ffmpeg: { type = "rtp" id = 1 @@ -164,7 +164,7 @@ EOF cp -f ./patch/stream.sh /usr/share/kvmd/ && cp -f ./patch/stream_when_ustream_exists.sh /usr/share/kvmd/ && chmod +x /usr/share/kvmd/stream.sh /usr/share/kvmd/stream_when_ustream_exists.sh #启动服务 systemctl enable kvmd-ffmpeg && systemctl enable kvmd-janus-static - systemctl start kvmd-ffmpeg && systemctl start kvmd-janus-static + #systemctl start kvmd-ffmpeg && systemctl start kvmd-janus-static } diff --git a/patch/stream.sh b/patch/stream.sh index c0dfb00c..93b469a5 100644 --- a/patch/stream.sh +++ b/patch/stream.sh @@ -1,3 +1,3 @@ #!/bin/bash -/usr/bin/ustreamer-dump --sink kvmd::ustreamer::jpeg --output - | /usr/bin/ffmpeg -re -use_wallclock_as_timestamps 1 -i pipe: -rtbufsize 10M -c:v libx264 -pix_fmt yuv420p -preset:v ultrafast -tune:v zerolatency -profile:v baseline -bf 0 -b:v 3M -maxrate:v 5M -r 30 -g 30 -an -f rtp rtp://127.0.0.1:5004 +/usr/bin/ustreamer-dump --sink kvmd::ustreamer::jpeg --output - | /usr/bin/ffmpeg -re -use_wallclock_as_timestamps 1 -i pipe: -rtbufsize 10M -c:v libx264 -pix_fmt yuv420p -preset:v ultrafast -tune:v zerolatency -profile:v baseline -bf 0 -b:v 3M -maxrate:v 5M -r 10 -g 10 -an -f rtp rtp://127.0.0.1:5004