Support container source.

2 files changed, 3 insertions, 44 deletions

diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream
deleted file mode 100755
index 6657211..0000000
--- a/bin/decode+edit+encode+stream
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-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
-else
-	IP=$(host "$HOST" | grep -Po 'address \K\S+')
-fi
-
-FIRSTPORT=${2:-5002} # even number - next 3 ports used too
-
-ACHANNELS=2
-AFRAMERATE=48000
-ABITRATE=32000
-
-HEIGHT=360
-VBITRATE=256000
-
-# 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
-# + Add 1s latency (deadline)
-# + Use same RTP payload types as GStreamer
-ffmpeg -hide_banner -threads auto -re \
- -i "$INPUT" \
- -i "$LOGO" \
- -filter_complex \
- "[0:v]scale=-1:$HEIGHT[bg];
-  [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" \
- -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -map '[v]' \
- -pix_fmt yuv420p \
- -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
- -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
- -undershoot-pct 95 -bufsize $((6000*VBITRATE/1000)) -rc_init_occupancy $((4000*VBITRATE/1000)) \
- -max-intra-rate 0 \
- -qmin 4 -qmax 56 \
- -f rtp -payload_type 100 "rtp://$IP:$((FIRSTPORT+2))?pkt_size=1200"
diff --git a/bin/stream b/bin/stream
index 3ab064a..1755141 100755
--- a/bin/stream
+++ b/bin/stream
@@ -38,6 +38,8 @@ while [ $# -gt 0 ]; do
 		dvcam) DVCAM=auto; XINPUT=$((XINPUT+1));;
 		dc=*) IIDC=${1#*=}; VINPUT=$((VINPUT+1));;
 		dc) IIDC=/dev/fw1; VINPUT=$((VINPUT+1));;
+		container=*) XFILE=${1#*=}; XINPUT=$((XINPUT+1));;
+		*.avi|*.mkv|*.mov|*.mp4|*.ogg|*.ogv|*.webm) XFILE=$1; XINPUT=$((XINPUT+1));;
 		*.png) LOGO=$1; WINPUT=$((WINPUT+1));;
 		--) shift; break;;
 		*) exit1 "Unsupported input: $1";;
@@ -77,6 +79,7 @@ VBITRATE=256000
 ffmpeg -hide_banner -threads auto -re \
  ${ALSA:+-f alsa -sample_rate "$AFRAMERATE" -channels "$ACHANNELS" -thread_queue_size 1024 -i "$ALSA"} \
  ${DVCAM:+-f iec61883 -i $DVCAM} \
+ ${XFILE:+-i "$XFILE"} \
  ${IIDC:+-f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$IIDC"} \
  ${LOGO:+-i "$LOGO"} \
  -filter_complex \