summaryrefslogtreecommitdiff
path: root/bin/recv-gst-rtp-v-a
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-03-08 01:08:49 +0100
committerJonas Smedegaard <dr@jones.dk>2017-03-08 01:08:49 +0100
commit7a3a28bb6195f8309f87a588320ae109b1b0412c (patch)
treed053662ef54fcc463f6d7bf31c96cabee10b796d /bin/recv-gst-rtp-v-a
parent0e645bd9ddc20e8c57ae71882054d89b6192257b (diff)
Use RAW by default.
Diffstat (limited to 'bin/recv-gst-rtp-v-a')
-rwxr-xr-xbin/recv-gst-rtp-v-a14
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/recv-gst-rtp-v-a b/bin/recv-gst-rtp-v-a
index 3b48d17..d105afe 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
-VFORMAT=${VFORMAT:-$4} # H264 VP8 RAW - default: H264
-AFORMAT=${AFORMAT:-$5} # AMR OPUS RAW - default: AMR
+VFORMAT=${VFORMAT:-$4} # H264 VP8 RAW - default: RAW
+AFORMAT=${AFORMAT:-$5} # AMR OPUS RAW - default: RAW
set -u
# set multicast groups (also for recorder host) if camera host is wildcard
@@ -17,7 +17,7 @@ RECHOST="${RECMIP:+address=$RECMIP auto-multicast=true}"
CAMHOST="${CAMIP:+host=$CAMIP}${CAMMIP:+host=$CAMMIP auto-multicast=true}"
case "$VFORMAT" in
- H264|'')
+ H264)
VCAPS=application/x-rtp,media=video,clock-rate=90000,payload=96,encoding-name=H264
VDEC="rtph264depay ! avdec_h264"
;;
@@ -25,14 +25,14 @@ case "$VFORMAT" in
VCAPS=application/x-rtp,media=video,clock-rate=90000,payload=96,encoding-name=VP8
VDEC="rtpvp8depay ! vp8dec"
;;
- RAW)
- VCAPS=application/x-rtp,media=video,clock-rate=90000,encoding-name=RAW,sampling=YCbCr-4:2:0,depth="(string)8",width="(string)432",height="(string)240",payload=96
+ RAW|'')
+ VCAPS=application/x-rtp,media=video,clock-rate=90000,encoding-name=RAW,sampling=YCbCr-4:2:0,depth="(string)8",width="(string)432",height="(string)240",payload=96,a-framerate=30
VDEC="rtpvrawdepay ! videoconvert ! queue"
;;
esac
case "$AFORMAT" in
- AMR|'')
+ AMR)
ACAPS=application/x-rtp,media=audio,clock-rate=8000,encoding-name=AMR,encoding-params="(string)1",octet-align="(string)1",payload=96
ADEC="rtpamrdepay ! amrnbdec"
;;
@@ -40,7 +40,7 @@ case "$AFORMAT" in
ACAPS=audio/x-raw,rate=48000,channels=1,format=S16LE,layout=interleaved
ADEC="rtpopusdepay ! opusdec"
;;
- RAW)
+ RAW|'')
ACAPS=application/x-rtp,media=audio,clock-rate=44100,encoding-name=L16,encoding-params=1,channels=1,payload=96
ADEC="rtpL16depay"
;;