From 1a291a126a8b1ed707ddf394b8aeeee531470f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 30 Sep 2009 18:45:17 +0200 Subject: [PATCH] rtp: Use autoaudio{sink,src} instead of alsa in the examples --- tests/examples/rtp/client-H263p-AMR.sh | 2 +- tests/examples/rtp/client-H263p-PCMA.sh | 2 +- tests/examples/rtp/client-H264-PCMA.sh | 4 ++-- tests/examples/rtp/client-PCMA.sh | 4 ++-- tests/examples/rtp/server-alsasrc-PCMA.sh | 6 +++--- tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh | 2 +- tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh | 6 +++--- 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 5964774594..216c6b0999 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 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 46dfa5b352..90e6deb726 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 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 ef5e2df4d9..061734935f 100755 --- a/tests/examples/rtp/client-H264-PCMA.sh +++ b/tests/examples/rtp/client-H264-PCMA.sh @@ -21,7 +21,7 @@ # '-------' | | # | | # .-------. | | .---------. .-------. .--------. -# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |alsasink| +# RTP |udpsrc | | rtpbin | |pcmadepay| |alawdec| |autoaudiosink| # port=5002 | src->recv_rtp recv_rtp->sink src->sink src->sink | # '-------' | | '---------' '-------' '--------' # | | @@ -53,6 +53,6 @@ gst-launch -v gstrtpbin name=rtpbin latency=$LATENCY 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 702f0c42e2..e338392183 100755 --- a/tests/examples/rtp/client-PCMA.sh +++ b/tests/examples/rtp/client-PCMA.sh @@ -6,7 +6,7 @@ # 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 | # '-------' | | '---------' '-------' '--------' # | | @@ -30,6 +30,6 @@ 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 82705bf9cf..c0fe0e7215 100755 --- a/tests/examples/rtp/server-alsasrc-PCMA.sh +++ b/tests/examples/rtp/server-alsasrc-PCMA.sh @@ -1,12 +1,12 @@ #!/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 # '-------' '-------' '-------' | | '-------' # | | @@ -21,7 +21,7 @@ # 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 diff --git a/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh b/tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh index e9255f6f2b..2a8dc5cf50 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 \ 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 d42b5126f2..75386cc584 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 @@ # 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 # @@ -22,7 +22,7 @@ # '-------' | | # | | # .-------. .-------. .-------. | | .-------. -# |alsasrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP +# |autoaudiosrc| |alawenc| |pcmapay| | rtpbin | |udpsink| RTP # | src->sink src->sink src->send_rtp send_rtp->sink | port=5002 # '-------' '-------' '-------' | | '-------' # | | @@ -58,7 +58,7 @@ 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"