summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-28 01:36:38 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-28 01:36:38 +0200
commit6ccb121b1d82e037ee94b239b43057647f7fe8d7 (patch)
treee93d0401a352f7e48493acab71eca5dc3f66e855
parent5000584fb2eb0531cf459bc3405c1432a1adf67d (diff)
Support videofile source.
-rwxr-xr-xbin/stream3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/stream b/bin/stream
index eb0f892..7270f6b 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));;
+ videofile=*) VFILE=${1#*=}; VINPUT=$((VINPUT+1));;
+ *.ffv1|*.yuv|*.vp8|*.vp9) VFILE=$1; 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));;
@@ -83,6 +85,7 @@ ffmpeg -hide_banner -threads auto -re \
${DVCAM:+-f iec61883 -i $DVCAM} \
${XFILE:+-i "$XFILE"} \
${IIDC:+-f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$IIDC"} \
+ ${VFILE:+-i "$VFILE"} \
${LOGO:+-i "$LOGO"} \
${MAYBEVIDEO:+-filter_complex \
"[$VSTREAMINDEX:v]scale=-1:$HEIGHT${WATERMARK:-[v]}${WATERMARK:+[bg]${LOGO:+;