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

- adaptive Auflösung und Bitrate für die Videos

Browse Source 
modified:   Makefiles/Makefiles.vidGal.d/Makefile.webmCompress
	modified:   Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
	new file:   galleryHelper/getFfmpegFlags.py
This commit is contained in:
marko
2019-07-08 14:43:27 +02:00
parent 494827655d
commit f8c8404a44
3 changed files with 108 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress
View File

@@ -11,7 +11,7 @@ info:
# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer?
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
$(FFMPEG) -i $^ \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \
-filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterVidstabDetect):result="$@" \
-f null \
-
@@ -21,7 +21,7 @@ videos/.forCompressing/%.trf: videos/.forCompressing/%.video
# kann. Wäre praktisch für eine leicht schnellere Verfügbarkeit.
videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video videos/.forCompressing/%.trf
$(FFMPEG) -i $< \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
-filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoFilterUnsharp),$(ffmpegVideoScaleFilter) \
-codec:v $(VID_CODEC) \
-pass 1 \
-passlogfile "$(basename $<).firstPassLog" \
@@ -41,12 +41,12 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
mkdir -p videos/webm
$(FFMPEG) -i $< \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoScaleFilter)unsharp=5:5:0.8:3:3:0.4 \
-filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),$(ffmpegVideoFilterDenoise),$(ffmpegVideoFilterVidstabTransform):input="$(basename $<).trf",$(ffmpegVideoFilterUnsharp) \
-codec:v $(VID_CODEC) \
-pass 2 \
-passlogfile "$(basename $<).firstPassLog" \
$(VID_CODEC_DEADLINE) \
-b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \
-b:v $(shell $(getTargetParameter) $< videoBitrate)k \
-threads 1 \
-speed 0 \
-tile-columns 0 \
@@ -65,7 +65,9 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
# $(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 "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
$(FFMPEG) -i "$<" \
-filter:v $(ffmpegVideoFilterDeinterlace),$(ffmpegVideoScaleFilter),thumbnail \
-frames:v 1 "$@"
videos/thumbnails/%.jpg: videos/thumbnails/%.png
$(GUETZLI) --quality 90 "$<" "$@"

13
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
View File

@@ -7,6 +7,9 @@ DEFAULT_FFMPEG = ffmpeg
#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
#GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
getTargetParameter = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
# Für eine schnelle Komprimierung libvpx, sonst vp9
@@ -41,11 +44,15 @@ jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(n
ffmpegVideoFilterVidstabDetect = vidstabdetect=shakiness=10:accuracy=15
# das input= fehlt absichtlich
ffmpegVideoFilterVidstabTransform = vidstabtransform=optzoom=2:interpol=bicubic:smoothing=30
# vidstab empfiehlt die Verwendung des unsharp-Filters bei vidstabtransform
ffmpegVideoFilterUnsharp = unsharp=5:5:0.8:3:3:0.4
#ffmpegVideoScaleFilter = scale=$(VID_CODEC_WIDTH):$(VID_CODEC_HEIGHT):sws_flags=lanczos,
ffmpegVideoScaleFilter = scale=if( gt(in_w, in_h), -2, $(VID_CODEC_HEIGHT) ):if( gt(in_w, in_h), $(VID_CODEC_HEIGHT), -2):sws_flags=lanczos,
ffmpegVideoFilterDeinterlace = yadif,
ffmpegVideoFilterDenoise = nlmeans,
#ffmpegVideoScaleFilter = scale=if\( gt\(in_w, in_h\), -2, $(VID_CODEC_HEIGHT) \):if\( gt\(in_w, in_h\), $(VID_CODEC_HEIGHT), -2\):sws_flags=lanczos
#ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(VID_CODEC_HEIGHT)\)":"if\(gt\(in_w\,in_h\)\,$(VID_CODEC_HEIGHT)\,-2\)":sws_flags=bicubic
ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) $< pixelSize)\,-2\)":sws_flags=bicubic
ffmpegVideoFilterDeinterlace = yadif
ffmpegVideoFilterDenoise = nlmeans
#ffmpegVideoFilterDenoise = hqdn3d,
#ffmpegDisplayAspectRatio = 16:9
#ffmpegDisplayAspectRatio = 9:16