From 0751b519c29cdf0b21a9c83569a3b0d7e7fda098 Mon Sep 17 00:00:00 2001 From: mofeng-git Date: Tue, 5 Nov 2024 02:12:00 +0000 Subject: [PATCH] =?UTF-8?q?#44=20=E6=B7=BB=E5=8A=A0=20docker=20=E7=BD=91?= =?UTF-8?q?=E9=A1=B5=E9=9F=B3=E9=A2=91=E6=94=AF=E6=8C=81=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BD=9C=E8=80=85=E4=BF=AE=E6=94=B9=E7=89=88=20ustrea?= =?UTF-8?q?mer=20H.264/WebRTC=20=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E5=8F=AF=E7=94=A8=20H.264/WebRTC=20=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E7=BD=91=E9=A1=B5=E5=BD=95=E5=88=B6=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=9F=B3=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/init.sh | 6 ++++++ configs/janus/janus.plugin.ustreamer.jcfg | 5 ++++- web/share/i18n/i18n_zh.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build/init.sh b/build/init.sh index a4a385bb..adafd733 100755 --- a/build/init.sh +++ b/build/init.sh @@ -111,9 +111,15 @@ EOF if [ ! -z "$VIDEONUM" ]; then sed -i "s/\/dev\/video0/\/dev\/video$VIDEONUM/g" /etc/kvmd/override.yaml \ + && sed -i "s/\/dev\/video0/\/dev\/video$VIDEONUM/g" /etc/kvmd/janus/janus.plugin.ustreamer.jcfg \ && echo -e "${GREEN}One-KVM video device is set to /dev/video$VIDEONUM.${NC}" fi + if [ ! -z "$AUDIONUM" ]; then + sed -i "s/hw:0/hw:$AUDIONUM/g" /etc/kvmd/janus/janus.plugin.ustreamer.jcfg \ + && echo -e "${GREEN}One-KVM audio device is set to hw:$VIDEONUM.${NC}" + fi + #set htpasswd if [ ! -z "$USERNAME" ] && [ ! -z "$PASSWORD" ]; then python -m kvmd.apps.htpasswd del admin \ diff --git a/configs/janus/janus.plugin.ustreamer.jcfg b/configs/janus/janus.plugin.ustreamer.jcfg index 0e4d89e5..e8b8b5e4 100644 --- a/configs/janus/janus.plugin.ustreamer.jcfg +++ b/configs/janus/janus.plugin.ustreamer.jcfg @@ -1,4 +1,7 @@ video: { sink = "kvmd::ustreamer::h264" } - +audio: { + device = "hw:0" + tc358743 = "/dev/video0" +} diff --git a/web/share/i18n/i18n_zh.json b/web/share/i18n/i18n_zh.json index 99c67421..28c477bf 100644 --- a/web/share/i18n/i18n_zh.json +++ b/web/share/i18n/i18n_zh.json @@ -110,7 +110,7 @@ "kvm_text77":"断开连接", "kvm_text78":"重置", "kvm_text79":"视频录制
", - "kvm_text80":"使用浏览器 API 录制视频(无音频),结束录制后视频文件会自动下载", + "kvm_text80":"使用浏览器 API 录制视频,结束录制后视频文件会自动下载", "kvm_text81":"开始录制", "kvm_text82":"结束录制",