summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-28 10:19:01 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-28 10:19:01 +0200
commite41c71324edee6e068a10fe0fc3d179d661a7270 (patch)
treef01a3fcdd2f3d0beaec3d561f2991e7f9a039456
parentcaa15c07179bb765c710b5132cb78520cac99926 (diff)
Use rounded rescaling.
-rwxr-xr-xbin/decode+edit2
-rwxr-xr-xbin/decode+edit+encode2
-rwxr-xr-xbin/decode+edit+encodeDV2
-rwxr-xr-xbin/decode+edit+loop+encode+stream2
-rwxr-xr-xbin/stream2
5 files changed, 5 insertions, 5 deletions
diff --git a/bin/decode+edit b/bin/decode+edit
index 0882438..9f34d01 100755
--- a/bin/decode+edit
+++ b/bin/decode+edit
@@ -17,7 +17,7 @@ ffmpeg -hide_banner -threads auto -y \
-i "$INPUT" \
-i "$LOGO"
-filter_complex \
- "[0:v]scale=-1:$HEIGHT[bg];
+ "[0:v]scale=-2:$HEIGHT[bg];
[bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
-map '[v]' \
-f yuv4mpegpipe "$OUTPUT"
diff --git a/bin/decode+edit+encode b/bin/decode+edit+encode
index 3f733d9..6f86654 100755
--- a/bin/decode+edit+encode
+++ b/bin/decode+edit+encode
@@ -20,7 +20,7 @@ ffmpeg -hide_banner -threads auto -y -re \
-i "$INPUT" \
-i "$LOGO" \
-filter_complex \
- "[0:v]scale=-1:$HEIGHT[bg];
+ "[0:v]scale=-2:$HEIGHT[bg];
[bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
-map '[v]' \
-pix_fmt yuv420p \
diff --git a/bin/decode+edit+encodeDV b/bin/decode+edit+encodeDV
index fbbe7c3..2a09fe1 100755
--- a/bin/decode+edit+encodeDV
+++ b/bin/decode+edit+encodeDV
@@ -20,7 +20,7 @@ ffmpeg -hide_banner -threads auto -y \
-i "$INPUT" \
-i "$LOGO" \
-filter_complex \
- "[0:v]scale=-1:$HEIGHT[bg];
+ "[0:v]scale=-2:$HEIGHT[bg];
[bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
-map '[v]' \
-target pal-dv "$OUTPUT"
diff --git a/bin/decode+edit+loop+encode+stream b/bin/decode+edit+loop+encode+stream
index b7cc5d5..6b469a5 100755
--- a/bin/decode+edit+loop+encode+stream
+++ b/bin/decode+edit+loop+encode+stream
@@ -31,7 +31,7 @@ ffmpeg -hide_banner -threads auto -re \
-f lavfi -i "movie=filename=$INPUT:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \
-i "$LOGO" \
-filter_complex \
- "[0:v]scale=-1:$HEIGHT[bg];
+ "[0:v]scale=-2:$HEIGHT[bg];
[bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
-map '[v]' \
-pix_fmt yuv420p \
diff --git a/bin/stream b/bin/stream
index 53d9163..afb0de5 100755
--- a/bin/stream
+++ b/bin/stream
@@ -92,7 +92,7 @@ ffmpeg -hide_banner -threads auto -re \
${VFILE:+-i "$VFILE"} \
${LOGO:+-i "$LOGO"} \
${MAYBEVIDEO:+-filter_complex \
- "[$VSTREAMINDEX:v]scale=-1:$HEIGHT${WATERMARK:-[v]}${WATERMARK:+[bg]${LOGO:+;
+ "[$VSTREAMINDEX:v]scale=-2:$HEIGHT${WATERMARK:-[v]}${WATERMARK:+[bg]${LOGO:+;
[bg][$((VSTREAMINDEX+1)):v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]}}"} \
${SAVEDIR:+-map '0:' ${TWOSOURCES:+-map '1:'} \
-codec copy \