Merge branch 'redesign2018' of /media/sdb1/gitRepositories/judo into redesign2018

Conflicts: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
2019-01-24 05:18:24 +01:00
parent 556b329833 29bb5c6fad
commit 436e74afd3
15 changed files with 793 additions and 111 deletions
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -1,27 +1,27 @@
+# Upload der Videogalleriedateien auf einen Webspace und Eintragen in 
+# die "Videodatenbank"
+
 include Makefile.cfg

 #ftpServer = ftpupload.net
 #ftpUser = unaux_22935783
 #ftpPassword = eeloor0D
-
-#ftpPathBase = /htdocs
-#ftpFilePath = videoalben/videoalben.2018
+#httpUrlBase = http://cwsvjudo-media-2018.unaux.com/

 ftpServer = cwsvjudo.bplaced.net
 ftpUser = cwsvjudo
 ftpPassword = ***REMOVED***
+httpUrlBase = http://cwsvjudo.bplaced.net.net/

-ftpPathBase = /www
 ftpFilePath = videoalben/videoalben.2018
+ftpPathBase = /www

 vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
 dryRun = --dry-run
 timeHandling= --only-newer
 lftpNetLimitRate = 0

-
 domain = cwsvJudo.dedyn.io
-
 vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py


--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
@@ -1,10 +1,10 @@
-#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
+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
+DEFAULT_FFMPEG = ffmpeg
+#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe

 # Für eine schnelle Komprimierung libvpx, sonst vp9
 DEFAULT_VID_CODEC_HEIGHT = 360
@@ -20,13 +20,14 @@ 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
+defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
+VID_CODEC_DEADLINE := -deadline best
+#VID_CODEC_DEADLINE := -deadline realtime

 targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
-targetSourceDir = videos/aufnahmen/
-sourceVideos = $(wildcard videos/.forCompressing/*.video)

+targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
+sourceVideos = $(wildcard videos/.forCompressing/*.video)

 vidstabLogs   = $(addsuffix .trf, $(basename $(sourceVideos)))
 firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
@@ -40,7 +41,10 @@ ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:

 ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos,
 ffmpegVideoFilterDeinterlace = yadif,
-ffmpegVideoFilterDenoise = hqdn3d,
+ffmpegVideoFilterDenoise = nlmeans,
+#ffmpegVideoFilterDenoise = hqdn3d,
+ffmpegDisplayAspectRatio = 16:9
+#ffmpegDisplayAspectRatio = 9:16


 .SECONDARY: $(vidstabLogs) $(firstPassLogs)
@@ -92,13 +96,14 @@ videos/.forCompressing/%.trf: videos/.forCompressing/%.video

 videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 #		-b:v $(VID_CODEC_BITRATE) \
+#		-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 \
 # First Pass
 	$(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" \
-		-aspect 16:9 \
+		-aspect $(ffmpegDisplayAspectRatio) \
 		-threads 1 \
 		-speed 4 \
 		-tile-columns 0 \
@@ -123,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 \
@@ -141,9 +152,15 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 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 "$<" -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 "$@"

 videos/thumbnails/%.jpg: videos/thumbnails/%.png
+<<<<<<< HEAD
+	$(GUETZLI) --quality 90 "$<" "$@"
+=======
 #	$(GUETZLI) --quality 90 "$<" "$@"
 	convert "$<" "$@"

+>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852