diff --git a/fsck2025/artwork/fsck-outro-base.mov b/fsck2025/artwork/fsck-outro-base.mov deleted file mode 100644 index a92d4bc..0000000 Binary files a/fsck2025/artwork/fsck-outro-base.mov and /dev/null differ diff --git a/fsck2025/config.ini b/fsck2025/config.ini index 1bd8aec..fcc53fc 100644 --- a/fsck2025/config.ini +++ b/fsck2025/config.ini @@ -1,7 +1,7 @@ [meta] schedule = https://cfp.ctbk.de/fsck-2025/schedule/export/schedule.xml ;; path to background video -template = artwork/fsck-intro-base.mov +template = artwork/fsck-intro-base.mkv ;; whether background video uses transparency (needs to be .mov) alpha = false ;; whether background video is prores 4444 diff --git a/make-ffmpeg.py b/make-ffmpeg.py index c708142..2bdf880 100755 --- a/make-ffmpeg.py +++ b/make-ffmpeg.py @@ -220,11 +220,12 @@ def enqueue_job(conf: Config, event): outfile = str(PurePath(args.project, event_id + ".ts")) outfile_mov = str(PurePath(args.project, event_id + ".mov")) + outfile_mkv = str(PurePath(args.project, event_id + ".mkv")) if event_id in args.skip: event_print(event, "skipping " + str(event["id"])) return - if (os.path.exists(outfile) or os.path.exists(outfile_mov)) and not args.force: + if (os.path.exists(outfile) or os.path.exists(outfile_mov) or os.path.exists(outfile_mkv)) and not args.force: event_print(event, "file exist, skipping " + str(event["id"])) return @@ -280,6 +281,29 @@ def enqueue_job(conf: Config, event): "mov", outfile_mov, ] + elif conf.fileext == ".mkv": + cmd += [ + "-map", + "0:0", + "-c:v", + "libsvtav1", + "-preset", + "8", + "-b:v", + "10M", + "-aspect", + "16:9", + "-map", + "0:1", + "-c:a", + "libopus", + "-b:a", + "196k", + "-shortest", + "-f", + "matroska", + outfile_mkv, + ] else: cmd += [ "-map", @@ -308,6 +332,7 @@ def enqueue_job(conf: Config, event): subprocess.check_call( cmd, stderr=subprocess.STDOUT, + stdout=subprocess.DEVNULL, ) return event_id