diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-04-13 10:31:25 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-13 10:53:32 +0200 |
| commit | c37fe7cba815cb845583364481facc21da34f29b (patch) | |
| tree | 97f34d75e08963b13e92665502eb8af658f78d37 /bin | |
| parent | 5ecdeaf2c7b1ce9b2fe13744068a4d9c44dafb1d (diff) | |
Tidy comments.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/decode+edit | 2 | ||||
| -rwxr-xr-x | bin/decode+edit+encode+stream | 5 | ||||
| -rwxr-xr-x | bin/encode+stream | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/bin/decode+edit b/bin/decode+edit index d0fa0b4..c81a8f3 100755 --- a/bin/decode+edit +++ b/bin/decode+edit @@ -13,7 +13,7 @@ TMPMOVIE=../tmp/omni/show0/earth.yuv mkdir -p $(dirname "$TMPMOVIE") -# based on http://video.stackexchange.com/a/16933 +# + loop-in-filter trick based on http://video.stackexchange.com/a/16933 ffmpeg -threads auto -y \ -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB), scale=-1:$HEIGHT" \ -i "$LOGO" -filter_complex 'overlay=main_w-overlay_w-20:main_h-overlay_h-20' \ diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream index 80ec165..e8f5cdd 100755 --- a/bin/decode+edit+encode+stream +++ b/bin/decode+edit+encode+stream @@ -19,9 +19,8 @@ BITRATE=500000 MOVIE=../src/omni/show0/earth.mp4 LOGO=../../content/icon_small.png -# based on http://video.stackexchange.com/a/16933 -# + codec options from http://www.webmproject.org/docs/encoder-parameters/ -# example "Real-time CBR Encoding and Streaming" +# 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 # + 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), scale=-1:$HEIGHT" \ diff --git a/bin/encode+stream b/bin/encode+stream index 98bf32a..e090587 100755 --- a/bin/encode+stream +++ b/bin/encode+stream @@ -15,8 +15,7 @@ BITRATE=500000 TMPMOVIE=../tmp/omni/show0/earth.yuv -# based on http://www.webmproject.org/docs/encoder-parameters/ -# example "Real-time CBR Encoding and Streaming" +# based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming # + Drop frames, aggressively treat as static, and use fastest cpu ffmpeg -threads auto -re \ -stream_loop -1 -i "$TMPMOVIE" \ |