projects / platform / upstream / gst-plugins-good.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1feeee)
rtp: Use autoaudio{sink,src} instead of alsa in the examples
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 30 Sep 2009 16:45:17 +0000 (18:45 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 30 Sep 2009 16:46:57 +0000 (18:46 +0200)
tests/examples/rtp/client-H263p-AMR.sh patch | blob | history
tests/examples/rtp/client-H263p-PCMA.sh patch | blob | history
tests/examples/rtp/client-H264-PCMA.sh patch | blob | history
tests/examples/rtp/client-PCMA.sh patch | blob | history
tests/examples/rtp/server-alsasrc-PCMA.sh patch | blob | history
tests/examples/rtp/server-v4l2-H263p-alsasrc-AMR.sh patch | blob | history
tests/examples/rtp/server-v4l2-H264-alsasrc-PCMA.sh patch | blob | history

diff --git a/tests/examples/rtp/client-H263p-AMR.sh b/tests/examples/rtp/client-H263p-AMR.sh
index 59647745946e4a8b00826e8ec95a5d2e7877e564..216c6b09996bd1456215876fa6e6042619fbd421 100755 (executable)
--- 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 46dfa5b352995b8a4698e93d666543ae3b96709d..90e6deb7269593e256f6ce9cf14623fbc1d0c2bd 100755 (executable)
--- 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 ef5e2df4d95b9514dd8becb52b8868490dad17e5..061734935fafa9fef65b7ba885d4fec2ec3497d3 100755 (executable)
--- 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 702f0c42e29816060f06e853ba970fa38305af07..e338392183b6b59b166f68e6edc5748b0f491ba3 100755 (executable)
--- 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 82705bf9cf615b1186bd4241eef80310ea028727..c0fe0e72155611b25c90f5215e4e2ae50a5b7e14 100755 (executable)
--- 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 e9255f6f2bbaa082532a7dfa2702cf4d7bbca798..2a8dc5cf509f0ac28120b386a0ae9665c1a18425 100755 (executable)
--- 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 d42b5126f2757b803a58f9e92ddc8bca1a9deac8..75386cc58443375bdc77a5ad64f8ec958b8b9f0d 100755 (executable)
--- 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"
Domain: Multimedia / Media Common;