jibri: default to recording in 720p

pull/1150/head
Saúl Ibarra Corretgé 3 years ago
parent bee4b6a124
commit 7cd71a263c
  1. 5
      jibri/rootfs/defaults/jibri.conf
  2. 10
      jibri/rootfs/defaults/xorg-video-dummy.conf

@ -1,4 +1,5 @@
{{ $JIBRI_USAGE_TIMEOUT := .Env.JIBRI_USAGE_TIMEOUT | default "0" -}}
{{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}}
{{ $XMPP_TRUST_ALL_CERTS := .Env.XMPP_TRUST_ALL_CERTS | default "true" | toBool -}}
jibri {
@ -82,9 +83,7 @@ jibri {
}
ffmpeg {
{{ if .Env.JIBRI_RECORDING_RESOLUTION -}}
resolution = "{{ .Env.JIBRI_RECORDING_RESOLUTION }}"
{{ end -}}
resolution = "{{ $JIBRI_RECORDING_RESOLUTION }}"
{{ if .Env.JIBRI_FFMPEG_AUDIO_SOURCE -}}
// The audio source that will be used to capture audio on Linux
audio-source = "{{ .Env.JIBRI_FFMPEG_AUDIO_SOURCE }}"

@ -1,3 +1,5 @@
{{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}}
# This xorg configuration file is meant to be used by xpra
# to start a dummy X11 server.
# For details, please see:
@ -109,15 +111,11 @@ Section "Screen"
Viewport 0 0
Depth 24
Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
{{ if .Env.JIBRI_RECORDING_RESOLUTION -}}
Virtual {{ join " " (splitList "x" .Env.JIBRI_RECORDING_RESOLUTION) }}
{{ else -}}
Virtual 1920 1080
{{ end -}}
Virtual {{ join " " (splitList "x" $JIBRI_RECORDING_RESOLUTION) }}
EndSubSection
EndSection
Section "ServerLayout"
Identifier "dummy_layout"
Screen "dummy_screen"
EndSection
EndSection

Loading…
Cancel
Save