Merge /media/sdb1/gitRepositories/judo into redesign2018
This commit is contained in:
marko
@@ -0,0 +1,286 @@
|
||||
include Makefile.cfg
|
||||
# In deer Makefile.cfg mus mindestens das VID_GAL_DIR stehen
|
||||
|
||||
# Experimentieren mit vidstab, nur in helko
|
||||
|
||||
# Standardwerte
|
||||
|
||||
# Für eine schnelle Komprimierung
|
||||
#DEFAULT_VID_CODEC = libvpx
|
||||
#DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC_HEIGHT = 360
|
||||
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_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE))
|
||||
VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
|
||||
|
||||
|
||||
ORIG_VIDS = \
|
||||
$(wildcard videos/aufnahmen/mögel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/moegel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/helko/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/elly/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.webm) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.mp4)
|
||||
|
||||
webm_VIDS = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
JPEG_THMB = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
|
||||
|
||||
.PHONY: all
|
||||
all: $(JPEG_THMB) $(webm_VIDS)
|
||||
|
||||
# Aufnahmen mit Helko
|
||||
videos/webm/%.webm: videos/aufnahmen/helko/%.mp4
|
||||
mkdir -p videos/webm
|
||||
# Erst die Stabilisierung:
|
||||
ffmpeg -i $^ \
|
||||
-filter:v vidstabdetect=shakiness=10:accuracy=15 \
|
||||
-f null \
|
||||
-
|
||||
# ffmpeg -i dummy.avi -i dummyStab.avi \
|
||||
# -filter_complex "[0:v]setpts=PTS-STARTPTS, pad=iw*2:ih[bg]; [1:v]setpts=PTS-STARTPTS[fg]; [bg][fg]overlay=w" \
|
||||
# side_by_side.avi
|
||||
ffmpeg -i $^ \
|
||||
-filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-threads 1 \
|
||||
-speed 4 \
|
||||
-tile-columns 0 \
|
||||
-frame-parallel 0 \
|
||||
-g 9999 \
|
||||
-aq-mode 0 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-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 \
|
||||
$@
|
||||
# Wir extperimentieren ja nur, deshalb kein Upload
|
||||
# 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/webm/%.webm: videos/aufnahmen/mögel/%.MP4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/papaRomy/%.mp4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/papaRomy/%.webm
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i "$^" \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i "$^" \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/thumbnails/%.jpg: videos/webm/%.webm
|
||||
mkdir -p videos/thumbnails
|
||||
-ffmpeg -i "$^" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf fps=fps=1/600 "$@"
|
||||
# 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
|
||||
|
||||
.PHONY: videos/thumbnails
|
||||
videos/thumbnails: $(JPEG_THMB)
|
||||
@@ -0,0 +1,129 @@
|
||||
include Makefile.cfg
|
||||
# In deer Makefile.cfg muss mindestens das VID_GAL_DIR stehen
|
||||
|
||||
# Experimentieren mit Videocompression
|
||||
# Stabilisierung mit vidstab
|
||||
# Kompression mit VP9 und Konstanter Qualität
|
||||
|
||||
# Standardwerte
|
||||
|
||||
# Für eine schnelle Komprimierung
|
||||
#DEFAULT_VID_CODEC = libvpx
|
||||
#DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC = libaom-av1
|
||||
DEFAULT_VID_CODEC_HEIGHT = 360
|
||||
DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC_CQ = 36
|
||||
|
||||
DEFAULT_FFMPEG = ffmpeg
|
||||
|
||||
# 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 := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
|
||||
VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT))
|
||||
VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE))
|
||||
VID_CODEC_CQ := $(if $(VID_CODEC_CQ),$(VID_CODEC_CQ),$(DEFAULT_VID_CODEC_CQ))
|
||||
|
||||
FFMPEG := $(if $(FFMPEG),$(FFMPEG),$(DEFAULT_FFMPEG))
|
||||
|
||||
|
||||
# Videoquellen
|
||||
ORIG_VIDS = \
|
||||
$(wildcard videos/aufnahmen/mögel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/moegel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/helko/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/elly/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.webm) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.mp4)
|
||||
|
||||
# Targets
|
||||
mkv_VIDS = $(addprefix videos/mkv/, $(addsuffix .mkv, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
webm_VIDS = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
JPEG_THMB = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
|
||||
|
||||
.PHONY: all
|
||||
#all: $(JPEG_THMB) $(mkv_VIDS)
|
||||
all: $(mkv_VIDS)
|
||||
|
||||
# Aufnahmen mit Helko
|
||||
videos/mkv/%.mkv: videos/aufnahmen/helko/%.mp4
|
||||
mkdir -p videos/mkv
|
||||
# Erst die Stabilisierung:
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabdetect=shakiness=10:accuracy=15 \
|
||||
-f null \
|
||||
-
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
-strict experimental \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-crf $(DEFAULT_VID_CODEC_CQ) \
|
||||
-b:v 0 \
|
||||
-an \
|
||||
-f matroska \
|
||||
$@
|
||||
# ffmpeg -i dummy.avi -i dummyStab.avi \
|
||||
# -filter_complex "[0:v]setpts=PTS-STARTPTS, pad=iw*2:ih[bg]; [1:v]setpts=PTS-STARTPTS[fg]; [bg][fg]overlay=w" \
|
||||
# side_by_side.avi
|
||||
# ffmpeg -i $^ \
|
||||
# -filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
# -codec:v $(VID_CODEC) \
|
||||
# -pass 1 \
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# -threads 1 \
|
||||
# -speed 4 \
|
||||
# -tile-columns 0 \
|
||||
# -frame-parallel 0 \
|
||||
# -g 9999 \
|
||||
# -aq-mode 0 \
|
||||
# -an \
|
||||
# -f webm \
|
||||
# -y \
|
||||
# /dev/null
|
||||
# ffmpeg -i $^ \
|
||||
# -filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
# -codec:v $(VID_CODEC) \
|
||||
# -pass 2 \
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# -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 \
|
||||
# $@
|
||||
# Wir extperimentieren ja nur, deshalb kein Upload
|
||||
# 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
|
||||
# -ffmpeg -i "$^" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf fps=fps=1/600 "$@"
|
||||
# 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
|
||||
|
||||
#.PHONY: videos/thumbnails
|
||||
#videos/thumbnails: $(JPEG_THMB)
|
||||
@@ -0,0 +1,105 @@
|
||||
FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
|
||||
GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
|
||||
|
||||
VID_CODEC_HEIGHT = 360
|
||||
VID_CODEC_BITRATE = 500k
|
||||
VID_CODEC = libvpx-vp9
|
||||
|
||||
|
||||
sourceVideos = $(wildcard videos/.forCompressing/*.video)
|
||||
|
||||
vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos)))
|
||||
firstPassLogs = $(addsuffix .firstPassLog, $(basename $(sourceVideos)))
|
||||
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
|
||||
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
|
||||
|
||||
|
||||
.SECONDARY: $(vidstabLogs) $(firstPassLogs)
|
||||
|
||||
.PHONY: all clean
|
||||
all: $(webmVideos) $(jpegThumbs)
|
||||
|
||||
clean:
|
||||
$(RM) \
|
||||
$(vidstabLogs) \
|
||||
$(firstPassLogs) \
|
||||
$(webmVideos) \
|
||||
$(jpegThumbs)
|
||||
|
||||
.PHONY: thumbnails
|
||||
thumbnails: $(jpegThumbs)
|
||||
|
||||
# Erzeugen der Targets
|
||||
.PHONY: targets
|
||||
targets:
|
||||
for file in videos/aufnahmen/papaRomy/*.webm;\
|
||||
do \
|
||||
checkSum=$$(sha512sum $${file});\
|
||||
ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\
|
||||
done;
|
||||
|
||||
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
|
||||
# Die Stabilisierungsberechnung:
|
||||
# eventuell sollte hier die Skalierung vorgeschaltet werden...
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabdetect=result="$@" \
|
||||
-f null \
|
||||
-
|
||||
|
||||
videos/.forCompressing/%.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
|
||||
# First Pass
|
||||
$(FFMPEG) -i $< \
|
||||
-filter:v vidstabtransform=smoothing=30:input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,scale=-2:$(VID_CODEC_HEIGHT):sws_flags=sinc,unsharp=5:5:0.8:3:3:0.4 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-passlogfile "$(basename $<).firstPassLog" \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-threads 1 \
|
||||
-speed 4 \
|
||||
-tile-columns 0 \
|
||||
-frame-parallel 0 \
|
||||
-g 9999 \
|
||||
-aq-mode 0 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
|
||||
|
||||
# target und dependencies müssen noch angepasst werden
|
||||
# Die erste Abhängigkeit muss das quellVideo sein!
|
||||
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.log
|
||||
mkdir -p videos/webm
|
||||
# Second Pass
|
||||
$(FFMPEG) -i $< \
|
||||
-filter:v vidstabtransform=smoothing=30:input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,scale=-2:$(VID_CODEC_HEIGHT),unsharp=5:5:0.8:3:3:0.4 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-passlogfile "$(basename $<).firstPassLog" \
|
||||
-deadline best \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-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 scale=-2:$(VID_CODEC_HEIGHT),fps=fps=1/600 "$@"
|
||||
$(FFMPEG) -i "$<" -vf thumbnail,scale=-2:$(VID_CODEC_HEIGHT) -frames:v 1 "$@"
|
||||
|
||||
videos/thumbnails/%.jpg: videos/thumbnails/%.png
|
||||
$(GUETZLI) --quality 90 "$<" "$@"
|
||||
|
||||
|
||||
###
|
||||
|
||||
#$(FFMPEG) -i %1 -map 0 -c copy -c:v libvpx-vp9 -pass 1 -passlogfile "%~dpn1.log" -b:v 150K -threads 1 -deadline good -cpu-used 4 -tile-columns 0 -frame-parallel 0 -auto-alt-ref 1 -lag-in-frames 24 -g 9600 -aq-mode 1 -sws_dither none -pix_fmt yuv420p10le -filter:v nlmeans=s=6:p=5:r=7,scale=w=428:h=240:force_original_aspect_ratio=decrease:sws_flags=area:sws_dither=none,crop=trunc(iw/2)*2:trunc(ih/2)*2:0:0 -an -f null NUL
|
||||
#$(FFMPEG) -i %1 -map 0 -c copy -c:v libvpx-vp9 -pass 2 -passlogfile "%~dpn1.log" -b:v 150K -threads 1 -deadline good -cpu-used 1 -tile-columns 0 -frame-parallel 0 -auto-alt-ref 1 -lag-in-frames 24 -g 9600 -aq-mode 1 -sws_dither none -pix_fmt yuv420p10le -filter:v nlmeans=s=6:p=5:r=7,scale=w=428:h=240:force_original_aspect_ratio=decrease:sws_flags=area:sws_dither=none,crop=trunc(iw/2)*2:trunc(ih/2)*2:0:0 -c:a libopus -b:a 32k -ac 2 -f webm "%~dpn1.webm"
|
||||
@@ -0,0 +1,127 @@
|
||||
include Makefile.cfg
|
||||
# In deer Makefile.cfg muss mindestens das VID_GAL_DIR stehen
|
||||
|
||||
# Experimentieren mit Videocompression
|
||||
# Stabilisierung mit vidstab
|
||||
# Kompression mit VP9 und Konstanter Qualität
|
||||
|
||||
# Standardwerte
|
||||
|
||||
# Für eine schnelle Komprimierung
|
||||
#DEFAULT_VID_CODEC = libvpx
|
||||
#DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC = libvpx-vp9
|
||||
DEFAULT_VID_CODEC_HEIGHT = 360
|
||||
DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC_CQ = 36
|
||||
|
||||
DEFAULT_FFMPEG = ffmpeg
|
||||
|
||||
# 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 := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
|
||||
VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_CODEC_HEIGHT))
|
||||
VID_CODEC_BITRATE := $(if $(VID_CODEC_BITRATE),$(VID_CODEC_BITRATE),$(DEFAULT_VID_CODEC_BITRATE))
|
||||
VID_CODEC_CQ := $(if $(VID_CODEC_CQ),$(VID_CODEC_CQ),$(DEFAULT_VID_CODEC_CQ))
|
||||
|
||||
FFMPEG := $(if $(FFMPEG),$(FFMPEG),$(DEFAULT_FFMPEG))
|
||||
|
||||
|
||||
# Videoquellen
|
||||
ORIG_VIDS = \
|
||||
$(wildcard videos/aufnahmen/mögel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/moegel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/helko/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/elly/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.webm) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.mp4)
|
||||
|
||||
# Targets
|
||||
webm_VIDS = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
JPEG_THMB = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
|
||||
|
||||
.PHONY: all
|
||||
all: $(JPEG_THMB) $(webm_VIDS)
|
||||
|
||||
# Aufnahmen mit Helko
|
||||
videos/webm/%.webm: videos/aufnahmen/helko/%.mp4
|
||||
mkdir -p videos/webm
|
||||
# Erst die Stabilisierung:
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabdetect=shakiness=10:accuracy=15 \
|
||||
-f null \
|
||||
-
|
||||
$(FFMPEG) -i $^ \
|
||||
-filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,unsharp=5:5:0.8:3:3:0.4,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-crf $(DEFAULT_VID_CODEC_CQ)\
|
||||
-b:v 0 \
|
||||
-quality best \
|
||||
-an \
|
||||
-f webm \
|
||||
$@
|
||||
# ffmpeg -i dummy.avi -i dummyStab.avi \
|
||||
# -filter_complex "[0:v]setpts=PTS-STARTPTS, pad=iw*2:ih[bg]; [1:v]setpts=PTS-STARTPTS[fg]; [bg][fg]overlay=w" \
|
||||
# side_by_side.avi
|
||||
# ffmpeg -i $^ \
|
||||
# -filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
# -codec:v $(VID_CODEC) \
|
||||
# -pass 1 \
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# -threads 1 \
|
||||
# -speed 4 \
|
||||
# -tile-columns 0 \
|
||||
# -frame-parallel 0 \
|
||||
# -g 9999 \
|
||||
# -aq-mode 0 \
|
||||
# -an \
|
||||
# -f webm \
|
||||
# -y \
|
||||
# /dev/null
|
||||
# ffmpeg -i $^ \
|
||||
# -filter:v vidstabtransform=smoothing=30:optzoom=2:interpol=bicubic,scale=-1:$(VID_CODEC_HEIGHT) \
|
||||
# -codec:v $(VID_CODEC) \
|
||||
# -pass 2 \
|
||||
# -b:v $(VID_CODEC_BITRATE) \
|
||||
# -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 \
|
||||
# $@
|
||||
# Wir extperimentieren ja nur, deshalb kein Upload
|
||||
# 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
|
||||
-ffmpeg -i "$^" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf fps=fps=1/600 "$@"
|
||||
# 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
|
||||
|
||||
.PHONY: videos/thumbnails
|
||||
videos/thumbnails: $(JPEG_THMB)
|
||||
@@ -0,0 +1,297 @@
|
||||
include Makefile.cfg
|
||||
|
||||
# Standardwerte
|
||||
|
||||
# Für eine schnelle Komprimierung
|
||||
DEFAULT_VID_CODEC = libvpx
|
||||
DEFAULT_VID_CODEC_BITRATE = 500k
|
||||
DEFAULT_VID_CODEC_HEIGHT = 320
|
||||
#DEFAULT_VID_CODEC_BITRATE = 250k
|
||||
#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 := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
|
||||
|
||||
|
||||
ORIG_VIDS = \
|
||||
$(wildcard videos/aufnahmen/mögel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/moegel/*.MP4) \
|
||||
$(wildcard videos/aufnahmen/helko/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/elly/*.mp4) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.webm) \
|
||||
$(wildcard videos/aufnahmen/papaRomy/*.mp4)
|
||||
#webm_VIDS = \
|
||||
# $(patsubst videos/mögel/%.MP4, videos/webm/%.webm, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/moegel/%.MP4, videos/webm/%.webm, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/helko/%.mp4, videos/webm/%.webm, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/elly/%.mp4, videos/webm/%.webm, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/papaRomy/%.webm, videos/webm/%.webm, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/papaRomy/%.mp4, videos/webm/%.webm, $(ORIG_VIDS))
|
||||
|
||||
webm_VIDS = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
JPEG_THMB = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(ORIG_VIDS)))))
|
||||
|
||||
#JPEG_THMB = \
|
||||
# $(patsubst videos/mögel/%.MP4, videos/thumbnails/%.jpg, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/moegel/%.MP4, videos/thumbnails/%.jpg, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/helko/%.mp4, videos/thumbnails/%.jpg, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/elly/%.mp4, videos/thumbnails/%.jpg, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/papaRomy/%.webm, videos/thumbnails/%.jpg, $(ORIG_VIDS)) \
|
||||
# $(patsubst videos/papaRomy/%.mp4, videos/thumbnails/%.jpg, $(ORIG_VIDS))
|
||||
|
||||
#VID_GAL_DIR = "2018-06-23_LittleOttoGoshiLiga-2018-2_U9U12_HalleS"
|
||||
#VID_GAL_DIR = "2018-08-18_LittleOttoGoshiLiga-2018-3-U9U12-HalleS"
|
||||
|
||||
|
||||
.PHONY: all
|
||||
all: $(JPEG_THMB) $(webm_VIDS)
|
||||
|
||||
.PHONY: TEST
|
||||
TEST:
|
||||
@echo "Originale: "
|
||||
@echo $(ORIG_VIDS)
|
||||
@echo "webms: "
|
||||
@echo $(webm_VIDS)
|
||||
@echo "jpgs: "
|
||||
@echo $(JPEG_THMB)
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v yadif=0:0:0,scale=-1:480 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/helko/%.mp4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-threads 1 \
|
||||
-speed 4 \
|
||||
-tile-columns 0 \
|
||||
-frame-parallel 0 \
|
||||
-g 9999 \
|
||||
-aq-mode 0 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-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 \
|
||||
$@
|
||||
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/webm/%.webm: videos/aufnahmen/papaRomy/%.mp4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/papaRomy/%.webm
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i $^ \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
|
||||
mkdir -p videos/webm
|
||||
ffmpeg -i "$^" \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 1 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 4 \
|
||||
-g 9999 \
|
||||
-an \
|
||||
-f webm \
|
||||
-y \
|
||||
/dev/null
|
||||
ffmpeg -i "$^" \
|
||||
-filter:v scale=-1:480,deshake=-1:-1:-1:-1:64:64:3:64:125:0 \
|
||||
-codec:v $(VID_CODEC) \
|
||||
-pass 2 \
|
||||
-b:v $(VID_CODEC_BITRATE) \
|
||||
-speed 0 \
|
||||
-auto-alt-ref 1 \
|
||||
-g 9999 \
|
||||
-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
|
||||
|
||||
videos/thumbnails/%.jpg: videos/webm/%.webm
|
||||
mkdir -p videos/thumbnails
|
||||
-ffmpeg -i "$^" -vf "select=gt(scene\,0.4)" -frames:v 5 -vsync vfr -vf fps=fps=1/600 "$@"
|
||||
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
|
||||
|
||||
.PHONY: videos/thumbnails
|
||||
videos/thumbnails: $(JPEG_THMB)
|
||||
@@ -44,6 +44,7 @@ body > * {
|
||||
.sideNotes{
|
||||
float: right;
|
||||
width: 33%;
|
||||
clear: right;
|
||||
}
|
||||
.footerBar{
|
||||
clear: both;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"@context" : "http://schema.org",
|
||||
"@type" : "SportsClub",
|
||||
"name": "Chemnitzer Freizeit- und Wohngebietssportverein",
|
||||
"url": "http://cwsv-sport.de",
|
||||
"image": "http://img.webme.com/pic/c/cwsv-sport/cwsvLogo.x300.png",
|
||||
"email": "cwsv.sb@web.de",
|
||||
"telephone": "+49 (0) 371 28 23 370",
|
||||
"openingHours": [ "Mo 8:00-16:30", "Di 10:00-17:00", "Mi 8:00-17:00", "Do 10:00-17:00"],
|
||||
"sameAs": [ "https://www.facebook.com/CWSV-eV-149983928431116/" ],
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"addressLocality": "Chemnitz",
|
||||
"addressRegion": "Deutschland",
|
||||
"postalCode": "09119",
|
||||
"streetAddress": "Straße Usti nad Labem 42"
|
||||
},
|
||||
"geo": {
|
||||
"@type": "GeoCoordinates",
|
||||
"latitude": "50.8078784",
|
||||
"longitude": "12.8124339"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"@context": "http://schema.org",
|
||||
"@type": "SportsActivityLocation",
|
||||
"name": "Dojo des Chemnitzer WSV e.V.",
|
||||
"address":{
|
||||
"@type": "PostalAddress",
|
||||
"name": "Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz"
|
||||
},
|
||||
"telephone": "+493712823370",
|
||||
"email": "cwsv.sb@web.de",
|
||||
"image": "http://img.webme.com/pic/c/cwsv-sport/dsc_1410.jpg",
|
||||
"geo": {
|
||||
"@type": "GeoCoordinates",
|
||||
"latitude": "50.8078180",
|
||||
"longitude": "12.881849"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
"@context" : "http://schema.org",
|
||||
"@type" : "SportsClub",
|
||||
"name": "Chemnitzer Freizeit- und Wohngebietssportverein - Abteilung Judo",
|
||||
"url": "http://cwsvjudo.bplaced.net",
|
||||
"image": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoWappen.512w.png",
|
||||
"email": "cwsv.sb@web.de",
|
||||
"telephone": "+493712823370",
|
||||
"sameAs": [
|
||||
"http://cwsvjudo.bplaced.net",
|
||||
"https://www.facebook.com/CWSV-eV-149983928431116/"
|
||||
],
|
||||
"openingHours": [ "Mi 16:00-17:45", "Fr 16:00-17:45", "Fr 17:15-19:15"],
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"addressLocality": "Chemnitz",
|
||||
"addressRegion": "Deutschland",
|
||||
"postalCode": "09119",
|
||||
"streetAddress": "Straße Usti nad Labem 42"
|
||||
},
|
||||
"geo": {
|
||||
"@type": "GeoCoordinates",
|
||||
"latitude": "50.8078784",
|
||||
"longitude": "12.8124339"
|
||||
},
|
||||
"parentOrganization":{
|
||||
"@context" : "http://schema.org",
|
||||
"@type" : "SportsClub",
|
||||
"name": "Chemnitzer Freizeit- und Wohngebietssportverein",
|
||||
"url": "http://cwsv-sport.de",
|
||||
"image": "http://img.webme.com/pic/c/cwsv-sport/cwsvLogo.x300.png",
|
||||
"email": "cwsv.sb@web.de",
|
||||
"telephone": "+493712823370",
|
||||
"contactPoint": [
|
||||
{
|
||||
"@type": "ContactPoint",
|
||||
"telephone": "+493712823370",
|
||||
"contactType": "customer service"
|
||||
}
|
||||
],
|
||||
"openingHours": [ "Mo 8:00-16:30", "Di 10:00-17:00", "Mi 8:00-17:00", "Do 10:00-17:00"],
|
||||
"sameAs": [ "https://www.facebook.com/CWSV-eV-149983928431116/" ],
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"addressLocality": "Chemnitz",
|
||||
"addressRegion": "Deutschland",
|
||||
"postalCode": "09119",
|
||||
"streetAddress": "Straße Usti nad Labem 42"
|
||||
},
|
||||
"geo": {
|
||||
"@type": "GeoCoordinates",
|
||||
"latitude": "50.8078784",
|
||||
"longitude": "12.8124339"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"@context" : "http://schema.org",
|
||||
"@type" : "Organization",
|
||||
"name": "Chemnitzer Freizeit- und Wohngebietssportverein - Abteilung Judo",
|
||||
"url": "http://cwsvjudo.bplaced.net",
|
||||
"image": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogo.x512.png",
|
||||
"logo": {
|
||||
"@type": "ImageObject",
|
||||
"url": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/logos/cwsvJudoLogoPublisher.png",
|
||||
"width": 600,
|
||||
"height": 60
|
||||
},
|
||||
"email": "cwsv.sb@web.de",
|
||||
"telephone": "+49 (0) 371 28 23 370",
|
||||
"sameAs": [ "https://www.facebook.com/CWSV-eV-149983928431116/" ],
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"addressLocality": "Chemnitz",
|
||||
"addressRegion": "Deutschland",
|
||||
"postalCode": "09119",
|
||||
"streetAddress": "Straße Usti nad Labem 42"
|
||||
},
|
||||
"parentOrganization":{
|
||||
"@context" : "http://schema.org",
|
||||
"@type" : "SportsClub",
|
||||
"name": "Chemnitzer Freizeit- und Wohngebietssportverein",
|
||||
"url": "http://cwsv-sport.de",
|
||||
"image": "http://img.webme.com/pic/c/cwsv-sport/cwsvLogo.x300.png",
|
||||
"email": "cwsv.sb@web.de",
|
||||
"telephone": "+49 (0) 371 28 23 370",
|
||||
"openingHours": [ "Mo 8:00-16:30", "Di 10:00-17:00", "Mi 8:00-17:00", "Do 10:00-17:00"],
|
||||
"sameAs": [ "https://www.facebook.com/CWSV-eV-149983928431116/" ],
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"addressLocality": "Chemnitz",
|
||||
"addressRegion": "Deutschland",
|
||||
"postalCode": "09119",
|
||||
"streetAddress": "Straße Usti nad Labem 42"
|
||||
},
|
||||
"geo": {
|
||||
"@type": "GeoCoordinates",
|
||||
"latitude": "50.8078784",
|
||||
"longitude": "12.8124339"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"@context": "http://www.schema.org",
|
||||
"@type": "WebSite",
|
||||
"name": "Judo im Chemnitzer WSV",
|
||||
"alternateName": "Homepage der Abteilung Judo des Chemnitzer Freizeit- und Wohngebietssportvereines",
|
||||
"url": "http://cwsvjudo.bplaced.net",
|
||||
"image": "http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/cwsv-judo-logo.png"
|
||||
}
|
||||
@@ -21,8 +21,6 @@ und [Wettkampfterminen][cwsvJudoWettkampfKalender].
|
||||
Ein kleines Wiki bietet [Wissenswertes über Judo][cwsvJudoWiki], wie
|
||||
zum Beispiel das [Programm für die Gürtelprüfungen][cwsvJudoWikiKyu].
|
||||
|
||||
# Die letzten Neuigkeiten
|
||||
|
||||
<?php $options['limit']=6; echoNewsTableHtml( $options );?>
|
||||
|
||||
[cwsvHomepage]: http://www.cwsv-sport.de "Homepage des Chemnitzer Freizeit- und Wohngebietssportvereines"
|
||||
|
||||
@@ -8,5 +8,5 @@ keywords:
|
||||
- News
|
||||
description: "Bekanntmachungen und Meldungen der Judoka des Chemnitzer WSV"
|
||||
...
|
||||
|
||||
<?php if($_GET['jahr']) $options['jahr']=$_GET['jahr']; else $options['limit']=6; echoNewsTableHtml( $options );?>
|
||||
<?php if($_GET['newsId']){$options['newsId']=$_GET['newsId']; echoNewsTableHtml( $options );}?>
|
||||
<?php $options=array(); if($_GET['jahr']) $options['jahr']=$_GET['jahr']; else $options['limit']=6; echoNewsTableHtml( $options );?>
|
||||
|
||||
@@ -9,6 +9,9 @@ keywords:
|
||||
description: "Wann und wo die Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines trainieren"
|
||||
canonicalLink: "http://cwsvjudo.bplaced.net/trainingszeiten"
|
||||
ampVersionLink: "http://amp.cwsvjudo.bplaced.net/trainingszeiten"
|
||||
jsonSdFiles:
|
||||
- cwsvDojoAsSportsActivityLocation.json
|
||||
- cwsvJudo.json
|
||||
...
|
||||
|
||||
# Judotraining im CWSV
|
||||
|
||||
@@ -6,7 +6,7 @@ keywords:
|
||||
- Judo
|
||||
- Chemnitz
|
||||
- Chemnitzer Freizeit- und Wohngebietssportverein
|
||||
description: "Informationen und weiterführende Links des Chemniitzer Freizeit- und Wohngebitssportvereines"
|
||||
description: "Informationen und weiterführende Links des Chemnitzer Freizeit- und Wohngebitssportvereines"
|
||||
canonicalLink: "http://cwsvjudo.bplaced.net/verein"
|
||||
ampVersionLink: "http://amp.cwsvjudo.bplaced.net/verein"
|
||||
...
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
---
|
||||
lang: de
|
||||
title: "Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V."
|
||||
phpTitleFunction: echoWkTitle
|
||||
phpTitleString: ( (is_positive_integer( \$_GET['wkId']) )?(getWkName(\$_GET['wkId']).' im '):'').'Wettkampfkalender der Judoka des Chemnitzer Freizeit- und Wohngebiets­sportvereines e. V.'
|
||||
author: marko
|
||||
keywords:
|
||||
- Judo
|
||||
- Wettkampf
|
||||
- Termine
|
||||
description: "Ein Kalender mit Judo-Wettkampfterminen zur Übersicht"
|
||||
canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId']?('/'.$_GET['wkId']):''));?>"
|
||||
ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender"
|
||||
canonicalLink: "http://cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId'].'/'.toAscii(html_entity_decode(getWkName($_GET['wkId'])))):'');?>"
|
||||
ampVersionLink: "http://amp.cwsvjudo.bplaced.net/wkKalender<?php echo(is_positive_integer($_GET['wkId'])?('/'.$_GET['wkId'].'/'.toAscii(html_entity_decode(getWkName($_GET['wkId'])))):'');?>"
|
||||
...
|
||||
|
||||
<?php wkTableHtml();?>
|
||||
|
||||
Reference in New Issue
Block a user