Merge branch 'redesign2017' of /f/gitRepositories/judo into redesign2018

homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload

@@ -8,22 +8,20 @@ include Makefile.cfg
 #ftpPassword = eeloor0D
 #httpUrlBase = http://cwsvjudo-media-2018.unaux.com/
 
-
 ftpServer = cwsvjudo.bplaced.net
 ftpUser = cwsvjudo
 ftpPassword = ***REMOVED***
 httpUrlBase = http://cwsvjudo.bplaced.net.net/
 
-#ftpPathBase = /htdocs
-ftpPathBase = /www
 ftpFilePath = videoalben/videoalben.2018
+ftpPathBase = /www
 
 vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
 dryRun = --dry-run
 timeHandling= --only-newer
 lftpNetLimitRate = 0
 
-vidGalInsertScript = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+vidGalInsertScript = /d/tempcwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
 
 
 
@@ -32,7 +30,7 @@ all:
 
 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e 'set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
+	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
 		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
 	
 	for file in videos/webm/*; do \

homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest

@@ -1,5 +1,7 @@
 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
@@ -19,6 +21,10 @@ VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODE
 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)
@@ -114,7 +120,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 $<
 #		-b:v $(VID_CODEC_BITRATE) \
 # Second Pass
 	$(FFMPEG) -i $< \
@@ -122,9 +128,15 @@ 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
 		-threads 1 \
 		-speed 0 \
 		-tile-columns 0 \
@@ -145,4 +157,10 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
 	$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 
 videos/thumbnails/%.jpg: videos/thumbnails/%.png
+<<<<<<< HEAD
 	$(GUETZLI) --quality 90 "$<" "$@"
+=======
+#	$(GUETZLI) --quality 90 "$<" "$@"
+	convert "$<" "$@"
+
+>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852

homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9

@@ -3,11 +3,11 @@ include Makefile.cfg
 # Standardwerte
 
 # Für eine schnelle Komprimierung
-DEFAULT_VID_CODEC = libvpx 
+#DEFAULT_VID_CODEC = libvpx 
 DEFAULT_VID_CODEC_BITRATE = 500k
 DEFAULT_VID_CODEC_HEIGHT = 320
 #DEFAULT_VID_CODEC_BITRATE = 250k
-#DEFAULT_VID_CODEC = libvpx-vp9
+DEFAULT_VID_CODEC = libvpx-vp9
 
 
 # Standardwerte auf die benutzen Variablen schreiben, falls diese noch 
@@ -62,7 +62,8 @@ TEST:
 videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -73,7 +74,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -97,7 +99,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -108,7 +111,8 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \