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

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