Use mapping (not audio/video supporession), and consistently use complex filter (not video filter).

8 files changed, 17 insertions, 16 deletions

diff --git a/bin/capture+encode+stream b/bin/capture+encode+stream
index d9face9..740e2f3 100755
--- a/bin/capture+encode+stream
+++ b/bin/capture+encode+stream
@@ -26,10 +26,10 @@ VBITRATE=256000
 ffmpeg -hide_banner -threads auto -re \
  -f alsa -sample_rate "$AFRAMERATE" -channels "$ACHANNELS" -thread_queue_size 1024 -i "$AINPUT" \
  -f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$VINPUT" \
+ -map '0:a' \
  -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \
- -vn \
  -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -an \
+ -map '0:v' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
diff --git a/bin/decode+edit b/bin/decode+edit
index f6ce75e..0882438 100755
--- a/bin/decode+edit
+++ b/bin/decode+edit
@@ -18,6 +18,6 @@ ffmpeg -hide_banner -threads auto -y \
  -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 \
+  [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 6c00a56..3f733d9 100755
--- a/bin/decode+edit+encode
+++ b/bin/decode+edit+encode
@@ -21,8 +21,8 @@ ffmpeg -hide_banner -threads auto -y -re \
  -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 \
+  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
+ -map '[v]' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -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 3914825..6657211 100755
--- a/bin/decode+edit+encode+stream
+++ b/bin/decode+edit+encode+stream
@@ -28,13 +28,13 @@ VBITRATE=256000
 ffmpeg -hide_banner -threads auto -re \
  -i "$INPUT" \
  -i "$LOGO" \
- -vf \
+ -filter_complex \
  "[0:v]scale=-1:$HEIGHT[bg];
-  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
+  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
+ -map '0:a' \
  -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \
- -vn \
  -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -an \
+ -map '[v]' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
diff --git a/bin/decode+edit+encodeDV b/bin/decode+edit+encodeDV
index a853d81..fbbe7c3 100755
--- a/bin/decode+edit+encodeDV
+++ b/bin/decode+edit+encodeDV
@@ -21,5 +21,6 @@ ffmpeg -hide_banner -threads auto -y \
  -i "$LOGO" \
  -filter_complex \
  "[0:v]scale=-1:$HEIGHT[bg];
-  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
+  [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 3f1e253..b7cc5d5 100755
--- a/bin/decode+edit+loop+encode+stream
+++ b/bin/decode+edit+loop+encode+stream
@@ -32,8 +32,8 @@ ffmpeg -hide_banner -threads auto -re \
  -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 \
+  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
+ -map '[v]' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
diff --git a/bin/encodevideo+loop+stream b/bin/encodevideo+loop+stream
index 61edc0d..39e4b21 100755
--- a/bin/encodevideo+loop+stream
+++ b/bin/encodevideo+loop+stream
@@ -20,7 +20,7 @@ VBITRATE=256000
 # + Use same RTP payload types as GStreamer
 ffmpeg -hide_banner -threads auto -re \
  -stream_loop -1 -i "$INPUT" \
- -an \
+ -map '0:v' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
diff --git a/bin/loop+encode+stream b/bin/loop+encode+stream
index 13a5c75..8d28767 100755
--- a/bin/loop+encode+stream
+++ b/bin/loop+encode+stream
@@ -26,10 +26,10 @@ VBITRATE=256000
 # + Use same RTP payload types as GStreamer
 ffmpeg -hide_banner -threads auto -re \
  -stream_loop -1 -i "$INPUT" \
+ -map '0:a' \
  -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \
- -vn \
  -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -an \
+ -map '0:v' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \