From 68d4b1af582336e0afcf8744d1675398fe0a3bd2 Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Wed, 3 Apr 2024 11:02:39 -0500 Subject: [PATCH] jibri: fix xorg modeline for 1280x720 (#1778) * jibri: fix xorg modeline for 1280x720 * whitespace --- jibri.yml | 2 ++ jibri/rootfs/defaults/xorg-video-dummy.conf | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jibri.yml b/jibri.yml index fc68a07..65c7d10 100644 --- a/jibri.yml +++ b/jibri.yml @@ -38,6 +38,8 @@ services: - JIBRI_USAGE_TIMEOUT - JIBRI_XMPP_USER - JIBRI_XMPP_PASSWORD + - JIBRI_XORG_HORIZ_SYNC + - JIBRI_XORG_VERT_REFRESH - JIBRI_BREWERY_MUC - JIBRI_RECORDER_USER - JIBRI_RECORDER_PASSWORD diff --git a/jibri/rootfs/defaults/xorg-video-dummy.conf b/jibri/rootfs/defaults/xorg-video-dummy.conf index 4fede78..7bb095d 100644 --- a/jibri/rootfs/defaults/xorg-video-dummy.conf +++ b/jibri/rootfs/defaults/xorg-video-dummy.conf @@ -1,4 +1,6 @@ {{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}} +{{ $JIBRI_HORIZ_SYNC := .Env.JIBRI_XORG_HORIZ_SYNC | default "43.0 - 47.0" -}} +{{ $JIBRI_VERT_REFRESH := .Env.JIBRI_XORG_VERT_REFRESH | default "58.0 - 62.0" -}} # This xorg configuration file is meant to be used by xpra # to start a dummy X11 server. @@ -24,8 +26,8 @@ EndSection Section "Monitor" Identifier "dummy_monitor" - HorizSync 5.0 - 1000.0 - VertRefresh 5.0 - 200.0 + HorizSync {{ $JIBRI_HORIZ_SYNC }} + VertRefresh {{ $JIBRI_VERT_REFRESH }} #This can be used to get a specific DPI, but only for the default resolution: #DisplaySize 508 317 #NOTE: the highest modes will not work without increasing the VideoRam @@ -63,6 +65,7 @@ Section "Monitor" Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807 Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807 Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076 + Modeline "1280x720@60" 73.78 1280 1312 1592 1624 720 735 742 757 #common resolutions for android devices (both orientations):