marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Umstellung auf Andrea

Browse Source 
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
This commit is contained in:
marko
2018-12-03 17:36:51 +01:00
parent 10f98eac61
commit ce978f05fd
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
View File

@@ -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 "$<" "$@"