added poster for 6th Kyu

2022-02-21 09:52:21 +01:00
parent 9138ce6849
commit 6954adfb11
24 changed files with 280 additions and 118 deletions
--- a/DieJudoGürtelprüfung/Kyu6.json
+++ b/DieJudoGürtelprüfung/Kyu6.json
@@ -1,82 +1,142 @@
 [
    {
        "source": "http://mmurl.de/judo32",
-        "target": "videos/6terKyu/Ukemi/MaeMawariUkemi.webm"
+        "target": "videos/6terKyu/Ukemi/MaeMawariUkemi.webm",
+        "poster": {
+            "timeIndex": "10.760"
+        }
    },
    {
        "source": "http://mmurl.de/judo33",
-        "target": "videos/6terKyu/NageWaza/IpponSeoiNage.webm"
+        "target": "videos/6terKyu/NageWaza/IpponSeoiNage.webm",
+        "poster": {
+            "timeIndex": "19.360"
+        }
    },
    {
        "source": "http://mmurl.de/judo34",
-        "target": "videos/6terKyu/NageWaza/TaiOtoshi.webm"
+        "target": "videos/6terKyu/NageWaza/TaiOtoshi.webm",
+        "poster": {
+            "timeIndex": "30.040"
+        }
    },
    {
        "source": "http://mmurl.de/judo35",
-        "target": "videos/6terKyu/NageWaza/KoUchiGari.webm"
+        "target": "videos/6terKyu/NageWaza/KoUchiGari.webm",
+        "poster": {
+            "timeIndex": "20.240"
+        }
    },
    {
        "source": "http://mmurl.de/judo36",
-        "target": "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGake.webm"
+        "target": "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGari.webm",
+        "poster": {
+            "timeIndex": "22.040"
+        }
    },
    {
        "source": "http://mmurl.de/judo37",
-        "target": "videos/6terKyu/NageWaza/DeAshiBarei.webm"
+        "target": "videos/6terKyu/NageWaza/DeAshiBarei.webm",
+        "poster": {
+            "timeIndex": "24.760"
+        }
    },
    {
        "source": "http://mmurl.de/judo38",
-        "target": "videos/6terKyu/NeWaza/KesaGatame.webm"
+        "target": "videos/6terKyu/NeWaza/KesaGatame.webm",
+        "poster": {
+            "timeIndex": "40.920"
+        }
    },
    {
        "source": "http://mmurl.de/judo39",
-        "target": "videos/6terKyu/NeWaza/YokoShioGatame.webm"
+        "target": "videos/6terKyu/NeWaza/YokoShioGatame.webm",
+        "poster": {
+            "timeIndex": "37.040"
+        }
    },
    {
        "source": "http://mmurl.de/judo40",
-        "target": "videos/6terKyu/NeWaza/TateShioGatame.webm"
+        "target": "videos/6terKyu/NeWaza/TateShioGatame.webm",
+        "poster": {
+            "timeIndex": "32.000"
+        }
    },
    {
        "source": "http://mmurl.de/judo41",
-        "target": "videos/6terKyu/NeWaza/KamiShioGatame.webm"
+        "target": "videos/6terKyu/NeWaza/KamiShioGatame.webm",
+        "poster": {
+            "timeIndex": "26.960"
+        }
    },
    {
        "source": "http://mmurl.de/judo42",
-        "target": "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.webm"
+        "target": "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.webm",
+        "poster": {
+            "timeIndex": "22.480"
+        }
    },
    {
        "source": "http://mmurl.de/judo43",
-        "target": "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.webm"
+        "target": "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.webm",
+        "poster": {
+            "timeIndex": "21.240"
+        }
    },
    {
        "source": "http://mmurl.de/judo44",
-        "target": "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.webm"
+        "target": "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.webm",
+        "poster": {
+            "timeIndex": "18.440"
+        }
    },
    {
        "source": "http://mmurl.de/judo45",
-        "target": "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.webm"
+        "target": "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.webm",
+        "poster": {
+            "timeIndex": "22.200"
+        }
    },
    {
        "source": "http://mmurl.de/judo46",
-        "target": "videos/6terKyu/AnwendungTachiWaza/Ausweichen.webm"
+        "target": "videos/6terKyu/AnwendungTachiWaza/Ausweichen.webm",
+        "poster": {
+            "timeIndex": "21.120"
+        }
    },
    {
        "source": "http://mmurl.de/judo47",
-        "target": "videos/6terKyu/AnwendungNeWaza/OUchiGari.webm"
+        "target": "videos/6terKyu/AnwendungNeWaza/OUchiGari.webm",
+        "poster": {
+            "timeIndex": "21.160"
+        }
    },
    {
        "source": "http://mmurl.de/judo48",
-        "target": "videos/6terKyu/AnwendungNeWaza/KoUchiGari.webm"
+        "target": "videos/6terKyu/AnwendungNeWaza/KoUchiGari.webm",
+        "poster": {
+            "timeIndex": "19.400"
+        }
    },
    {
        "source": "http://mmurl.de/judo49",
-        "target": "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
-    },
-    {
-        "source": "http://mmurl.de/judo50",
-        "target": "videos/6terKyu/AnwendungNeWaza/AngriffOberlage.webm"
+        "target": "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm",
+        "poster": {
+            "timeIndex": "16.280"
+        }
    },
    {
        "source": "http://mmurl.de/judo51",
-        "target": "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
+        "target": "videos/6terKyu/AnwendungNeWaza/AngriffOberlage.webm",
+        "poster": {
+            "timeIndex": "25.960"
+        }
+    },
+    {
+        "source": "http://mmurl.de/judo50",
+        "target": "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm",
+        "poster": {
+            "timeIndex": "38.680"
+        }
    }
 ]
--- a/DieJudoGürtelprüfung/clipper
+++ b/DieJudoGürtelprüfung/clipper
@@ -9,6 +9,29 @@ import sys
 import argparse
 import os

+# bitrate recommendations as from https://developers.google.com/media/vp9/settings/vod
+bitrateProfiles = {
+	    "240": {"heigth":  240, "bitrate": "150k",   "minrate":   "75k", "maxrate":   "218k"},
+	    "360": {"heigth":  360, "bitrate": "276k",   "minrate":  "138k", "maxrate":   "400k"},
+	  "480LQ": {"heigth":  480, "bitrate": "512k",   "minrate":  "256k", "maxrate":   "742k"},
+	  "480MQ": {"heigth":  480, "bitrate": "750k",   "minrate":  "375k", "maxrate":  "1088k"},
+	 "720@30": {"heigth":  720, "bitrate": "1024k",  "minrate":  "512k", "maxrate":  "1485k"},
+	 "720@60": {"heigth":  720, "bitrate": "1800k",  "minrate":  "900k", "maxrate":  "2610k"},
+	"1080@30": {"heigth": 1080, "bitrate": "1800k",  "minrate":  "900k", "maxrate":  "2610k"},
+	"1080@60": {"heigth": 1080, "bitrate": "3000k",  "minrate": "1500k", "maxrate":  "4350k"},
+	"1440@30": {"heigth": 1440, "bitrate": "6000k",  "minrate": "3000k", "maxrate":  "8700k"},
+	"1440@60": {"heigth": 1440, "bitrate": "9000k",  "minrate": "4500k", "maxrate": "13050k"},
+	"2160@30": {"heigth": 2160, "bitrate": "12000k", "minrate": "6000k", "maxrate": "17400k"},
+	"2160@60": {"heigth": 2160, "bitrate": "18000k", "minrate": "9000k", "maxrate": "26100k"},
+}
+
+config = {
+	'vcodec': "vp9",
+	'acodec': "libopus",
+	'bitrateProfile': "480LQ",
+	'quality': "best",
+}
+
 def generate_thumbnail(in_filename, out_filename, time, height):
    try:
        (
@@ -24,22 +47,99 @@ def generate_thumbnail(in_filename, out_filename, time, height):
        sys.exit(1)

 # setting width and height from hardcoded defaults -> configured defaults -> clip
-def getDimensions(config, clip):
-	h = config['height'] if 'height' in config else 480 
-	w = config['width'] if 'width' in config else -2
+def getDimensions(config, clip, bitrateProfiles):
+	# set width and height to a default
+	w, h = -2, 480
+	# set the height by the bitrateProfile
+	try:
+		h = bitrateProfiles[config['bitrateProfile']]
+	except:
+		pass
+	# overwrite it with the scaling
 	if 'scale' in clip:
 		h = clip['scale']['h'] if 'h' in clip['scale'] else h
 		w = clip['scale']['w'] if 'w' in clip['scale'] else w

-	return h, w
+	return w, h
+
+def twoPassEncode(inputFilename, clip):
+	# cutting
+	kwArgs = {}
+	if 'from' in clip:
+		kwArgs['ss'] = clip['from']
+	if 'to' in clip:
+		kwArgs['to'] = clip['to']
+
+	stream = ffmpeg.input( inputFilename, **kwArgs)
+
+	video, audio = stream.video, stream.audio
+
+	if 'crop' in clip:
+		stream = ffmpeg.filter(stream, 
+			"crop",
+			x=clip['crop']['x'],
+			y=clip['crop']['y'],
+			w=clip['crop']['w'],
+			h=clip['crop']['h']
+		)
+
+	stream = ffmpeg.output(stream, 
+		clip['target'], 
+		vcodec=config['vcodec'], 
+		**{
+			# "an":None,
+			"y": None, 
+			"pass": "1", 
+			"b:v":     bitrateProfile[config['bitrateProfile']['bitrate']],
+			"minrate": bitrateProfile[config['bitrateProfile']['minrate']],
+			"maxrate": bitrateProfile[config['bitrateProfile']['maxrate']],
+			"quality": config['quality'] if 'quality' in config else "best", 
+		}
+	)
+	try:
+		ffmpeg.run(stream)
+	except:
+		print(infoDict)


-config = {
-	'vcodec': "vp9",
-	'acodec': "libopus",
-	'height': 480,
-	'quality': "best",
-}
+	if 'from' in clip and 'to' in clip:
+		stream = ffmpeg.input(
+			glob.glob(infoDict['id']+"*")[0], 
+			ss=clip['from'], 
+			to=clip['to'], 
+		)
+	else:
+		stream = ffmpeg.input(
+			glob.glob(infoDict['id']+"*")[0]
+		)
+	if 'crop' in clip:
+		stream = ffmpeg.filter(stream, 
+			"crop",
+			x=clip['crop']['x'],
+			y=clip['crop']['y'],
+			w=clip['crop']['w'],
+			h=clip['crop']['h']
+		)
+
+	h, w = getDimensions(config, clip)
+
+	stream = ffmpeg.output(stream, audio, 
+		clip['target'], 
+		vcodec=config['vcodec'], 
+		**{
+			"y": None, 
+			"pass": "2", 
+			"b:v":     bitrateProfile[config['bitrateProfile']['bitrate']],
+			"minrate": bitrateProfile[config['bitrateProfile']['minrate']],
+			"maxrate": bitrateProfile[config['bitrateProfile']['maxrate']],
+			"quality": config['quality'] if 'quality' in config else "best", 
+			"acodec": config['acodec'],
+		}
+	)
+	try:
+		ffmpeg.run(stream)
+	except:
+		print(infoDict)


 argParser = argparse.ArgumentParser()
@@ -69,88 +169,10 @@ for clip in clipDict:
 		# @todo This is a very bad hack because the outtmpl options doesn't seem to be working if the file gets reencoded
 		inputFilename = glob.glob(infoDict['id']+"*")[0]

-		h, w = getDimensions(config, clip)
+		w, h = getDimensions(config, clip)

 		# generate preview image for the video
 		if 'poster' in clip:
 			generate_thumbnail(inputFilename, os.path.splitext(clip['target'])[0]+".jpg", clip['poster']['timeIndex'], h )
-	
-		kwArgs = {}
-		if 'from' in clip:
-			kwArgs['ss'] = clip['from']
-		if 'to' in clip:
-			kwArgs['to'] = clip['to']

-		stream = ffmpeg.input( inputFilename, **kwArgs)
-
-		video, audio = stream.video, stream.audio
-
-		if 'crop' in clip:
-			stream = ffmpeg.filter(stream, 
-				"crop",
-				x=clip['crop']['x'],
-				y=clip['crop']['y'],
-				w=clip['crop']['w'],
-				h=clip['crop']['h']
-			)
-
-		stream = ffmpeg.output(stream, 
-			clip['target'], 
-			vcodec=config['vcodec'], 
-			**{
-				# "an":None,
-				"y":None, 
-				"pass":"1", 
-				# "b:v":"276k", "minrate":"138k", "maxrate":"400k", # x360
-				"b:v":"512k", "minrate":"256k", "maxrate":"742k", # x480 LQ
-				# "b:v":"750k", "minrate":"375k", "maxrate":"1088k", # x480 MQ
-				"quality": config['quality'] if 'quality' in config else "best", 
-			}
-		)
-		try:
-			ffmpeg.run(stream)
-		except:
-			print(infoDict)
-
-
-		if 'from' in clip and 'to' in clip:
-			stream = ffmpeg.input(
-				glob.glob(infoDict['id']+"*")[0], 
-				ss=clip['from'], 
-				to=clip['to'], 
-			)
-		else:
-			stream = ffmpeg.input(
-				glob.glob(infoDict['id']+"*")[0]
-			)
-		if 'crop' in clip:
-			stream = ffmpeg.filter(stream, 
-				"crop",
-				x=clip['crop']['x'],
-				y=clip['crop']['y'],
-				w=clip['crop']['w'],
-				h=clip['crop']['h']
-			)
-
-		h, w = getDimensions(config, clip)
-
-		stream = ffmpeg.output(stream, audio, 
-			clip['target'], 
-			vcodec=config['vcodec'], 
-			**{
-				# "an":None,
-				"y":None, 
-				"pass":"2", 
-				# "b:v":"276k", "minrate":"138k", "maxrate":"400k", # x360
-				"b:v":"512k", "minrate":"256k", "maxrate":"742k", # x480 LQ
-				# "b:v":"750k", "minrate":"375k", "maxrate":"1088k", # x480 MQ
-				"quality": config['quality'] if 'quality' in config else "best", 
-				"acodec": config['acodec'],
-			}
-		)
-		try:
-			ffmpeg.run(stream)
-		except:
-			print(infoDict)
-		
-		exit(-1)
+		twoPassEncode(inputFilename, clip)
--- a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/01-Ushiro.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/01-Ushiro.md
@@ -4,5 +4,9 @@ video:
    url: "videos/8terKyu/Ukemi/Ushiro.webm"
    width: 854
    height: 480 
+    poster:
+        url: "videos/8terKyu/Ukemi/Ushiro.jpg"
+        width: 854
+        height: 480 
 ---
 Fallen rückwärts wurde bereits in den vorigen Kyu-Stufen intensiv geübt und wird jetzt beherscht.
--- a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/02-Yoko.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/02-Yoko.md
@@ -4,5 +4,9 @@ video:
    url: "videos/8terKyu/Ukemi/Yoko.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/8terKyu/Ukemi/Yoko.jpg"
+        width: 854
+        height: 480
 ---
 Fallen seitwärts zu beiden Seiten wurde bereits in den vorigen Kyu-Stufen intensiv geübt und wird jetzt beherscht.
--- a/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/03-MaeMawari.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/01-Ukemi/03-MaeMawari.md
@@ -4,6 +4,10 @@ video:
    url: "videos/8terKyu/Ukemi/MaeMawari.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/8terKyu/Ukemi/MaeMawari.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/01-Ippon-Seoi-nage.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/01-Ippon-Seoi-nage.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NageWaza/IpponSeoiNage.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NageWaza/IpponSeoiNage.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/02-TaiOtoshi.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/02-TaiOtoshi.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NageWaza/TaiOtoshi.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NageWaza/TaiOtoshi.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/03-KoUchiGari.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/03-KoUchiGari.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGari.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NageWaza/KoSotoGakeKoSotoGari.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/04-DeAshiBarei.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/02-NageWaza-Grundform/04-DeAshiBarei.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NageWaza/DeAshiBarei.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NageWaza/DeAshiBarei.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/01-KesaGatame.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/01-KesaGatame.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NeWaza/KesaGatame.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NeWaza/KesaGatame.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/02-YokoShioGatame.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NeWaza/YokoShioGatame.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NeWaza/YokoShioGatame.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/03-TateShioGatame.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NeWaza/TateShioGatame.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NeWaza/TateShioGatame.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/03-NeWaza-Grundform/04-KamiShioGatame.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/NeWaza/TateShioGatame.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/NeWaza/TateShioGatame.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/01-IpponSeoiNage.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/01-IpponSeoiNage.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungTachiWaza/IpponSeoiNage.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/02-TaiOtoshi.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/02-TaiOtoshi.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungTachiWaza/TaiOtoshi.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/03-KoUchiGari.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/03-KoUchiGari.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungTachiWaza/KoUchiGari.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/04-DeAshiBarei.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/04-DeAshiBarei.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungTachiWaza/DeAshiBarei.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/05-Ausweichen.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/04-TachiWaza-Anwendung/05-Ausweichen.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungTachiWaza/Ausweichen.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungTachiWaza/Ausweichen.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/01-OUchiGari.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/01-OUchiGari.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungNeWaza/OUchiGari.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungNeWaza/OUchiGari.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/02-KoUchiGari.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/02-KoUchiGari.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungNeWaza/KoUchiGari.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungNeWaza/KoUchiGari.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/03-Befreiungsprinzipien.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/03-Befreiungsprinzipien.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/04-AngriffOberlage.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/04-AngriffOberlage.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungNeWaza/Befreiungsprinzipien.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/05-AngriffUnterlage.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/05-NeWaza-Anwendung/05-AngriffUnterlage.md
@@ -4,6 +4,10 @@ video:
    url: "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
    width: 854
    height: 480
+    poster:
+        url: "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.jpg"
+        width: 854
+        height: 480
 ---
 ## Stichpunkte

--- a/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/01-Randori.md
+++ b/DieJudoGürtelprüfung/markdown/6terKyu/06-Randori/01-Randori.md
@@ -1,13 +1,9 @@
 ---
 title: "Im Stand-Randori die erlernten Würfe kontrolliert werfen und bei Wurfversuchen sich durch Ausweichen verteidigen. Im Boden-Randori nachweisen, dass man einen sich ernsthaft verteidigenden Partner mit Haltegriff kontrollieren kann."
-video:
-    url: "videos/6terKyu/AnwendungNeWaza/AngriffUnterlage.webm"
-    width: 854
-    height: 480
 ---
 Die Gesamtzeit für das Prüfungsfach Randori sollte mit mehrfachem Partnerwechsel 10 Minuten nicht überschreiten. Die beim Randori übenden Judoka sollen:

- *nicht* mit den Armen sperren, *sondern* lockere, gebeugte Arme und einen aufrechten Kampfstiel zeigen ("schönes Judo")
+- *nicht* mit den Armen sperren, *sondern* lockere, gebeugte Arme und einen aufrechten Kampfstil zeigen ("schönes Judo")
 - *nicht* ausschließlich verteidigen, *sondern* auch entschlossen angreifen und zu werfen versuchen
 - *nicht* nur die Rolle von Tori demonstrieren, *sondern* auch entschlossen angreifen und zu werfen versuchen
 - am Boden *nicht* nur spielerisch miteinander raufen, *sondern* mit größeren Widerständen als im Stand auch das Kämpfen gegeneinander erproben.