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

Merge branch 'shiai' of /i/gitRepositories/judo into shiai

Browse Source
This commit is contained in:
marko
2019-06-28 07:32:33 +02:00
parent fe356afed1 ec91d92d89
commit 70728d2f5f
14 changed files with 3212 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
View File

@@ -257,16 +257,16 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
-an \
-f webm \
"$@"
curl \
--upload-file "$@" \
--user cwsvjudo:Dee4oquu \
"ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
curl \
--upload-file "$@" \
--user cwsvjudo:***REMOVED*** \
"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
--ftp-create-dirs
# curl \
# --upload-file "$@" \
# --user cwsvjudo:Dee4oquu \
# "ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
# --ftp-create-dirs
# curl \
# --upload-file "$@" \
# --user cwsvjudo:***REMOVED*** \
# "ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
# --ftp-create-dirs
videos/thumbnails/%.jpg: videos/webm/%.webm
mkdir -p videos/thumbnails

28
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
View File

@@ -6,6 +6,9 @@ GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
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
# Für eine schnelle Komprimierung libvpx, sonst vp9
DEFAULT_VID_CODEC_HEIGHT = 360
DEFAULT_VID_CODEC_WIDTH = -2
@@ -88,6 +91,7 @@ targets:
# 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="$@" \
@@ -120,7 +124,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
# 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
~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<
$(GET_VIDEO_DURATION_JSON) $<
# -b:v $(VID_CODEC_BITRATE) \
# Second Pass
$(FFMPEG) -i $< \
@@ -128,15 +132,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
-codec:v $(VID_CODEC) \
-pass 2 \
-passlogfile "$(basename $<).firstPassLog" \
<<<<<<< HEAD
-deadline best \
-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
-aspect $(ffmpegDisplayAspectRatio)\
=======
$(VID_CODEC_DEADLINE) \
-b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
-aspect 16:9 \
>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
-b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \
-aspect $(ffmpegDisplayAspectRatio)\
-threads 1 \
-speed 0 \
-tile-columns 0 \
@@ -149,18 +147,14 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
-f webm \
$@
videos/thumbnails/%.png: videos/.forCompressing/%.video
#videos/thumbnails/%.png: videos/.forCompressing/%.video
videos/thumbnails/%.png: videos/webm/%.webm
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 "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
$(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
videos/thumbnails/%.jpg: videos/thumbnails/%.png
<<<<<<< HEAD
$(GUETZLI) --quality 90 "$<" "$@"
=======
# $(GUETZLI) --quality 90 "$<" "$@"
convert "$<" "$@"
>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
# convert "$<" "$@"

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

@@ -0,0 +1,42 @@
include 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 $@

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

@@ -0,0 +1,15 @@
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

72
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress Normal file
View File

@@ -0,0 +1,72 @@
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="$@" \
-f null \
-
# 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 "$(basename $<).firstPassLog" \
-threads 1 \
-speed 4 \
-tile-columns 0 \
-frame-parallel 0 \
-g 9999 \
-aq-mode 0 \
-an \
-f webm \
-y \
/dev/null
# 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 \
$@
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 "$<" "$@"

51
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg Normal file
View File

@@ -0,0 +1,51 @@
#FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
FFMPEG = ffmpeg
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
# 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,
ffmpegVideoFilterDeinterlace = yadif,
ffmpegVideoFilterDenoise = nlmeans,
#ffmpegVideoFilterDenoise = hqdn3d,
#ffmpegDisplayAspectRatio = 16:9
#ffmpegDisplayAspectRatio = 9:16

3
homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
View File

@@ -809,7 +809,7 @@
}
.textoverlayedImage > div {
z-index: 99;
width: 70%;
width: fit-content;
position: absolute;
top: 50%;
left: 50%;
@@ -834,6 +834,7 @@
}
.wkBoxMediaGallery > *{
flex-basis:50%;
padding: 5%;
}

2
homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
View File

@@ -1,6 +1,6 @@
---
lang: de
title: "Helferlein für das Juodtraining"
title: "Helferlein für das Judotraining"
description: "Kleine Helferlein für das Training, insbesondere das Judotraining"
author: "marko"
keywords:

2
homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
View File

@@ -6,5 +6,5 @@ subNav:
- *galerien
- *kontakt
- *judoWiki
- *extras
- *tools
...

BIN
shiai/shiai.2019/2019-06-29--30-Ljs/2019-06-29-LjsU12-Ausschreibung.pdf Normal file
View File

Binary file not shown.

3006
shiai/shiai.2019/2019-06-29--30-Ljs/2019-06-30-LjsU12-teilnehmerListe.fods Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
shiai/shiai.2019/2019-06-29--30-Ljs/2019-06-30-LjsU14-Ausschreibung.pdf Normal file
View File

Binary file not shown.

BIN
shiai/shiai.2019/2019-06-29--30-Ljs/Ljs2019-Meldeliste-CWSV.xlsx Normal file
View File

Binary file not shown.