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

- Einschränkung auf einzelne Seiten, Tage und userHashes

Browse Source 
modified:   redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php
- vergeblicher Versuch die fehlerhafte Anzeige bei deaktiviertem JS zu
beheben
	modified:   redesign2018/markdownExperiment/phpLib/imgGallery/index.php.tmpl
- Anpassungen von Hand für einzelne Spezialfälle (@todo eifachere
Individualkonfiguration)
	modified:   redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	modified:   redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
- Konzept einer neuen Videogalerie
	modified:   redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
	new file:   redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
	new file:   redesign2018/markdownExperiment/src/galleryHelper/videoGalleryVue.tmpl.php
	new file:   redesign2018/markdownExperiment/src/galleryHelper/yamlRead.py
This commit is contained in:
marko
2018-12-05 12:55:32 +01:00
parent 9b1a33ab0f
commit 9c2af1f3bf
8 changed files with 566 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
#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
@@ -18,10 +18,10 @@ 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))
targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDir = videos/aufnahmen/
sourceVideos = $(wildcard videos/.forCompressing/*.video)
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
sourceVideos = $(wildcard videos/.forCompressing/*.video)
vidstabLogs = $(addsuffix .trf, $(basename $(sourceVideos)))
firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
@@ -35,7 +35,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)
@@ -57,7 +60,7 @@ thumbnails: $(jpegThumbs)
echo:
@echo $(webmVideos)
@echo $(firstPassLogs)
@echo $(targetSourceDir)
@echo $(targetSourceDirectories)
# Erzeugen der Targets
@@ -87,13 +90,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",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" \
-aspect 16:9 \
-aspect $(ffmpegDisplayAspectRatio) \
-threads 1 \
-speed 4 \
-tile-columns 0 \
@@ -114,13 +118,13 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
# -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 \
-aspect 16:9 \
-aspect $(ffmpegDisplayAspectRatio)\
-threads 1 \
-speed 0 \
-tile-columns 0 \
@@ -136,8 +140,9 @@ 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
$(GUETZLI) --quality 90 "$<" "$@"