Merge remote-tracking branch 'github/master'

jugendhackt/config.ini

@@ -0,0 +1,35 @@
+[default]
+schedule = https://jh.franzi.business/schedule/jh23dd.xml
+# ffmpeg -loop 1 -i alpaka_orange.png -f lavfi -i anullsrc -c:v mpeg2video -t 10 -aspect 16:9 -c:a mp2 -b:v 2500k -map 0:v -map 1:a alpaka_orange.ts
+template = alpaka_orange.ts
+alpha = false
+prores = false
+
+[title]
+in = 1
+out = 9.5
+font = SourceSansPro-Semibold.ttf
+fontsize = 100
+fontcolor = #00a5dd
+x = 100
+y = 785
+
+[speaker]
+in = 2
+out = 9
+font = SourceSansPro-Semibold.ttf
+fontsize = 55
+fontcolor = #00a5dd
+x = 100
+y = 900
+
+[text]
+in = 3
+out = 8
+font = SourceSansPro-Semibold.ttf
+fontsize = 45
+fontcolor = #00a5dd
+x = 100
+y = 720
+text = 'Jugend hackt Dresden 2023'
+

make-ffmpeg-fade.py

@@ -282,7 +282,7 @@ def enqueue_job(event):
         else:
             cmd = 'ffmpeg -y -i "{0}" -vf "{1}" -map 0:0 -c:v mpeg2video -q:v 2 -aspect 16:9 -map 0:1 -c:a mp2 -b:a 384k -shortest -f mpegts "{2}"'.format(infile, videofilter, outfile)
     else:
-        cmd = 'ffmpeg -y -i "{0}" -vf "{1}" -map 0:0  -c:v mpeg2video -pix_fmt:v yuv420p -qscale:v 2 -qmin:v 2 -qmax:v 7 -keyint_min 0 -bf 0 -g 0 -intra:0 -maxrate:0 90M  -aspect 16:9 -map 0:1 -c:a mp2 -b:a 384k -shortest -f mpegts "{2}"'.format(infile, videofilter, outfile)
+        cmd = 'ffmpeg -y -i "{0}" -vf "{1}" -map 0:0  -c:v mpeg2video -pix_fmt:v yuv420p -qscale:v 2 -qmin:v 2 -qmax:v 7 -keyint_min 0 -bf 0 -g 0 -maxrate:0 90M  -aspect 16:9 -map 0:1 -c:a mp2 -b:a 384k -shortest -f mpegts "{2}"'.format(infile, videofilter, outfile)
 
     if args.debug:
         print(cmd)