diff options
Diffstat (limited to 'bin/decode+edit+encode+stream')
| -rwxr-xr-x | bin/decode+edit+encode+stream | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream index 014a848..48137bf 100755 --- a/bin/decode+edit+encode+stream +++ b/bin/decode+edit+encode+stream @@ -2,6 +2,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 @@ -16,14 +19,11 @@ ABITRATE=64000 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 # + scale+watermark trick based on http://stackoverflow.com/a/10937357 # + Drop frames, aggressively treat as static, and use fastest cpu ffmpeg -threads auto -re \ - -i "$MOVIE" \ + -i "$INPUT" \ -i "$LOGO" \ -vf \ "[0:v]scale=-1:$HEIGHT[bg]; |