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

Fehler aus letztem Marge korregiert

Browse Source 
modified:   homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
This commit is contained in:
marko
2019-03-13 07:14:49 +01:00
parent a924af3503
commit d95da364e4
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@ targets:
# Die Stabilisierungsberechnung:
# eventuell sollte hier die Skalierung vorgeschaltet werden...
# @toDo: Ist es mit vorheriger Skalierung schneller, oder langsamer?
videos/.forCompressing/%.trf: videos/.forCompressing/%.video
$(FFMPEG) -i $^ \
-filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoFilterDenoise)$(ffmpegVideoFilterVidstabDetect):result="$@" \
@@ -128,15 +129,9 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
-codec:v $(VID_CODEC) \
-pass 2 \
-passlogfile "$(basename $<).firstPassLog" \
<<<<<<< HEAD
-deadline best \
$(VID_CODEC_DEADLINE) \
-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 \
@@ -149,18 +144,14 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
-f webm \
$@
videos/thumbnails/%.png: videos/.forCompressing/%.video
#videos/thumbnails/%.png: videos/.forCompressing/%.video
videos/thumbnails/%.png: videos/webm/%.webm
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 "$<" -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 "$@"
$(FFMPEG) -i "$<" -aspect $(ffmpegDisplayAspectRatio) -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"
videos/thumbnails/%.jpg: videos/thumbnails/%.png
<<<<<<< HEAD
$(GUETZLI) --quality 90 "$<" "$@"
=======
# $(GUETZLI) --quality 90 "$<" "$@"
convert "$<" "$@"
>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
# convert "$<" "$@"