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

- Upload zu square7 entfernt

Browse Source 
geändert:       homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
- config.inc.php korrigiert
	geändert:       homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
This commit is contained in:
marko
2018-11-21 11:18:15 +01:00
parent 0948251fac
commit 48203dc935
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
View File

@@ -3,11 +3,11 @@ include Makefile.cfg
# Standardwerte # Standardwerte
# Für eine schnelle Komprimierung # Für eine schnelle Komprimierung
DEFAULT_VID_CODEC = libvpx #DEFAULT_VID_CODEC = libvpx
DEFAULT_VID_CODEC_BITRATE = 500k DEFAULT_VID_CODEC_BITRATE = 500k
DEFAULT_VID_CODEC_HEIGHT = 320 DEFAULT_VID_CODEC_HEIGHT = 320
#DEFAULT_VID_CODEC_BITRATE = 250k #DEFAULT_VID_CODEC_BITRATE = 250k
#DEFAULT_VID_CODEC = libvpx-vp9 DEFAULT_VID_CODEC = libvpx-vp9
# Standardwerte auf die benutzen Variablen schreiben, falls diese noch # Standardwerte auf die benutzen Variablen schreiben, falls diese noch
@@ -62,7 +62,8 @@ TEST:
videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4 videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
mkdir -p videos/webm mkdir -p videos/webm
ffmpeg -i $^ \ ffmpeg -i $^ \
-filter:v yadif=0:0:0,scale=-1:480 \ -aspect 16:9 \
-filter:v yadif=0:0:0,scale=640:360 \
-codec:v $(VID_CODEC) \ -codec:v $(VID_CODEC) \
-pass 1 \ -pass 1 \
-b:v $(VID_CODEC_BITRATE) \ -b:v $(VID_CODEC_BITRATE) \
@@ -73,7 +74,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
-y \ -y \
/dev/null /dev/null
ffmpeg -i $^ \ ffmpeg -i $^ \
-filter:v yadif=0:0:0,scale=-1:480 \ -aspect 16:9 \
-filter:v yadif=0:0:0,scale=640:360 \
-codec:v $(VID_CODEC) \ -codec:v $(VID_CODEC) \
-pass 2 \ -pass 2 \
-b:v $(VID_CODEC_BITRATE) \ -b:v $(VID_CODEC_BITRATE) \
@@ -97,7 +99,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4 videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
mkdir -p videos/webm mkdir -p videos/webm
ffmpeg -i $^ \ ffmpeg -i $^ \
-filter:v yadif=0:0:0,scale=-1:480 \ -aspect 16:9 \
-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
-codec:v $(VID_CODEC) \ -codec:v $(VID_CODEC) \
-pass 1 \ -pass 1 \
-b:v $(VID_CODEC_BITRATE) \ -b:v $(VID_CODEC_BITRATE) \
@@ -108,7 +111,8 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
-y \ -y \
/dev/null /dev/null
ffmpeg -i $^ \ ffmpeg -i $^ \
-filter:v yadif=0:0:0,scale=-1:480 \ -aspect 16:9 \
-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
-codec:v $(VID_CODEC) \ -codec:v $(VID_CODEC) \
-pass 2 \ -pass 2 \
-b:v $(VID_CODEC_BITRATE) \ -b:v $(VID_CODEC_BITRATE) \

2
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
View File

@@ -1,7 +1,7 @@
<?php <?php
$basePath = "/users/cwsvjudo/www";
include_once("config.inc.php"); include_once("config.inc.php");
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/config/cwsvJudo.config.php"); require_once($basePath."/config/cwsvJudo.config.php");

2
homepage/redesign2018/markdownExperiment/zopfli

Submodule homepage/redesign2018/markdownExperiment/zopfli updated: f0010d0c13...ae43a8b738