summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-16 13:21:21 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-16 13:21:21 +0200
commit0e4445a5330cdf478fe029734fd176689c30a5fd (patch)
treecc7a8ce46028f859a7b8f50db333236bc3bb8508
parent39a5bb761e0f67e1ca0251849b9075349be27d47 (diff)
Scale main input in filter-complex. Reference source of scale+watermark trick. Tidy.
-rwxr-xr-xbin/decode+edit+encode8
-rwxr-xr-xbin/decode+edit+encode+stream8
2 files changed, 12 insertions, 4 deletions
diff --git a/bin/decode+edit+encode b/bin/decode+edit+encode
index e93d05a..72ef4cd 100755
--- a/bin/decode+edit+encode
+++ b/bin/decode+edit+encode
@@ -16,9 +16,13 @@ mkdir -p $(dirname "$TMPMOVIE")
# 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
ffmpeg -threads auto -y -re \
- -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' \
+ -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \
+ -i "$LOGO" \
+ -filter_complex \
+ "[0:v]scale=-1:$HEIGHT[bg];
+ [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
-an \
-codec:v vp8 -quality realtime -deadline realtime -cpu-used 4 \
-b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream
index fadc122..b21eae9 100755
--- a/bin/decode+edit+encode+stream
+++ b/bin/decode+edit+encode+stream
@@ -21,10 +21,14 @@ 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), scale=-1:$HEIGHT" \
- -i "$LOGO" -filter_complex 'overlay=main_w-overlay_w-20:main_h-overlay_h-20' \
+ -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \
+ -i "$LOGO" \
+ -filter_complex \
+ "[0:v]scale=-1:$HEIGHT[bg];
+ [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
-an \
-codec:v vp8 -quality realtime -deadline realtime -cpu-used 15 \
-b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \