- Umstellung auf Andrea

geändert:       src/Makefiles/Makefile.ftpUpload
	geändert:       src/Makefiles/Makefile.vidstabTest
- kleinere Korrekturen
	geändert:       src/galleryHelper/getVideoDurationJson.py
	geändert:       src/galleryHelper/vidGalInsert.py

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

@@ -1,17 +1,26 @@
 include Makefile.cfg
 
-ftpServer = ftpupload.net
-ftpUser = unaux_22935783
-ftpPassword = eeloor0D
+#ftpServer = ftpupload.net
+#ftpUser = unaux_22935783
+#ftpPassword = eeloor0D
 
-ftpPathBase = /htdocs
+#ftpPathBase = /htdocs
+#ftpFilePath = videoalben/videoalben.2018
+
+ftpServer = cwsvjudo.bplaced.net
+ftpUser = cwsvjudo
+ftpPassword = ***REMOVED***
+
+ftpPathBase = /www
 ftpFilePath = videoalben/videoalben.2018
 
-vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
+vidGalIndexPhp = ~/keeper/judo/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 = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
 
 
 
@@ -20,7 +29,7 @@ all:
 
 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e 'set net:limit-rate 25600; 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
-GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
+#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
@@ -18,6 +20,9 @@ VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_C
 VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH))
 VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))
 
+#VID_CODEC_DEADLINE := -deadline best
+VID_CODEC_DEADLINE := -deadline realtime
+
 targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
 targetSourceDir = videos/aufnahmen/
 sourceVideos = $(wildcard videos/.forCompressing/*.video)
@@ -89,7 +94,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
 #		-b:v $(VID_CODEC_BITRATE) \
 # First Pass
 	$(FFMPEG) -i $< \
-		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
+		-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" \
@@ -110,16 +115,16 @@ 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 $< \
-		-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",nlmeans=s=6:p=5:r=7,$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
+		-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" \
-		-deadline best \
-		-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
+		$(VID_CODEC_DEADLINE) \
+		-b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
 		-aspect 16:9 \
 		-threads 1 \
 		-speed 0 \
@@ -139,5 +144,6 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
 	$(FFMPEG) -i "$<" -vf $(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
 
 videos/thumbnails/%.jpg: videos/thumbnails/%.png
-	$(GUETZLI) --quality 90 "$<" "$@"
+#	$(GUETZLI) --quality 90 "$<" "$@"
+	convert "$<" "$@"
 

homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py

@@ -21,7 +21,7 @@ def probe(vid_file_path):
     @vid_file_path : The absolute (full) path of the video file, string.
     '''
     if type(vid_file_path) != str:
-        raise Exception('Gvie ffprobe a full file path of the video')
+        raise Exception('Give ffprobe a full file path of the video')
         return
 
     command = ["ffprobe",
@@ -34,7 +34,7 @@ def probe(vid_file_path):
 
     pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
     out, err = pipe.communicate()
-    return json.loads(out)
+    return json.loads(out.decode('utf-8'))
 
 
 def duration(vid_file_path):