summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-02-26 20:24:54 +0100
committerJonas Smedegaard <dr@jones.dk>2017-02-26 20:24:54 +0100
commitc440b749d9c546e904d5a64fccfdbd83bdb0c228 (patch)
tree1ab6a9415e08348c507b4b80b20df5a567749b2b /bin
parent70d11e0d08c9f55f93bdd9368e4e554599b0b731 (diff)
Add audio formats OPUS RAW. Simplify CAPS for formats (video)RAW AMR.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/recv-gst-rtp-v-a14
1 files changed, 11 insertions, 3 deletions
diff --git a/bin/recv-gst-rtp-v-a b/bin/recv-gst-rtp-v-a
index 4839cf5..3b48d17 100755
--- a/bin/recv-gst-rtp-v-a
+++ b/bin/recv-gst-rtp-v-a
@@ -7,7 +7,7 @@ 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 - default: AMR
+AFORMAT=${AFORMAT:-$5} # AMR OPUS RAW - default: AMR
set -u
# set multicast groups (also for recorder host) if camera host is wildcard
@@ -26,16 +26,24 @@ case "$VFORMAT" in
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",colorimetry=BT601-5,payload=96,ssrc="(uint)2753200816",timestamp-offset="(uint)2145434971",seqnum-offset="(uint)15312",a-framerate="(string)30"
+ 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
VDEC="rtpvrawdepay ! videoconvert ! queue"
;;
esac
case "$AFORMAT" in
AMR|'')
- ACAPS=application/x-rtp,media=audio,clock-rate=8000,encoding-name=AMR,encoding-params=1,octet-align=1
+ 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"
;;
+ OPUS)
+ ACAPS=audio/x-raw,rate=48000,channels=1,format=S16LE,layout=interleaved
+ ADEC="rtpopusdepay ! opusdec"
+ ;;
+ RAW)
+ ACAPS=application/x-rtp,media=audio,clock-rate=44100,encoding-name=L16,encoding-params=1,channels=1,payload=96
+ ADEC="rtpL16depay"
+ ;;
esac
stream() {