diff --git a/fsck2025/LiberationSans-Regular.ttf b/fsck2025/LiberationSans-Regular.ttf deleted file mode 100644 index adb8947..0000000 Binary files a/fsck2025/LiberationSans-Regular.ttf and /dev/null differ diff --git a/fsck2025/artwork/fsck-intro-base.mp4 b/fsck2025/artwork/fsck-intro-base.mp4 deleted file mode 100644 index 7e45745..0000000 Binary files a/fsck2025/artwork/fsck-intro-base.mp4 and /dev/null differ diff --git a/fsck2025/config.ini b/fsck2025/config.ini deleted file mode 100644 index 3167b8c..0000000 --- a/fsck2025/config.ini +++ /dev/null @@ -1,52 +0,0 @@ -[meta] -schedule = https://cfp.ctbk.de/fsck-2024/schedule/export/schedule.xml -;; path to background video -template = artwork/fsck-intro-base.mp4 -;; whether background video uses transparency (needs to be .mov) -alpha = false -;; whether background video is prores 4444 -prores = false -;; in and out time format: t for seconds, n for frame number -inout_type = t -;; fade-in duration (seconds), leave out or set to zero to disable -fade_duration = 1 - -;; Some font settings can have defaults, which can be overridden in the -;; 'title', 'speaker' and 'text' sections below. -[default] -;; default font -fontfile = LiberationSans-Regular.ttf -;; default font color -fontcolor = #fae7e3 - -;; fields for title and speaker names are empty in the template.ts, so we'll render them in via ffmpeg -;; parameters are: -;; - in: start frame/ time -;; - out: end frame/ time -;; - fontfile: font file -;; - fontcolor: font color -;; - fontsize: font size (pixel) -;; - x: horizontal position (top left corner) -;; - y: vertical position (top left corner) -[title] -in = 11.5 -out = 15 -fontsize = 67 -x = 300 -y = 800 - -[speaker] -in = 12 -out = 15 -fontsize = 50 -x = 300 -y = 960 - -;; optional extra text, comment out "text" field to disable -[text] -in = 0 -out = 0 -fontsize = 0 -x = 0 -y = 0 -;text = some additional text diff --git a/make-ffmpeg.py b/make-ffmpeg.py index b15014e..94d1514 100755 --- a/make-ffmpeg.py +++ b/make-ffmpeg.py @@ -80,8 +80,8 @@ class TextConfig: filter_str += ":alpha='if(lt(t,{fade_in_start_time}),0,if(lt(t,{fade_in_end_time}),(t-{fade_in_start_time})/{fade_duration},if(lt(t,{fade_out_start_time}),1,if(lt(t,{fade_out_end_time}),({fade_duration}-(t-{fade_out_start_time}))/{fade_duration},0))))'".format( fade_in_start_time=self.inpoint, fade_in_end_time=self.inpoint + fade_time, - fade_out_start_time=self.outpoint - fade_time, - fade_out_end_time=self.outpoint, + fade_out_start_time=self.inpoint + fade_time + text_duration, + fade_out_end_time=self.inpoint + fade_time + text_duration + fade_time, fade_duration=fade_time) filter_str += ","