enable v4p by default

This commit is contained in:
Maxim Devaev 2024-08-19 00:43:32 +03:00
parent d7675cdf23
commit abedace4b3
6 changed files with 10 additions and 22 deletions

View File

@ -206,7 +206,7 @@ for _variant in "${_variants[@]}"; do
cd \"kvmd-\$pkgver\"
pkgdesc=\"PiKVM platform configs - $_platform for $_board\"
depends=(kvmd=$pkgver-$pkgrel \"linux-rpi-pikvm>=6.6.21-3\")
depends=(kvmd=$pkgver-$pkgrel \"linux-rpi-pikvm>=6.6.45-1\" \"raspberrypi-bootloader-pikvm>=20240818-1\")
backup=(
etc/sysctl.d/99-kvmd.conf

View File

@ -31,6 +31,7 @@ kvmd:
type: otg
streamer:
forever: true
h264_bitrate:
default: 5000
cmd:
@ -38,10 +39,10 @@ kvmd:
- "--device=/dev/kvmd-video"
- "--persistent"
- "--dv-timings"
- "--format=uyvy"
- "--format=rgb24"
- "--format-swap-rgb"
- "--buffers=8"
- "--encoder=m2m-image"
- "--encoder=cpu"
- "--workers=3"
- "--quality={quality}"
- "--desired-fps={desired_fps}"
@ -59,6 +60,7 @@ kvmd:
- "--h264-sink-mode=0660"
- "--h264-bitrate={h264_bitrate}"
- "--h264-gop={h264_gop}"
- "--v4p"
gpio:
drivers:

View File

@ -1,15 +0,0 @@
[Unit]
Description=PiKVM - Video Passthrough on V4 Plus
Wants=dev-kvmd\x2dvideo.device
After=dev-kvmd\x2dvideo.device systemd-modules-load.service
[Service]
Type=simple
Restart=always
RestartSec=3
ExecStart=/usr/bin/ustreamer-v4p --unix-follow /run/kvmd/ustreamer.sock
TimeoutStopSec=10
[Install]
WantedBy=multi-user.target

View File

@ -2,7 +2,7 @@
Description=PiKVM - EDID loader for TC358743
Wants=dev-kvmd\x2dvideo.device
After=dev-kvmd\x2dvideo.device systemd-modules-load.service
Before=kvmd.service kvmd-pass.service
Before=kvmd.service
[Service]
Type=oneshot

View File

@ -92,6 +92,10 @@ disable_overscan=1
EOF
fi
if [[ "$(vercmp "$2" 4.4)" -lt 0 ]]; then
systemctl disable kvmd-pass || true
fi
# Some update deletes /etc/motd, WTF
# shellcheck disable=SC2015,SC2166
[ ! -f /etc/motd -a -f /etc/motd.pacsave ] && mv /etc/motd.pacsave /etc/motd || true

View File

@ -42,9 +42,6 @@ test -n "$port"
if [ "$port" = "HDMI-A-1" ]; then
status=$(head -n 1 "/sys/class/drm/$card-$port/status")
if [ "$status" = "connected" ]; then
if systemctl is-enabled -q kvmd-pass; then
systemctl restart kvmd-pass || true
fi
for pid in $(pgrep -f '^kvmd/streamer: ' || true); do
kill "$pid" || true
done