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
@@ -12,6 +12,6 @@ gst-launch -v gstrtpbin name=rtpbin latency=100
12 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \ 12 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
13 rtpbin.send_rtcp_src_0 ! udpsink port=5005 sync=false async=false \ 13 rtpbin.send_rtcp_src_0 ! udpsink port=5005 sync=false async=false \
14 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \ 14 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
15 rtpbin. ! rtpamrdepay ! amrnbdec ! alsasink slave-method=1 \ 15 rtpbin. ! rtpamrdepay ! amrnbdec ! autoaudiosink slave-method=1 \
16 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \ 16 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
17 rtpbin.send_rtcp_src_1 ! udpsink port=5007 sync=false async=false 17 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
@@ -17,6 +17,6 @@ gst-launch -v gstrtpbin name=rtpbin latency=$LATENCY
17 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \ 17 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
18 rtpbin.send_rtcp_src_0 ! udpsink host=$DEST port=5005 sync=false async=false \ 18 rtpbin.send_rtcp_src_0 ! udpsink host=$DEST port=5005 sync=false async=false \
19 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \ 19 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
20 rtpbin. ! rtppcmadepay ! alawdec ! alsasink buffer-time=10000 \ 20 rtpbin. ! rtppcmadepay ! alawdec ! autoaudiosink buffer-time=10000 \
21 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \ 21 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
22 rtpbin.send_rtcp_src_1 ! udpsink host=$DEST port=5007 sync=false async=false 22 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
@@ -21,7 +21,7 @@
21# '-------' | | 21# '-------' | |
22# | | 22# | |
23# .-------. | | .---------. .-------. .--------. 23# .-------. | | .---------. .-------. .--------.
24# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |alsasink| 24# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |autoaudiosink|
25# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink | 25# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink |
26# '-------' | | '---------' '-------' '--------' 26# '-------' | | '---------' '-------' '--------'
27# | | 27# | |
@@ -53,6 +53,6 @@ gst-launch -v gstrtpbin name=rtpbin latency=$LATENCY
53 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \ 53 udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
54 rtpbin.send_rtcp_src_0 ! udpsink port=5005 host=$DEST sync=false async=false \ 54 rtpbin.send_rtcp_src_0 ! udpsink port=5005 host=$DEST sync=false async=false \
55 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \ 55 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_1 \
56 rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! alsasink \ 56 rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! autoaudiosink \
57 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \ 57 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_1 \
58 rtpbin.send_rtcp_src_1 ! udpsink port=5007 host=$DEST sync=false async=false 58 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
@@ -6,7 +6,7 @@
6# the receiver RTCP reports are sent to port 5007 6# the receiver RTCP reports are sent to port 5007
7# 7#
8# .-------. .----------. .---------. .-------. .--------. 8# .-------. .----------. .---------. .-------. .--------.
9# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |alsasink| 9# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |autoaudiosink|
10# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink | 10# port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink |
11# '-------' | | '---------' '-------' '--------' 11# '-------' | | '---------' '-------' '--------'
12# | | 12# | |
@@ -30,6 +30,6 @@ DEST=127.0.0.1
30 30
31gst-launch -v gstrtpbin name=rtpbin \ 31gst-launch -v gstrtpbin name=rtpbin \
32 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_0 \ 32 udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_0 \
33 rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! alsasink \ 33 rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! autoaudiosink \
34 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_0 \ 34 udpsrc port=5003 ! rtpbin.recv_rtcp_sink_0 \
35 rtpbin.send_rtcp_src_0 ! udpsink port=5007 host=$DEST sync=false async=false 35 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,12 +1,12 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# A simple RTP server 3# A simple RTP server
4# sends the output of alsasrc as alaw encoded RTP on port 5002, RTCP is sent on 4# sends the output of autoaudiosrc as alaw encoded RTP on port 5002, RTCP is sent on
5# port 5003. The destination is 127.0.0.1. 5# port 5003. The destination is 127.0.0.1.
6# the receiver RTCP reports are received on port 5007 6# the receiver RTCP reports are received on port 5007
7# 7#
8# .-------. .-------. .-------. .----------. .-------. 8# .-------. .-------. .-------. .----------. .-------.
9# |alsasrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP 9# |autoaudiosrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
10# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002 10# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002
11# '-------' '-------' '-------' | | '-------' 11# '-------' '-------' '-------' | | '-------'
12# | | 12# | |
@@ -21,7 +21,7 @@
21# change this to send the RTP data and RTCP to another host 21# change this to send the RTP data and RTCP to another host
22DEST=127.0.0.1 22DEST=127.0.0.1
23 23
24#AELEM=alsasrc 24#AELEM=autoaudiosrc
25AELEM=audiotestsrc 25AELEM=audiotestsrc
26 26
27# PCMA encode from an the source 27# PCMA encode from an the source
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
@@ -18,7 +18,7 @@ gst-launch -v gstrtpbin name=rtpbin \
18 rtpbin.send_rtp_src_0 ! queue ! udpsink host=$HOST port=5000 ts-offset=$AOFFSET \ 18 rtpbin.send_rtp_src_0 ! queue ! udpsink host=$HOST port=5000 ts-offset=$AOFFSET \
19 rtpbin.send_rtcp_src_0 ! udpsink host=$HOST port=5001 sync=false async=false \ 19 rtpbin.send_rtcp_src_0 ! udpsink host=$HOST port=5001 sync=false async=false \
20 udpsrc port=5005 ! rtpbin.recv_rtcp_sink_0 \ 20 udpsrc port=5005 ! rtpbin.recv_rtcp_sink_0 \
21 alsasrc ! audioconvert ! amrnbenc ! rtpamrpay ! rtpbin.send_rtp_sink_1 \ 21 autoaudiosrc ! audioconvert ! amrnbenc ! rtpamrpay ! rtpbin.send_rtp_sink_1 \
22 rtpbin.send_rtp_src_1 ! queue ! udpsink host=$HOST port=5002 ts-offset=$VOFFSET \ 22 rtpbin.send_rtp_src_1 ! queue ! udpsink host=$HOST port=5002 ts-offset=$VOFFSET \
23 rtpbin.send_rtcp_src_1 ! udpsink host=$HOST port=5003 sync=false async=false \ 23 rtpbin.send_rtcp_src_1 ! udpsink host=$HOST port=5003 sync=false async=false \
24 udpsrc port=5007 ! rtpbin.recv_rtcp_sink_1 24 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
@@ -4,7 +4,7 @@
4# sends the output of v4l2src as h264 encoded RTP on port 5000, RTCP is sent on 4# sends the output of v4l2src as h264 encoded RTP on port 5000, RTCP is sent on
5# port 5001. The destination is 127.0.0.1. 5# port 5001. The destination is 127.0.0.1.
6# the video receiver RTCP reports are received on port 5005 6# the video receiver RTCP reports are received on port 5005
7# sends the output of alsasrc as alaw encoded RTP on port 5002, RTCP is sent on 7# sends the output of autoaudiosrc as alaw encoded RTP on port 5002, RTCP is sent on
8# port 5003. The destination is 127.0.0.1. 8# port 5003. The destination is 127.0.0.1.
9# the receiver RTCP reports are received on port 5007 9# the receiver RTCP reports are received on port 5007
10# 10#
@@ -22,7 +22,7 @@
22# '-------' | | 22# '-------' | |
23# | | 23# | |
24# .-------. .-------. .-------. | | .-------. 24# .-------. .-------. .-------. | | .-------.
25# |alsasrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP 25# |autoaudiosrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP
26# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002 26# | src->sink src->sink src->send_rtp send_rtp->sink | port=5002
27# '-------' '-------' '-------' | | '-------' 27# '-------' '-------' '-------' | | '-------'
28# | | 28# | |
@@ -58,7 +58,7 @@ VRTCPSINK="udpsink port=5001 host=$DEST sync=false async=false name=vrtcpsink"
58VRTCPSRC="udpsrc port=5005 name=vrtpsrc" 58VRTCPSRC="udpsrc port=5005 name=vrtpsrc"
59 59
60# PCMA encode from the source 60# PCMA encode from the source
61AELEM="alsasrc" 61AELEM="autoaudiosrc"
62#AELEM="audiotestsrc is-live=1" 62#AELEM="audiotestsrc is-live=1"
63ASOURCE="$AELEM ! queue ! audioresample ! audioconvert" 63ASOURCE="$AELEM ! queue ! audioresample ! audioconvert"
64AENC="alawenc ! rtppcmapay" 64AENC="alawenc ! rtppcmapay"