marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge http://marko.dedyn.io/marko/cwsvJudo into redesign2018

Browse Source
This commit is contained in:
marko
2020-01-12 16:22:42 +01:00
parent f96a83f7e5 6280c3dd8d
commit b8aa1e3cf4
163 changed files with 55355 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9 Normal file
View File

@@ -0,0 +1,93 @@
#include Makefile.webmCompress.cfg
FFMPEG=ffmpeg
GUETZLI=guetzli
audioBitrate = 32
videoBitrate = $(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< videoBitrate) \
pixelSize=$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)
getTargetParameter = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\,-2\)":sws_flags=bicubic
ffmpegVideoFilterDeinterlace = yadif
ffmpegVideoFilterDenoise = nlmeans
ffmpegVideoFilterDeshake = deshake=rx=64:ry=64
#ffmpegVideoFilters = $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterDeshake),$(ffmpegVideoFilterUnsharp),$(ffmpegVideoScaleFilter)
ffmpegVideoFilters=$(ffmpegVideoFilterDeinterlace)
#,$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterDeshake),$(ffmpegVideoFilterUnsharp),$(ffmpegVideoScaleFilter)
vidCodec = libvpx-vp9
audCodec = libopus
#vidCodecDeadline = -deadline best
vidCodecDeadline = -deadline good
vidFormat = webm
.SECONDARY: $(vidstabLogs) $(firstPassLogs)
.DEFAULT: info
info:
@echo Es muss ein Target übergeben werden!
# First Pass
videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video
$(FFMPEG) -i $< \
-codec:v $(vidCodec) \
-filter:v yadif \
-filter:v deshake=rx=64:ry=64 \
-filter:v crop=in_w-2*64:in_h-2*64 \
-filter:v scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\,-2\)":sws_flags=bicubic \
-codec:a $(audCodec) \
-pass 1 \
-passlogfile "$(basename $<).firstPassLog" \
-threads 1 \
-speed 4 \
-tile-columns 0 \
-frame-parallel 0 \
-g 9999 \
-aq-mode 0 \
-an \
-f $(vidFormat) \
-y \
/dev/null
# Second Pass
# - Die erste Abhängigkeit muss das quellVideo sein!
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.firstPassLog-0.log
mkdir -p videos/webm
$(FFMPEG) -i $< \
-filter:v yadif \
-filter:v deshake=rx=64:ry=64 \
-filter:v crop=in_w-2*64:in_h-2*64 \
-filter:v scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\,-2\)":sws_flags=bicubic \
-codec:v $(vidCodec) \
-codec:a $(audCodec) \
-pass 2 \
-passlogfile "$(basename $<).firstPassLog" \
$(vidCodecDeadline) \
-b:a $(audioBitrate)k \
-b:v $(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< videoBitrate)k \
-threads 1 \
-speed 0 \
-tile-columns 0 \
-frame-parallel 0 \
-auto-alt-ref 1 \
-lag-in-frames 25 \
-g 9999 \
-f $(vidFormat) \
$@
videos/thumbnails/%.png: videos/.forCompressing/%.video
mkdir -p videos/thumbnails
# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@"
# $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
# $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@"
# $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
$(FFMPEG) -i "$<" \
-filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),thumbnail \
-frames:v 1 "$@"
videos/thumbnails/%.jpg: videos/thumbnails/%.png
$(GUETZLI) --quality 90 "$<" "$@"
# convert "$<" "$@"

4
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal
View File

@@ -1,4 +1,4 @@
include ${makefileDir}/Makefile.vidGal.cfg
include $(makefileDir)/Makefile.vidGal.cfg
.PHONY: all clean
all: $(webmVideos) $(jpegThumbs)
@@ -38,5 +38,5 @@ targetSources:
# target und dependencies müssen noch angepasst werden
# Die erste Abhängigkeit muss das quellVideo sein!
videos/webm/%.webm: videos/.forCompressing/%.video
make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.webmCompress $@
make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.deshakeVp9 $@

2
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg
View File

@@ -1,4 +1,4 @@
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./aufnahmen/videos/*/)))
#targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))

8
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
View File

@@ -1,7 +1,8 @@
FFMPEG = ffmpeg
#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
#FFMPEG = ffmpeg
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg
#FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg
#GUETZLI = guetzli
GUETZLI = ~/tmp/guetzli/bin/Release/guetzli
#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
@@ -12,7 +13,8 @@ DEFAULT_FFMPEG = ffmpeg
GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
#GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
getTargetParameter = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
#getTargetParameter = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
getTargetParameter = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
# Für eine schnelle Komprimierung libvpx, sonst vp9

42
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal Normal file
View File

@@ -0,0 +1,42 @@
include ${makefileDir}/Makefile.vidGal.cfg
.PHONY: all clean
all: $(webmVideos) $(jpegThumbs)
clean:
$(RM) \
$(vidstabLogs) \
$(firstPassLogs) \
$(webmVideos) \
$(jpegThumbs)
.PHONY: thumbnails
thumbnails: $(jpegThumbs)
videos/thumbnails/%.jpg: videos/.forCompressing/%.video
make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.webmCompress $@
.PHONY: echo
echo:
@echo $(webmVideos)
@echo $(firstPassLogs)
@echo $(targetSourceDirectories)
# Erzeugen der Targets
# @todo das muss ich immer noch einzeln aufrufen ...
.PHONY: targetSources
targetSources:
mkdir -p videos/.forCompressing
for directory in $(targetSourceDirectories) ;\
do for file in $${directory}/*.*;\
do \
checkSum=$$(sha512sum $${file});\
ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\
done;\
done;
# target und dependencies müssen noch angepasst werden
# Die erste Abhängigkeit muss das quellVideo sein!
videos/webm/%.webm: videos/.forCompressing/%.video
make --include-dir=${makefileDir} --file=${makefileDir}/Makefile.webmCompress $@

19
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.vidGal.cfg Normal file
View File

@@ -0,0 +1,19 @@
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
#targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
sourceVideos = $(wildcard videos/.forCompressing/*.video)
# Zwischentargets, für ein clean
vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos)))
firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
#makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
makefileDir = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg

79
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress Normal file
View File

@@ -0,0 +1,79 @@
include Makefile.webmCompress.cfg
.SECONDARY: $(vidstabLogs) $(firstPassLogs)
.DEFAULT: info
info:
@echo Es muss ein Target übergeben werden!
# Die Stabilisierungsberechnung:
# eventuell sollte hier die Skalierung vorgeschaltet werden...
# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer?
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
$(FFMPEG) -i $^ \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@.tmp" \
-f null \
-
mv $@.tmp $@
# First Pass
# @todo: irgendwo habe ich mal gelesen, dass man den ersten Pass auch
# als ansehbares Video (mit höchster Qualittätseinstellung) speichern
# kann. Wäre praktisch für eine leicht schnellere Verfügbarkeit.
videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
$(FFMPEG) -i $< \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
-codec:v $(VID_CODEC) \
-pass 1 \
-passlogfile "tmp.$(basename $<).firstPassLog" \
-threads 1 \
-speed 4 \
-tile-columns 0 \
-frame-parallel 0 \
-g 9999 \
-aq-mode 0 \
-an \
-f webm \
-y \
/dev/null
mv tmp.$@ $@
# Second Pass
# - Die erste Abhängigkeit muss das quellVideo sein!
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
mkdir -p videos/webm
$(FFMPEG) -i $< \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
-codec:v $(VID_CODEC) \
-pass 2 \
-passlogfile "$(basename $<).firstPassLog" \
$(VID_CODEC_DEADLINE) \
-b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \
-threads 1 \
-speed 0 \
-tile-columns 0 \
-frame-parallel 0 \
-auto-alt-ref 1 \
-lag-in-frames 25 \
-g 9999 \
-aq-mode 0 \
-an \
-f webm \
$@.tmp
mv $@.tmp $@
videos/thumbnails/%.png: videos/.forCompressing/%.video
mkdir -p videos/thumbnails
# $(FFMPEG) -i "$<" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf $(ffmpegVideoScaleFilter)fps=fps=1/600 "$@"
# $(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
# $(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4,thumbnail -frames:v 1 "$@"
# $(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
videos/thumbnails/%.jpg: videos/thumbnails/%.png
$(GUETZLI) --quality 90 "$<" "$@"
# convert "$<" "$@"
.PHONY: echo
echo:
echo $(GET_VIDEO_DURATION_JSON)

57
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGalQuick.d/Makefile.webmCompress.cfg Normal file
View File

@@ -0,0 +1,57 @@
#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
#FFMPEG = ffmpeg
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg
GUETZLI = ~/tmp/guetzli/bin/Release/guetzli
#GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli
DEFAULT_FFMPEG = ffmpeg
#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
#GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
# Für eine schnelle Komprimierung libvpx, sonst vp9
DEFAULT_VID_CODEC_HEIGHT = 360
DEFAULT_VID_CODEC_WIDTH = -2
DEFAULT_VID_CODEC_BITRATE = 500k
DEFAULT_VID_CODEC = libvpx-vp9
# Standardwerte auf die benutzen Variablen schreiben, falls diese noch
# nicht (z.B. aus dem Terminal heraus oder über ein IncludeCfgFile)
# gesetzt worden sind
VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE))
VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT))
VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH))
VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
VID_CODEC_DEADLINE := -deadline best
#VID_CODEC_DEADLINE := -deadline realtime
targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
sourceVideos = $(wildcard videos/.forCompressing/*.video)
vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos)))
firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
# das result= fehlt absichtlich
ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15
# das input= fehlt absichtlich
ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30
#ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos,
ffmpegVideoScaleFilter = scale=if( gt(in_w, in_h), -2, $(VID_CODEC_HEIGHT) ):if( gt(in_w, in_h), $(VID_CODEC_HEIGHT), -2)exit
:sws_flags=lanczos,
ffmpegVideoFilterDeinterlace = yadif,
ffmpegVideoFilterDenoise = nlmeans,
#ffmpegVideoFilterDenoise = hqdn3d,
#ffmpegDisplayAspectRatio = 16:9
#ffmpegDisplayAspectRatio = 9:16

4
homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-news.css
View File

@@ -56,6 +56,10 @@
margin: auto;
box-shadow: 0 1px 2px 0 rgba(0,0,0,.5);
}
.newsText video,
.newsText amp-video{
max-width: 100%;
}
.newsFooter{
background-color: #FF8100;
}

4
homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py Normal file → Executable file
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# -*- coding: utf8 -*-
#
# Command line use of 'ffprobe':
#
@@ -68,7 +68,7 @@ if __name__ == "__main__":
argParser = argparse.ArgumentParser(description='Calculate Bitrate and Pixelsize (height) for a encoding a video with limited (byte-)size')
argParser.add_argument('inFile', help="file to be analysed")
argParser.add_argument('flagToGet', help="Zielparameter wählen", choices=['pixelSize', 'videoBitrate'])
argParser.add_argument('--audioBitrate', help="audio bitrate die abgezogen werden soll (in kbit/s)", default=0)
argParser.add_argument('--audioBitrate', help="audio bitrate die abgezogen werden soll (in kbit/s)", default=0, type=float)
argParser.add_argument('--targetSize', help="dateigröße der zieldatei in MB", default=10)
argParser.add_argument('--overhead', help="prozentualer overhead in %", default=95)
argParser.add_argument('--maxVidBitrate', help="Videobitrate, bei der gedeckelt werden soll", default=750)