diff --git a/gpn21/Roboto-Regular-enriched.ttf b/gpn21/Roboto-Regular-enriched.ttf index 92c90ba..02d8309 100644 Binary files a/gpn21/Roboto-Regular-enriched.ttf and b/gpn21/Roboto-Regular-enriched.ttf differ diff --git a/gpn21/config.toml b/gpn21/config.toml index 9417ed0..520f638 100644 --- a/gpn21/config.toml +++ b/gpn21/config.toml @@ -1,12 +1,12 @@ [default] schedule = "https://cfp.gulas.ch/gpn21/schedule/export/schedule.xml" -template = "gpn21_intro_template.ts" +template = "gpn21_intro_template_audio.mp4" alpha = false prores = false [title] in = 1.5 -out = 7.5 +out = 7 font = "Roboto-Regular-enriched.ttf" fontsize = 100 fontcolor = "#000000" @@ -15,7 +15,7 @@ y = 200 [speaker] in = 2.5 -out = 7.5 +out = 7 font = "Roboto-Regular-enriched.ttf" fontsize = 60 fontcolor = "#000000" @@ -24,7 +24,7 @@ y = 900 [text] in = 3 -out = 7.5 +out = 7 font = "Roboto-Regular-enriched.ttf" fontsize = 45 fontcolor = "#000000" diff --git a/make-ffmpeg-fade.py b/make-ffmpeg-fade.py index a79f91a..d9be29b 100755 --- a/make-ffmpeg-fade.py +++ b/make-ffmpeg-fade.py @@ -233,9 +233,10 @@ def enqueue_job(event): outfile = os.path.join(args.project, event_id + '.ts') - videofilter = "drawtext=fontfile={fontfile}:fontsize={fontsize}:fontcolor={fontcolor}:x={x}:y={y}:text='{text}':".format( + videofilter = "drawtext=fontfile={fontfile}:fontsize={fontsize}:line_spacing={linespacing}:fontcolor={fontcolor}:x={x}:y={y}:text='{text}':".format( fontfile = font_t, fontsize = title_fontsize, + linespacing = int(0.05*title_fontsize), fontcolor = title_fontcolor, x = title_x, y = title_y, @@ -247,9 +248,10 @@ def enqueue_job(event): fade_out_end_time = title_in + fade_duration + title_duration + fade_duration, fade_duration = fade_duration ) - videofilter += "drawtext=fontfile={fontfile}:fontsize={fontsize}:fontcolor={fontcolor}:x={x}:y={y}:text='{text}':".format( + videofilter += "drawtext=fontfile={fontfile}:fontsize={fontsize}:line_spacing={linespacing}:fontcolor={fontcolor}:x={x}:y={y}:text='{text}':".format( fontfile = font_s, fontsize = speaker_fontsize, + linespacing = int(0.05*speaker_fontsize), fontcolor = speaker_fontcolor, x = speaker_x, y = speaker_y, @@ -261,9 +263,10 @@ def enqueue_job(event): fade_out_end_time = speaker_in + fade_duration + speaker_duration + fade_duration, fade_duration = fade_duration ) - videofilter += "drawtext=fontfile={fontfile}:fontsize={fontsize}:fontcolor={fontcolor}:x={x}:y={y}:text={text}:".format( + videofilter += "drawtext=fontfile={fontfile}:fontsize={fontsize}:line_spacing={linespacing}:fontcolor={fontcolor}:x={x}:y={y}:text={text}:".format( fontfile = font_tt, fontsize = text_fontsize, + linespacing = int(0.05*text_fontsize), fontcolor = text_fontcolor, x = text_x, y = text_y,