summaryrefslogtreecommitdiff
path: root/bin/stream
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-05-22 14:03:54 +0200
committerJonas Smedegaard <dr@jones.dk>2017-05-22 14:03:54 +0200
commite3968c621be9e420f84c7284b2a99efef8a19f6c (patch)
tree0288868c93a3b412e83ed12349aabc0f8207dd24 /bin/stream
parent7c9db99d91a30cf3be973fe02a0c77173960dd51 (diff)
Fix swap audio and video targets. Rename targets to be more specific.
Diffstat (limited to 'bin/stream')
-rwxr-xr-xbin/stream10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/stream b/bin/stream
index ec710f3..9c5f8b3 100755
--- a/bin/stream
+++ b/bin/stream
@@ -102,7 +102,7 @@ fi
[ -z "$XINPUT" ] || [ $XINPUT -eq 1 ] || exit1 "Too many arguments: Max. 1 multimedia source"
[ -n "${NOAUDIO:-}" ] || [ -z "$AINPUT$XINPUT" ] || HASAUDIO=1
[ -n "${NOVIDEO:-}" ] || [ -z "$VINPUT$XINPUT" ] || HASVIDEO=1
-TARGETS_WEBM="${HASAUDIO:+rtp_video} ${HASVIDEO:+rtp_audio}"
+TARGETS_WEBM="${HASAUDIO:+rtp_opus} ${HASVIDEO:+rtp_vp8}"
VSTREAMINDEX=1
[ -n "$AINPUT" ] || VSTREAMINDEX=0
@@ -246,16 +246,16 @@ mux_webm() {
muxcount=$(echo "$TARGETS_WEBM" | wc --words)
if [ $muxcount -lt 2 ]; then
case "$TARGETS_WEBM" in
- rtp_audio) echo_n "-f rtp -payload_type 111 rtp://$IP:$FIRSTPORT?pkt_size=1440";;
- rtp_video) echo_n "-f rtp -payload_type 100 rtp://$IP:$((FIRSTPORT+2))?pkt_size=1440";;
+ rtp_opus) echo_n "-f rtp -payload_type 111 rtp://$IP:$FIRSTPORT?pkt_size=1440";;
+ rtp_vp8) echo_n "-f rtp -payload_type 100 rtp://$IP:$((FIRSTPORT+2))?pkt_size=1440";;
*) exit1 "Unsupported muxing $TARGETS_WEBM";;
esac
else
echo_n "-f tee "
for muxing in $TARGETS_WEBM; do
case "$muxing" in
- rtp_audio) echo_n "[select=\'a\':f=rtp:payload_type=111]rtp://$IP:$FIRSTPORT?pkt_size=1440";;
- rtp_video) echo_n "[select=\'v\':f=rtp:payload_type=100]rtp://$IP:$((FIRSTPORT+2))?pkt_size=1440";;
+ rtp_opus) echo_n "[select=\'a\':f=rtp:payload_type=111]rtp://$IP:$FIRSTPORT?pkt_size=1440";;
+ rtp_vp8) echo_n "[select=\'v\':f=rtp:payload_type=100]rtp://$IP:$((FIRSTPORT+2))?pkt_size=1440";;
*) exit1 "Unsupported muxing $muxing";;
esac
muxcount=$((muxcount-1))