Full sponsor and title cards, better yt endboard

rrah · rrah · commit 079ae082a7e0 · 2024-05-26T11:34:18.000+01:00
diff --git a/formvideo.py b/formvideo.py
@@ -7,7 +7,7 @@
 import os.path
 import shutil
 
-logger = logging.getLogger("__name__")
+logger = logging.getLogger(__name__)
 
 logger.setLevel(logging.DEBUG)
 
@@ -48,19 +48,49 @@ def timecode_to_timestamp(timecode, framerate = FRAMERATE):
 
 def form_video(video, talk, start_tc, end_tc, framerate = FRAMERATE, out_dir = OUT_DIR, temp_dir = TEMP_DIR):
 
-    end_dur = 10
-    end_fade = 2
-
+    # Timing information
+    end_dur = 10 # How long to hold the endslate for
+    end_fade_in = 2
+    end_fade = 2 # Fade out time on endslate
+    afade_in = 3 # Talk audio fade in duration
+    afade_out = 3 # Talk audio fade out duration
+    spn_dur = 5 # Sponsor slide hold duration
+    spn_fade_in = 0.4 # Sponsor slide fade-in duration
+    spn_fade_out = 0.4 # Sponsor slide cross-fade out duration
+    title_dur = 5 # How long to hold the title card
+    title_fade_out = 0.4 # Title card into program duration
+    main_fade_out = 0.4 # Main program into endboard duration
+
+    # Colour and design information
+    col_talk = "#f9e200"
+    col_pres = "#2eadd9"
+    col_bkg = "#00000000" #"#21301850"
+
+    # Resource files
+    bkgd_file = "resources/BG_V3.mp4"
+    transp_file = "resources/transparent.png"
+    logo_file = "resources/logo.svg"
+    spons_file = "resources/sponsor_slide_rounded.png"
+
+    # Generated files paths
+    copr_file = "temp/copyright.png"
+    spres_file = "temp/start_pres.png"
+    stalk_file = "temp/start_title.png"
+
+    # Convert start and end to some other forms
     start_s = timecode_to_seconds(start_tc)
     end_s = timecode_to_seconds(end_tc)
-
     start_ts = timecode_to_timestamp(start_tc)
     end_ts = timecode_to_timestamp(end_tc)
 
-    fade_offset = end_s - start_s - 1
+    # Calculate some other reused variables
+    fade_offset = end_s - start_s - (end_fade_in/2.)
+    afade_offset = fade_offset - (afade_out/2.) # When to fade out the main talk audio
+    eb_end = fade_offset + end_dur # 
+    end_tdur = end_dur + end_fade # Total duration of the endslate, including fade time
+    title_end = spn_dur + title_dur
 
-    start_png = Path.joinpath(Path(temp_dir), Path("start.png"))
-    end_png = Path.joinpath(Path(temp_dir), Path("end.png"))
+    lic_text = "This work is licensed under CC BY-SA 4.0. To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/4.0/"
 
     start_timestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
 
@@ -74,72 +104,47 @@ def form_video(video, talk, start_tc, end_tc, framerate = FRAMERATE, out_dir = O
     output_path = Path.joinpath(Path(out_dir), output_file)
     log_path = Path.joinpath(Path(LOG_DIR), log_file)
 
-    start_lt_args = [
-        IMAGEMAGICK_BIN, 
-        "-size", "1920x1080", "xc:none", 
-        "-fill", "blue", "-pointsize", "72", "-annotate", "+70+70", talk["title"], 
-        "-fill", "green", "-pointsize", "60", "-annotate", "+70+200", talk["presenter"],
-        start_png
-    ]
-
-    start_lt_title_args = [
+    start_title_args = [
         IMAGEMAGICK_BIN, 
-        "-size", "1860x160", "-background", "#00000000", 
-        "-fill", "#f9e200", "-gravity", "southwest", "caption:{}".format(talk["title"]),
-        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", "#21301850", "-layers", "merge", "+repage",
-        "temp/start_title.png"
+        "-size", "1800x300", "-background", "#00000000", 
+        "-fill", col_talk, "-gravity", "center", "caption:{}".format(talk["title"]),
+        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", col_bkg, "-layers", "merge", "+repage",
+        stalk_file
     ]
 
-    start_lt_pres_arg = [
+    start_pres_arg = [
         IMAGEMAGICK_BIN,
-        "-size", "1860x80", "-background", "#00000000",
-        "-fill", "#2eadd9", "-gravity", "southwest", "caption:{}".format(talk["presenter"]),
-        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", "#21301850", "-layers", "merge", "+repage",
-        "temp/start_pres.png"
-    ]
-
-    end_slide_args = [
-        IMAGEMAGICK_BIN, 
-        "-size", "1920x1080", "xc:orange",
-        "-fill", "blue", "-gravity", "center", "-pointsize", "72", "-annotate", "+0-70", talk["title"], 
-        "-fill", "green", "-gravity", "center", "-pointsize", "60", "-annotate", "+0+70", talk["presenter"],
-        end_png
-    ]
-
-    end_slide_title_args = [
-        IMAGEMAGICK_BIN, 
-        "-size", "1320x350", "-background", "#00000000", 
-        "-fill", "#f9e200", "-gravity", "Center", "caption:{}".format(talk["title"]),
-        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", "#21301850", "-layers", "merge", "+repage",
-        "temp/end_title.png"
+        "-size", "1800x256", "-background", "#00000000",
+        "-fill", col_pres, "-gravity", "center", "caption:{}".format(talk["presenter"]),
+        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", col_bkg, "-layers", "merge", "+repage",
+        spres_file
     ]
 
-    end_slide_pres_arg = [
+    copyright_args = [
         IMAGEMAGICK_BIN,
-        "-size", "700x200", "-background", "#00000000",
-        "-fill", "#2eadd9", "-gravity", "Center", "caption:{}".format(talk["presenter"]),
-        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", "#21301850", "-layers", "merge", "+repage",
-        "temp/end_pres.png"
+        "-size", "1000x256", "-background", "#00000000",
+        "-fill", "#2eadd9", "-gravity", "east", "caption:{}".format(lic_text),
+        "(", "+clone", "-shadow", "500x2+0+0", ")", "+swap", "-background", col_bkg, "-layers", "merge", "+repage",
+        copr_file
     ]
 
     ffmpeg_loudness_args = [
         FFMPEG_BIN,
         "-ss", start_ts, "-to", end_ts, "-i", video,
-        "-filter_complex", "[0:a]afade=in:d=5,afade=out:st={fade_offset3:.2f}:d=5,adelay=8000:all=1,loudnorm=print_format=json".format(fade_offset3 = fade_offset - 3),
+        "-filter_complex", "[0:a]afade=in:d={in_:.2f},afade=out:st={out_st:.2f}:d={out:.2f},loudnorm=print_format=json".format(in_ = afade_in, out = afade_out, out_st = afade_offset),
         "-f", "null", "-"
     ]
 
     with open(log_path, "a") as error_log:
 
         # Build all the text assets
-        subprocess.run(start_lt_args, stderr=error_log)
-        subprocess.run(start_lt_title_args, stderr=error_log)
-        subprocess.run(start_lt_pres_arg, stderr=error_log)
-        subprocess.run(end_slide_args, stderr=error_log)
-        subprocess.run(end_slide_title_args, stderr=error_log)
-        subprocess.run(end_slide_pres_arg, stderr=error_log)
+        logger.info("Building text assets")
+        subprocess.run(start_title_args)
+        subprocess.run(start_pres_arg)
+        subprocess.run(copyright_args)
 
         # First FFmpeg pass for getting loudness stats
+        logger.info("Detecting loudness information")
         logger.debug(ffmpeg_loudness_args)
         analysis = subprocess.check_output(ffmpeg_loudness_args, stderr=subprocess.STDOUT).decode("utf-8").split("\n")
 
@@ -156,42 +161,43 @@ def form_video(video, talk, start_tc, end_tc, framerate = FRAMERATE, out_dir = O
         # Run the final build FFmpeg
         ffmpeg_args = [
             FFMPEG_BIN,
-            "-ss", start_ts, "-to", end_ts, "-i", video,
-            "-loop", "1", "-framerate", str(framerate), "-i", start_png,
-            "-stream_loop", "-1", "-r", str(framerate), "-i", "temp/BG_V3.mp4",
-            "-loop", "1", "-framerate", str(framerate), "-i", "temp/end_pres.png",
-            "-loop", "1", "-framerate", str(framerate), "-i", "temp/end_title.png",
-            "-loop", "1", "-framerate", str(framerate), "-i", "temp/sponsor_slide.png",
-            "-loop", "1", "-framerate", str(framerate), "-i", "temp/start_pres.png",
-            "-loop", "1", "-framerate", str(framerate), "-i", "temp/start_title.png",
-            "-filter_complex", ("[0:a]afade=in:d=5,afade=out:st={fade_offset3:.2f}:d=5,adelay=8000:all=1,".format(fade_offset3 = fade_offset - 3) +
-                                "loudnorm=I={target:.2f}:TP=-1.5:measured_I={mI}:measured_tp={mTP}:measured_LRA={mLRA}:measured_thresh={mTH}:offset={off}:linear=true:print_format=json[a0];".format(
+            "-ss", start_ts, "-to", end_ts, "-i", video, #0
+            "-stream_loop", "-1", "-r", str(framerate), "-i", bkgd_file, #1
+            "-loop", "1", "-framerate", str(framerate), "-i", transp_file, #2
+            "-loop", "1", "-framerate", str(framerate), "-i", spres_file, #3
+            "-loop", "1", "-framerate", str(framerate), "-i", stalk_file, #4
+            "-loop", "1", "-framerate", str(framerate), "-i", logo_file, #5
+            "-loop", "1", "-framerate", str(framerate), "-i", spons_file, #6
+            "-loop", "1", "-framerate", str(framerate), "-i", copr_file, #7
+            "-filter_complex", ("[0:a]afade=in:d={in_:.2f},afade=out:st={out_st:.2f}:d={out:.2f},adelay={title_end:.2f}:all=1,".format(in_ = afade_in, out = afade_out, out_st = afade_offset, spn_dur = spn_dur, title_end = title_end * 1000) +
+                                "loudnorm=I={target:.2f}:TP=-1.5:measured_I={mI}:measured_tp={mTP}:measured_LRA={mLRA}:measured_thresh={mTH}:offset={off}:linear=true:print_format=json[a1];".format(
                                     target = LOUD_LEVEL, 
                                     mI = loud_vals["input_i"],
                                     mTP = loud_vals["input_tp"],
                                     mLRA =  loud_vals["input_lra"],
                                     mTH = loud_vals["input_thresh"],
                                     off = loud_vals["target_offset"]) +
-                                "[a0]asplit[a1][a2];" +
-                                "[a2]ebur128=peak=true;" +
-                                "[2:v]crop=w=1920:h=290,fade=in:st=3:d=0.4:alpha=1,fade=out:st=13:d=0.4:alpha=1[ltb];" +
-                                "[0:v]fade=in:st=0:d=1[v1];" +
-                                "[6:v]fade=in:st=3:d=0.4:alpha=1,fade=out:st=13:d=0.4:alpha=1[s2];" +
-                                "[7:v]fade=in:st=3:d=0.4:alpha=1,fade=out:st=13:d=0.4:alpha=1[s3];" +
-                                "[v1][ltb]overlay=y=790:x=0:shortest=1[lt1];" +
-                                "[lt1][s2]overlay=y=970:x=30:shortest=1,settb=1/{framerate:.2f}[v3];".format(framerate = framerate) +
-                                "[v3][s3]overlay=y=800:x=30:shortest=1,settb=1/{framerate:.2f}[v4];".format(framerate = framerate) +
-                                "[2:v]trim=start=0:end={main_end:.2f},settb=1/{framerate:.2f}[e1];".format(framerate = framerate, main_end = end_dur + end_fade) +
-                                "[e1][3:v]overlay=shortest=1:x=610:y=560[e2];" +
-                                "[e2][4:v]overlay=shortest=1:x=300:y=150[e3];" +
-                                "[v4][e3]xfade=offset={eb_start:.2f}:duration=1,fade=out:st={eb_end:.2f}:d={end_fade:.2f}[m1];".format(eb_start = fade_offset, eb_end = fade_offset + end_dur, end_fade = end_fade) +
-                                "[5:v][m1]xfade=offset=8:duration=1,fade=in:d=3[p1]"
+                                "[5:v]split[l1][l2];" +
+                                "[1:v]settb=1/{framerate:.2f},split[bg1][bg2];".format(framerate = framerate) +
+                                "[0:v]settb=1/{framerate:.2f}[m1];".format(framerate = framerate) +
+                                "[2:v][3:v]overlay=x=60:y=640:shortest=1[s2];" +
+                                "[s2][4:v]overlay=x=60:y=320:shortest=1[s3];" +
+                                "[s3][l1]overlay=shortest=1[s4];" +
+                                "[6:v][s4]xfade=offset={spn_dur:.2f}:duration={spn_fade_out:.2f}[s5];".format(spn_dur = spn_dur, spn_fade_out = spn_fade_out) +
+                                "[bg1]trim=start=0:end={title_end:.2f}[bg3];".format(title_end = title_end) +
+                                "[bg3][s5]overlay[s6];" +       
+                                "[bg2][l2]overlay[e1];" +
+                                "[e1][7:v]overlay=x=870:y=70:shortest=1,trim=start=0:end={end_tdur:.2f}[e2];".format(end_tdur = end_tdur) +
+                                "[m1][e2]xfade=offset={eb_start:.2f}:duration=1,fade=out:st={eb_end:.2f}:d={end_fade:.2f}[m2];".format(eb_start = fade_offset, eb_end = eb_end, end_fade = end_fade) +
+                                "[s6][m2]xfade=offset={title_end:.2f}:duration={title_fade_out:.2f},fade=in:d={spn_fade_in:.2f}[p1]".format(title_fade_out = title_fade_out, title_end = title_end, spn_fade_in = spn_fade_in)
+                                
             ),
             "-map", "[p1]", "-map", "[a1]", "-map_metadata", "-1",
             "-c:v", "h264", "-crf", "16", "-g", str(math.floor(framerate/2)), "-flags", "+cgop",
             "-c:a", "aac", "-ar", "48000", "-b:a", "128k",
             "-r", str(framerate), "-pix_fmt", "yuv420p", "-movflags", "+faststart", output_path, "-y"
         ]
+        logger.info("Running main build")
         logger.debug(ffmpeg_args)
         subprocess.run(ffmpeg_args, stderr=error_log)
 
@@ -206,7 +212,7 @@ def ingest_video(input_path, output_dir, framerate = FRAMERATE):
     ffmpeg_args = [
         FFMPEG_BIN,
         "-i", input_path,
-        "-c:v", "h264", "-crf", "12", "-g", str(math.floor(framerate/2)), "-flags", "+cgop",
+        "-c:v", "h264", "-crf", "12", "-g", str(math.floor(framerate/2)), "-flags", "+cgop", "-s", "1920x1080",
         #"-c:v", "h264_nvenc", "-b:v", "12M",
         "-c:a", "aac", "-ar", "48000", "-b:a", "128k",
         "-r", str(framerate), "-pix_fmt", "yuv420p", "-movflags", "+faststart", output_path, "-y"
@@ -240,4 +246,4 @@ def ingest_video(input_path, output_dir, framerate = FRAMERATE):
         "presenter": "Kim M"
     }
 
-    form_video("static/video/stage_a/bbb_50.mp4", talk_data, "00:05:00:00", "00:06:00:00")
+    form_video("static/video/stage_a/bbb_50.mp4", talk_data, "00:05:05:00", "00:05:20:00")
diff --git a/static/js/videolog.js b/static/js/videolog.js
@@ -118,7 +118,8 @@ function checkKey(e) {
     const nopropElements = [
         document.getElementById("presenter"),
         document.getElementById("title"),
-        document.getElementById("video1")
+        document.getElementById("video1"),
+        document.getElementById("talkid")
     ]
     if (nopropElements.indexOf(document.activeElement) != -1){
         return
