From e6d087d2da410cc0891ed396ceb2b3496e1b5e74 Mon Sep 17 00:00:00 2001
From: pedro <git2021@cas.cat>
Date: Mon, 9 May 2022 02:23:38 +0200
Subject: [PATCH] jibri looks like and with 720p

---
 type/__jitsi_jibri/files/jibri.conf.sh        |   1 +
 .../__jitsi_jibri/files/xorg-video-dummy.conf | 127 ++++++++++++++++++
 type/__jitsi_jibri/man.rst                    |   4 +
 type/__jitsi_jibri/manifest                   | 101 +++++++++-----
 4 files changed, 200 insertions(+), 33 deletions(-)
 create mode 100644 type/__jitsi_jibri/files/xorg-video-dummy.conf

diff --git a/type/__jitsi_jibri/files/jibri.conf.sh b/type/__jitsi_jibri/files/jibri.conf.sh
index 8d3b147..5fdc886 100755
--- a/type/__jitsi_jibri/files/jibri.conf.sh
+++ b/type/__jitsi_jibri/files/jibri.conf.sh
@@ -73,6 +73,7 @@ jibri {
   }
   ffmpeg {
     resolution = "1280x720"
+    // resolution = "1920x1080"
     // The audio source that will be used to capture audio on Linux
     audio-source = "alsa"
     // The audio device that will be used to capture audio on Linux
diff --git a/type/__jitsi_jibri/files/xorg-video-dummy.conf b/type/__jitsi_jibri/files/xorg-video-dummy.conf
new file mode 100644
index 0000000..d55372b
--- /dev/null
+++ b/type/__jitsi_jibri/files/xorg-video-dummy.conf
@@ -0,0 +1,127 @@
+#!/bin/sh -eu
+
+cat <<EOF
+# Managed remotely, changes will be lost
+
+# This xorg configuration file is meant to be used by xpra
+# to start a dummy X11 server.
+# For details, please see:
+# https://xpra.org/Xdummy.html
+
+Section "ServerFlags"
+  Option "DontVTSwitch" "true"
+  Option "AllowMouseOpenFail" "true"
+  Option "PciForceNone" "true"
+  Option "AutoEnableDevices" "false"
+  Option "AutoAddDevices" "false"
+EndSection
+
+Section "Device"
+  Identifier "dummy_videocard"
+  Driver "dummy"
+  Option "ConstantDPI" "true"
+  #VideoRam 4096000
+  #VideoRam 256000
+  VideoRam 192000
+EndSection
+
+Section "Monitor"
+  Identifier "dummy_monitor"
+  HorizSync   5.0 - 1000.0
+  VertRefresh 5.0 - 200.0
+  #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
+  # for the dummy video card.
+  Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
+  Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
+  Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
+  Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
+  Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
+  Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
+  Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
+  Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+  Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
+  Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+  Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+  Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+  Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
+  Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
+  Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
+  Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+  Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
+  Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+  Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
+  Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
+  Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+  Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+  Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+  Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
+  Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
+  Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
+  ModeLine "1366x768" 72.00 1366 1414 1446 1494  768 771 777 803
+  Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
+  Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+  Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
+  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
+
+
+  #common resolutions for android devices (both orientations):
+  Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345
+  Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+  Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345
+  Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
+  Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076
+  Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807
+  Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076
+  Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631
+  Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009
+  Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563
+  Modeline "600x800" 15.17 600 632 688 720 800 818 822 841
+  Modeline "800x600" 14.50 800 832 880 912 600 614 617 631
+  Modeline "480x854" 13.34 480 512 560 592 854 873 877 897
+  Modeline "848x480" 12.09 848 880 920 952 480 491 493 505
+  Modeline "480x800" 12.43 480 512 552 584 800 818 822 841
+  Modeline "800x480" 11.46 800 832 872 904 480 491 493 505
+  #resolutions for android devices (both orientations)
+  #minus the status bar
+  #38px status bar (and width rounded up)
+  Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305
+  Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801
+  Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305
+  Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717
+  Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036
+  Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767
+  Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036
+  Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591
+  Modeline "536x922" 16.01 536 568 624 656 922 943 947 969
+  Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523
+  Modeline "600x762" 14.39 600 632 680 712 762 779 783 801
+  Modeline "800x562" 13.52 800 832 880 912 562 575 578 591
+  Modeline "480x810" 12.59 480 512 552 584 810 828 832 851
+  Modeline "848x442" 11.09 848 880 920 952 442 452 454 465
+  Modeline "480x762" 11.79 480 512 552 584 762 779 783 801
+EndSection
+
+Section "Screen"
+  Identifier "dummy_screen"
+  Device "dummy_videocard"
+  Monitor "dummy_monitor"
+  DefaultDepth 24
+  SubSection "Display"
+    Viewport 0 0
+    Depth 24
+    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+    Virtual 1280 720
+    #Virtual 1920 1080
+  EndSubSection
+EndSection
+
+Section "ServerLayout"
+  Identifier   "dummy_layout"
+  Screen       "dummy_screen"
+EndSection
+EOF
diff --git a/type/__jitsi_jibri/man.rst b/type/__jitsi_jibri/man.rst
index 1333ed7..cec1f92 100644
--- a/type/__jitsi_jibri/man.rst
+++ b/type/__jitsi_jibri/man.rst
@@ -1 +1,5 @@
 TODO
+
+last java (from debian 11) mostly works, but cuts a little bit of the video (between 2 to 5 seconds). with java8 this works ok
+
+resolution is hardcoded to 720p (default resolution was 1080p), right now is not configurable
diff --git a/type/__jitsi_jibri/manifest b/type/__jitsi_jibri/manifest
index 4af22b3..72d3c55 100755
--- a/type/__jitsi_jibri/manifest
+++ b/type/__jitsi_jibri/manifest
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+JIBRI_HOST="${__target_host}"
+JIBRI_AUTH_PASS='jibriauthpass'
+JIBRI_RECORDER_PASS='jibrirecorderpass'
+export JIBRI_HOST
+export JIBRI_AUTH_PASS
+export JIBRI_RECORDER_PASS
+
 os="$(cat "${__global}/explorer/os")"
 kernel_release="$(cat "${__object}/explorer/kernel_release")"
 case "${os}" in
@@ -21,79 +28,107 @@ case "${os}" in
 	;;
 esac
 
-__line /etc/modules --line "snd_aloop"
+__line '/etc/modules' --line 'snd_aloop' --onchange 'modprobe snd_aloop'
 
 # thanks https://github.com/emrahcom/emrah-buster-templates/blob/master/machines/eb-jibri-template/usr/local/bin/finalize_recording.sh
-__file "/opt/finalize_recording.sh" \
-	--mode 644 \
-	--source - << EOF
+__file '/opt/finalize_recording.sh' \
+	--mode '755' \
+	--source '-' << EOF
+# Managed remotely, changes will be lost
 #!/bin/sh
 set -e
 
 exit 0
 EOF
 
-__apt_key 'jitsi_jibri' \
-	--source "${__type}/files/apt-jitsi-keyring.gpg" \
-	--state 'present'
+__apt_key 'jitsi_meet' \
+	--source "${__type}/files/apt-jitsi-keyring.gpg"
 
-require='__apt_key/jitsi_jibri' __apt_source jitsi_jibri \
+require='__apt_key/jitsi_meet' __apt_source 'jitsi_meet' \
 	--uri 'https://download.jitsi.org' \
-	--distribution 'stable/' \
-	--state present
+	--distribution 'stable/'
 
-__apt_key 'google_chrome' \
-	--source "${__type}/files/apt-google-chrome-keyring.gpg" \
-	--state 'present'
+__apt_key 'google-chrome' \
+	--source "${__type}/files/apt-google-chrome-keyring.gpg"
 
-require='__apt_key/google_chrome' __apt_source google_chrome \
+__apt_source 'debian9' \
+	--uri 'http://security.debian.org/debian-security' \
+	--distribution 'stretch/updates' \
+	--component 'main'
+
+# google-chrome object id is important because after google-chrome installation
+#   the apt file would be duplicated, making apt update process to fail
+require='__apt_key/google-chrome' __apt_source google-chrome \
 	--uri 'http://dl.google.com/linux/chrome/deb/' \
 	--distribution 'stable' \
-	--component 'main' \
-	--state 'present'
+	--component 'main'
 
 ## Ensure apt cache is up-to-date
-__apt_update_index
+require='__apt_source/jitsi_meet __apt_source/google-chrome __apt_source/debian9' __check_messages update_jibri \
+	--pattern '^__apt_source/(jitsi_meet|google-chrome)' \
+	--execute 'apt update'
 
 PKGS="$( grep -v '#' <<END
 jibri
-google-chrome-stable
 # extra deps
 default-jre-headless ffmpeg curl alsa-utils icewm xdotool xserver-xorg-video-dummy ruby-hocon
+google-chrome-stable
+# old java for jibri
+openjdk-8-jdk-headless
 END
 )"
 
 for pkg in ${PKGS}; do
-	require='__apt_update_index' __package "${pkg}"
+	require='__check_messages/update_jibri' __package "${pkg}"
 done
 
-
-# TODO CHROME_DRIVER explorer so this process is launched if needed
+# TODO CHROME_DRIVER explorer so this process is launched only if needed
+# src https://github.com/jitsi/jibri#google-chrome-stable--chromedriver
 CHROME_DRIVER_VERSION="$(cat "${__type}/files/chrome-driver-version")"
 CHROME_DRIVER_HASH="$(cat "${__type}/files/chrome-driver-hash")"
-#echo "${CHROME_DRIVER_HASH}" >&2
-#exit 1
 __download '/tmp/chromedriver.zip' \
 	--url "https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip" \
 	--sum "${CHROME_DRIVER_HASH}"
-CHROME_DRIVER_PATH='/usr/local/bin/chromedriver'
-require='__download/chromedriver' __unpack '/tmp/chromedriver.zip' \
+CHROME_DRIVER_PATH='/usr/local/bin'
+require='__download/tmp/chromedriver.zip' __unpack '/tmp/chromedriver.zip' \
 	--destination "${CHROME_DRIVER_PATH}" \
 	--onchange "chown root:root ${CHROME_DRIVER_PATH} && chmod 0755 ${CHROME_DRIVER_PATH}"
 
 CHROME_POLICIES='/etc/opt/chrome/policies/managed'
-require='__package/google-chrome' __directory "${CHROME_POLICIES}" --parents
+require='__package/google-chrome-stable' __directory "${CHROME_POLICIES}" --parents
 require="__directory/${CHROME_POLICIES}" __file "${CHROME_POLICIES}/managed_policies" \
-	--source  '{ "CommandLineFlagSecurityWarningsEnabled": false }' \
-	--mode 644
+	--mode '644' \
+	--source '-' <<EOF
+{ "CommandLineFlagSecurityWarningsEnabled": false }
+EOF
 
 # Proceed only after installation/upgrade has finished
 export require="__package/jibri"
-__user_groups jibri --group adm --group audio --group video --group plugdev
+__user_groups 'jibri' --group 'adm' --group 'audio' --group 'video' --group 'plugdev'
 
+# TODO tell to evilham that this way, missing a variable makes the whole file to be unprocessed, is it desirable?
+#   jicofo.conf.sh works the same way
 "${__type}/files/jibri.conf.sh" | \
-	__file /etc/jitsi/jibri/jibri.conf --mode 0444 --source '-'
+	__file '/etc/jitsi/jibri/jibri.conf' \
+		--mode '0444' --source '-' \
+		--onchange 'systemctl restart jibri.service'
 
-__systemd_unit jibri.service \
-    --enablement-state enabled \
-    --restart
+__systemd_unit 'jibri.service' \
+	--enablement-state 'enabled' \
+	--restart
+
+# thanks https://community.jitsi.org/t/jibri-recording-resolution-to-record-a-full-window-at-720p-without-cropping/104442
+"${__type}/files/xorg-video-dummy.conf" | \
+	__file '/etc/jitsi/jibri/xorg-video-dummy.conf' \
+		--mode '0444' --source '-' \
+		--onchange 'systemctl restart jibri-xorg.service'
+
+__file '/opt/jitsi/jibri/launch.sh' \
+	--onchange 'systemctl daemon-reload && systemctl restart jibri.service' \
+	--mode 755 \
+	--source '-' <<EOF
+# Managed remotely, changes will be lost
+#!/bin/bash
+
+exec /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -Djava.util.logging.config.file=/etc/jitsi/jibri/logging.properties -Dconfig.file="/etc/jitsi/jibri/jibri.conf" -jar /opt/jitsi/jibri/jibri.jar --config "/etc/jitsi/jibri/config.json"
+EOF