diff options
| author | Maxim Devaev <[email protected]> | 2024-08-19 00:43:32 +0300 |
|---|---|---|
| committer | Maxim Devaev <[email protected]> | 2024-08-19 00:43:32 +0300 |
| commit | abedace4b3173fca98eee1ac0b778a45dc93c5b5 (patch) | |
| tree | ce23bafb2b48cb6e9f5f28bf04588b086a5b93f8 | |
| parent | d7675cdf231896851c492e1e0e719d2ccdc28082 (diff) | |
enable v4p by default
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | configs/kvmd/main/v4plus-hdmi-rpi4.yaml | 6 | ||||
| -rw-r--r-- | configs/os/services/kvmd-pass.service | 15 | ||||
| -rw-r--r-- | configs/os/services/kvmd-tc358743.service | 2 | ||||
| -rw-r--r-- | kvmd.install | 4 | ||||
| -rwxr-xr-x | scripts/kvmd-udev-restart-pass | 3 |
6 files changed, 10 insertions, 22 deletions
@@ -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 diff --git a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml b/configs/kvmd/main/v4plus-hdmi-rpi4.yaml index c1e6faff..c59be781 100644 --- a/configs/kvmd/main/v4plus-hdmi-rpi4.yaml +++ b/configs/kvmd/main/v4plus-hdmi-rpi4.yaml @@ -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: diff --git a/configs/os/services/kvmd-pass.service b/configs/os/services/kvmd-pass.service deleted file mode 100644 index 5d55b5fe..00000000 --- a/configs/os/services/kvmd-pass.service +++ /dev/null @@ -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 diff --git a/configs/os/services/kvmd-tc358743.service b/configs/os/services/kvmd-tc358743.service index c8b8bbf9..c4f13300 100644 --- a/configs/os/services/kvmd-tc358743.service +++ b/configs/os/services/kvmd-tc358743.service @@ -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 diff --git a/kvmd.install b/kvmd.install index 55bd999d..ca0593f7 100644 --- a/kvmd.install +++ b/kvmd.install @@ -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 diff --git a/scripts/kvmd-udev-restart-pass b/scripts/kvmd-udev-restart-pass index 760267eb..4b77897a 100755 --- a/scripts/kvmd-udev-restart-pass +++ b/scripts/kvmd-udev-restart-pass @@ -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 |