diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..db81731 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "submodules/parsedown"] + path = submodules/parsedown + url = https://github.com/erusev/parsedown +[submodule "submodules/spyc"] + path = submodules/spyc + url = https://github.com/mustangostang/spyc.git diff --git a/DieJudoGürtelprüfung/Kyu7.json b/DieJudoGürtelprüfung/Kyu7.json new file mode 100644 index 0000000..8a76aca --- /dev/null +++ b/DieJudoGürtelprüfung/Kyu7.json @@ -0,0 +1,6 @@ +[ + { + "source": "http://mmurl.de/judo03", + "target": "videos/7terKyu/Ukemi/MaeMawari.webm" + } +] diff --git a/DieJudoGürtelprüfung/Kyu8.json b/DieJudoGürtelprüfung/Kyu8.json new file mode 100644 index 0000000..f73c0bf --- /dev/null +++ b/DieJudoGürtelprüfung/Kyu8.json @@ -0,0 +1,10 @@ +[ + { + "source": "http://download.m-m-sports.com/extras/judo_guertelpruefung/1_8%20fallrw.mp4", + "target": "videos/8terKyu/Ukemi/Ushiro.webm" + }, + { + "source": "http://mmurl.de/judo02", + "target": "videos/8terKyu/Ukemi/Yoko.webm" + } +] \ No newline at end of file diff --git a/DieJudoGürtelprüfung/yt-clipper.py b/DieJudoGürtelprüfung/clipper similarity index 91% rename from DieJudoGürtelprüfung/yt-clipper.py rename to DieJudoGürtelprüfung/clipper index 2ba8b31..9f21a66 100755 --- a/DieJudoGürtelprüfung/yt-clipper.py +++ b/DieJudoGürtelprüfung/clipper @@ -8,8 +8,10 @@ import glob import sys import argparse -config = {} -config['vcodec'] = "vp9" +config = { + 'vcodec': "vp9", + 'acodec': "libopus" +} argParser = argparse.ArgumentParser() @@ -41,6 +43,10 @@ for clip in clipDict: stream = ffmpeg.input( glob.glob(infoDict['id']+"*")[0], ) + + video = stream.video + audio = stream.audio + if 'crop' in clip: stream = ffmpeg.filter(stream, "crop", @@ -61,7 +67,8 @@ for clip in clipDict: clip['target'], vcodec=config['vcodec'], **{ - "an":None, "y":None, + # "an":None, + "y":None, "pass":"1", "b:v":"512k", "minrate":"375k", "maxrate":"1088k", "quality":"good", @@ -99,14 +106,16 @@ for clip in clipDict: w = clip['scale']['w'] if 'w' in clip['scale'] else -2 stream = ffmpeg.filter(stream, "scale", height=h, width=w ) - stream = ffmpeg.output(stream, + stream = ffmpeg.output(stream, audio, clip['target'], vcodec=config['vcodec'], **{ - "an":None, "y":None, + # "an":None, + "y":None, "pass":"2", "b:v":"512k", "minrate":"375k", "maxrate":"1088k", "quality":"good", + "acodec": config['acodec'], } ) try: diff --git a/DieJudoGürtelprüfung/kyu7-ukemi-MaeMawariUkemi.md b/DieJudoGürtelprüfung/kyu7-ukemi-MaeMawariUkemi.md deleted file mode 100644 index bf1451d..0000000 --- a/DieJudoGürtelprüfung/kyu7-ukemi-MaeMawariUkemi.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: Judorolle vorwärts mit Liegenbleiben oder Aufstehen -... - -# Video - -