From 45d8b559bccbde5cde1b325faba6177b9b6c6558 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 16 Apr 2017 15:41:15 +0200 Subject: Relabel input/logo/output, and list at top. --- bin/decode+edit+loop+encode+stream | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/decode+edit+loop+encode+stream') diff --git a/bin/decode+edit+loop+encode+stream b/bin/decode+edit+loop+encode+stream index bf17f33..64495ed 100755 --- a/bin/decode+edit+loop+encode+stream +++ b/bin/decode+edit+loop+encode+stream @@ -5,6 +5,9 @@ set -e +INPUT=../src/omni/show0/earth.mp4 +LOGO=../../content/icon_small.png + HOST=${1:-morla} if [ "$HOST" = "$(hostname --short)" ]; then IP=127.0.0.1 @@ -19,15 +22,12 @@ ITERATIONS=${3-0} # endless by default HEIGHT=360 VBITRATE=500000 -MOVIE=../src/omni/show0/earth.mp4 -LOGO=../../content/icon_small.png - # based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming # + loop-in-filter trick based on http://video.stackexchange.com/a/16933 # + scale+watermark trick based on http://stackoverflow.com/a/10937357 # + Drop frames, aggressively treat as static, and use fastest cpu ffmpeg -threads auto -re \ - -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \ + -f lavfi -i "movie=filename=$INPUT:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \ -i "$LOGO" \ -filter_complex \ "[0:v]scale=-1:$HEIGHT[bg]; -- cgit v1.2.3