From 70d11e0d08c9f55f93bdd9368e4e554599b0b731 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 26 Feb 2017 17:44:47 +0100 Subject: Use variables VFORMAT AFORMAT (not VIDEO AUDIO). --- bin/recv-gst-rtp-v-a | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/recv-gst-rtp-v-a b/bin/recv-gst-rtp-v-a index d68d3ce..4839cf5 100755 --- a/bin/recv-gst-rtp-v-a +++ b/bin/recv-gst-rtp-v-a @@ -6,8 +6,8 @@ set -e CAMIP=${CAMIP:-$1} # origin host - default: use multicast group VCOUNT=${VCOUNT:-$2} # number of video stream(s) to display - default: 1 ACOUNT=${ACOUNT:-$3} # number of audio stream(s) to play - default: 0 -VIDEO=${VIDEO:-$4} # H264 VP8 RAW - default: H264 -AUDIO=${AUDIO:-$5} # AMR - default: AMR +VFORMAT=${VFORMAT:-$4} # H264 VP8 RAW - default: H264 +AFORMAT=${AFORMAT:-$5} # AMR - default: AMR set -u # set multicast groups (also for recorder host) if camera host is wildcard @@ -16,7 +16,7 @@ set -u RECHOST="${RECMIP:+address=$RECMIP auto-multicast=true}" CAMHOST="${CAMIP:+host=$CAMIP}${CAMMIP:+host=$CAMMIP auto-multicast=true}" -case "$VIDEO" in +case "$VFORMAT" in H264|'') VCAPS=application/x-rtp,media=video,clock-rate=90000,payload=96,encoding-name=H264 VDEC="rtph264depay ! avdec_h264" @@ -31,7 +31,7 @@ case "$VIDEO" in ;; esac -case "$AUDIO" in +case "$AFORMAT" in AMR|'') ACAPS=application/x-rtp,media=audio,clock-rate=8000,encoding-name=AMR,encoding-params=1,octet-align=1 ADEC="rtpamrdepay ! amrnbdec" -- cgit v1.2.3