summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-30 18:45:17 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-30 18:46:57 +0200
commit1a291a126a8b1ed707ddf394b8aeeee531470f04 (patch)
tree45cadcf6d3577ec879e06a5d351c3da8b7178fe7
parentb1feeee166b316689f1a3020d7ef37146fbf2ef1 (diff)
rtp: Use autoaudio{sink,src} instead of alsa in the examples
-rwxr-xr-xtests/examples/rtp/client-H263p-AMR.sh2
-rwxr-xr-xtests/examples/rtp/client-H263p-PCMA.sh2
-rwxr-xr-xtests/examples/rtp/client-H264-PCMA.sh4
-rwxr-xr-xtests/examples/rtp/client-PCMA.sh4
-rwxr-xr-xtests/examples/rtp/server-alsasrc-PCMA.sh6
-rwxr-xr-xtests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh2
-rwxr-xr-xtests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh6
7 files changed, 13 insertions, 13 deletions
diff --git a/tests/examples/rtp/client-H263p-AMR.sh b/tests/examples/rtp/client-H263p-AMR.sh
index 596477459..216c6b099 100755
--- a/tests/examples/rtp/client-H263p-AMR.sh
+++ b/tests/examples/rtp/client-H263p-AMR.sh
@@ -9,9 +9,9 @@ AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-
gst-launch -v gstrtpbin name=rtpbin latency=100 \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! rtph263pdepay ! ffdec_h263 ! xvimagesink \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
rtpbin.send_rtcp_src_0 ! udpsink port=5005 sync=false async=false \
udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
- rtpbin. ! rtpamrdepay ! amrnbdec ! alsasink slave-method=1 \
+ rtpbin. ! rtpamrdepay ! amrnbdec ! autoaudiosink slave-method=1 \
udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
rtpbin.send_rtcp_src_1 ! udpsink port=5007 sync=false async=false
diff --git a/tests/examples/rtp/client-H263p-PCMA.sh b/tests/examples/rtp/client-H263p-PCMA.sh
index 46dfa5b35..90e6deb72 100755
--- a/tests/examples/rtp/client-H263p-PCMA.sh
+++ b/tests/examples/rtp/client-H263p-PCMA.sh
@@ -14,9 +14,9 @@ LATENCY=100
gst-launch -v gstrtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! rtph263pdepay ! ffdec_h263 ! xvimagesink \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
rtpbin.send_rtcp_src_0 ! udpsink host=$DEST port=5005 sync=false async=false \
udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
- rtpbin. ! rtppcmadepay ! alawdec ! alsasink buffer-time=10000 \
+ rtpbin. ! rtppcmadepay ! alawdec ! autoaudiosink buffer-time=10000 \
udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
rtpbin.send_rtcp_src_1 ! udpsink host=$DEST port=5007 sync=false async=false
diff --git a/tests/examples/rtp/client-H264-PCMA.sh b/tests/examples/rtp/client-H264-PCMA.sh
index ef5e2df4d..061734935 100755
--- a/tests/examples/rtp/client-H264-PCMA.sh
+++ b/tests/examples/rtp/client-H264-PCMA.sh
@@ -18,13 +18,13 @@
# .-------. | | '-------' sync=false
# RTCP |udpsrc | | | async=false
# port=5001 | src->recv_rtcp |
# '-------' | |
# | |
# .-------. | | .---------. .-------. .--------.
-# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |alsasink|
+# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |autoaudiosink|
# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink |
# '-------' | | '---------' '-------' '--------'
# | |
# | | .-------.
# | | |udpsink| RTCP
# | send_rtcp->sink | port=5007
@@ -50,9 +50,9 @@ AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-
gst-launch -v gstrtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! rtph264depay ! ffdec_h264 ! xvimagesink \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
rtpbin.send_rtcp_src_0 ! udpsink port=5005 host=$DEST sync=false async=false \
udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
- rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! alsasink \
+ rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! autoaudiosink \
udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
rtpbin.send_rtcp_src_1 ! udpsink port=5007 host=$DEST sync=false async=false
diff --git a/tests/examples/rtp/client-PCMA.sh b/tests/examples/rtp/client-PCMA.sh
index 702f0c42e..e33839218 100755
--- a/tests/examples/rtp/client-PCMA.sh
+++ b/tests/examples/rtp/client-PCMA.sh
@@ -3,13 +3,13 @@
# A simple RTP receiver
#
# receives alaw encoded RTP audio on port 5002, RTCP is received on port 5003.
# the receiver RTCP reports are sent to port 5007
#
# .-------. .----------. .---------. .-------. .--------.
-# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |alsasink|
+# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |autoaudiosink|
# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink |
# '-------' | | '---------' '-------' '--------'
# | |
# | | .-------.
# | | |udpsink| RTCP
# | send_rtcp->sink | port=5007
@@ -27,9 +27,9 @@ AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-
# is used to send back the RTCP reports of this receiver. If the data is sent
# from another machine, change this address.
DEST=127.0.0.1
gst-launch -v gstrtpbin name=rtpbin \
udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_0 \
- rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! alsasink \
+ rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! autoaudiosink \
udpsrc port=5003 ! rtpbin.recv_rtcp_sink_0 \
rtpbin.send_rtcp_src_0 ! udpsink port=5007 host=$DEST sync=false async=false
diff --git a/tests/examples/rtp/server-alsasrc-PCMA.sh b/tests/examples/rtp/server-alsasrc-PCMA.sh
index 82705bf9c..c0fe0e721 100755
--- a/tests/examples/rtp/server-alsasrc-PCMA.sh
+++ b/tests/examples/rtp/server-alsasrc-PCMA.sh
@@ -1,15 +1,15 @@
#!/bin/sh
#
# A simple RTP server
-# sends the output of alsasrc as alaw encoded RTP on port 5002, RTCP is sent on
+# sends the output of autoaudiosrc as alaw encoded RTP on port 5002, RTCP is sent on
# port 5003. The destination is 127.0.0.1.
# the receiver RTCP reports are received on port 5007
#
# .-------. .-------. .-------. .----------. .-------.
-# |alsasrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
+# |autoaudiosrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002
# '-------' '-------' '-------' | | '-------'
# | |
# | | .-------.
# | | |udpsink| RTCP
# | send_rtcp->sink | port=5003
@@ -18,13 +18,13 @@
# port=5007 | src->recv_rtcp |
# '-------' '----------'
# change this to send the RTP data and RTCP to another host
DEST=127.0.0.1
-#AELEM=alsasrc
+#AELEM=autoaudiosrc
AELEM=audiotestsrc
# PCMA encode from an the source
ASOURCE="$AELEM ! audioconvert"
AENC="alawenc ! rtppcmapay"
diff --git a/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh b/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh
index e9255f6f2..2a8dc5cf5 100755
--- a/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh
+++ b/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh
@@ -15,10 +15,10 @@ DEST=192.168.1.126
gst-launch -v gstrtpbin name=rtpbin \
v4l2src ! $VCAPS ! videorate ! ffmpegcolorspace ! ffenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! queue ! udpsink host=$HOST port=5000 ts-offset=$AOFFSET \
rtpbin.send_rtcp_src_0 ! udpsink host=$HOST port=5001 sync=false async=false \
udpsrc port=5005 ! rtpbin.recv_rtcp_sink_0 \
- alsasrc ! audioconvert ! amrnbenc ! rtpamrpay ! rtpbin.send_rtp_sink_1 \
+ autoaudiosrc ! audioconvert ! amrnbenc ! rtpamrpay ! rtpbin.send_rtp_sink_1 \
rtpbin.send_rtp_src_1 ! queue ! udpsink host=$HOST port=5002 ts-offset=$VOFFSET \
rtpbin.send_rtcp_src_1 ! udpsink host=$HOST port=5003 sync=false async=false \
udpsrc port=5007 ! rtpbin.recv_rtcp_sink_1
diff --git a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
index d42b5126f..75386cc58 100755
--- a/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
+++ b/tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
# A simple RTP server
# sends the output of v4l2src as h264 encoded RTP on port 5000, RTCP is sent on
# port 5001. The destination is 127.0.0.1.
# the video receiver RTCP reports are received on port 5005
-# sends the output of alsasrc as alaw encoded RTP on port 5002, RTCP is sent on
+# sends the output of autoaudiosrc as alaw encoded RTP on port 5002, RTCP is sent on
# port 5003. The destination is 127.0.0.1.
# the receiver RTCP reports are received on port 5007
#
# .-------. .-------. .-------. .----------. .-------.
# |v4lssrc| |h264enc| |h264pay| | rtpbin | |udpsink| RTP
# | src->sink src->sink src->send_rtp send_rtp->sink | port=5000
@@ -19,13 +19,13 @@
# .-------. | | '-------' sync=false
# RTCP |udpsrc | | | async=false
# port=5005 | src->recv_rtcp |
# '-------' | |
# | |
# .-------. .-------. .-------. | | .-------.
-# |alsasrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
+# |autoaudiosrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002
# '-------' '-------' '-------' | | '-------'
# | |
# | | .-------.
# | | |udpsink| RTCP
# | send_rtcp->sink | port=5003
@@ -55,13 +55,13 @@ VENC="x264enc byte-stream=true bitrate=300 ! rtph264pay"
VRTPSINK="udpsink port=5000 host=$DEST ts-offset=$VOFFSET name=vrtpsink"
VRTCPSINK="udpsink port=5001 host=$DEST sync=false async=false name=vrtcpsink"
VRTCPSRC="udpsrc port=5005 name=vrtpsrc"
# PCMA encode from the source
-AELEM="alsasrc"
+AELEM="autoaudiosrc"
#AELEM="audiotestsrc is-live=1"
ASOURCE="$AELEM ! queue ! audioresample ! audioconvert"
AENC="alawenc ! rtppcmapay"
ARTPSINK="udpsink port=5002 host=$DEST ts-offset=$AOFFSET name=artpsink"
ARTCPSINK="udpsink port=5003 host=$DEST sync=false async=false name=artcpsink"