Commit 3bbbcd26 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

examples: update some element names for 1.0 in RTP examples

gstrtpbin -> rtpbin
ffdec_*   -> avdec_*
ffenc_*   -> avenc_*
parent adb70e89
......@@ -6,13 +6,13 @@
VIDEO_CAPS="application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=(string)H263-1998"
AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-name=(string)AMR,encoding-params=(string)1,octet-align=(string)1"
VIDEO_DEC="rtph263pdepay ! ffdec_h263"
VIDEO_DEC="rtph263pdepay ! avdec_h263"
AUDIO_DEC="rtpamrdepay ! amrnbdec"
VIDEO_SINK="videoconvert ! autovideosink"
AUDIO_SINK="audioconvert ! audioresample ! autoaudiosink"
gst-launch-1.0 -v gstrtpbin name=rtpbin latency=100 \
gst-launch-1.0 -v rtpbin name=rtpbin latency=100 \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $VIDEO_DEC ! $VIDEO_SINK \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -9,7 +9,7 @@ AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-
#DEST=192.168.1.126
DEST=localhost
VIDEO_DEC="rtph263pdepay ! ffdec_h263"
VIDEO_DEC="rtph263pdepay ! avdec_h263"
AUDIO_DEC="rtppcmadepay ! alawdec"
VIDEO_SINK="videoconvert ! autovideosink"
......@@ -17,7 +17,7 @@ AUDIO_SINK="audioconvert ! audioresample ! autoaudiosink"
LATENCY=100
gst-launch-1.0 -v gstrtpbin name=rtpbin latency=$LATENCY \
gst-launch-1.0 -v rtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $VIDEO_DEC ! $VIDEO_SINK \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -8,13 +8,13 @@ VIDEO_CAPS="application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding
#DEST=192.168.1.126
DEST=localhost
VIDEO_DEC="rtph263pdepay ! ffdec_h263"
VIDEO_DEC="rtph263pdepay ! avdec_h263"
VIDEO_SINK="videoconvert ! autovideosink"
LATENCY=100
gst-launch-1.0 -v gstrtpbin name=rtpbin latency=$LATENCY \
gst-launch-1.0 -v rtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $VIDEO_DEC ! $VIDEO_SINK \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -47,13 +47,13 @@ LATENCY=200
VIDEO_CAPS="application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=(string)H264"
AUDIO_CAPS="application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-name=(string)PCMA"
VIDEO_DEC="rtph264depay ! ffdec_h264"
VIDEO_DEC="rtph264depay ! avdec_h264"
AUDIO_DEC="rtppcmadepay ! alawdec"
VIDEO_SINK="videoconvert ! autovideosink"
AUDIO_SINK="audioconvert ! audioresample ! autoaudiosink"
gst-launch-1.0 -v gstrtpbin name=rtpbin latency=$LATENCY \
gst-launch-1.0 -v rtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $VIDEO_DEC ! $VIDEO_SINK \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -24,7 +24,7 @@
# have a mechanism to get this from the sender with a -launch line.
VIDEO_CAPS="application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=(string)H264"
VIDEO_DEC="rtph264depay ! ffdec_h264"
VIDEO_DEC="rtph264depay ! avdec_h264"
VIDEO_SINK="videoconvert ! autovideosink"
......@@ -35,7 +35,7 @@ DEST=127.0.0.1
LATENCY=200
gst-launch-1.0 -v gstrtpbin name=rtpbin latency=$LATENCY \
gst-launch-1.0 -v rtpbin name=rtpbin latency=$LATENCY \
udpsrc caps=$VIDEO_CAPS port=5000 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $VIDEO_DEC ! $VIDEO_SINK \
udpsrc port=5001 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -75,7 +75,7 @@ print_source_stats (GObject * source)
g_free (str);
}
/* will be called when gstrtpbin signals on-ssrc-active. It means that an RTCP
/* will be called when rtpbin signals on-ssrc-active. It means that an RTCP
* packet was received from another source. */
static void
on_ssrc_active_cb (GstElement * rtpbin, guint sessid, guint ssrc,
......@@ -116,7 +116,7 @@ pad_added_cb (GstElement * rtpbin, GstPad * new_pad, GstElement * depay)
/* build a pipeline equivalent to:
*
* gst-launch -v gstrtpbin name=rtpbin \
* gst-launch -v rtpbin name=rtpbin \
* udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_0 \
* rtpbin. ! rtppcmadepay ! alawdec ! audioconvert ! audioresample ! alsasink \
* udpsrc port=5003 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -32,7 +32,7 @@ AUDIO_SINK="audioconvert ! audioresample ! autoaudiosink"
# from another machine, change this address.
DEST=127.0.0.1
gst-launch-1.0 -v gstrtpbin name=rtpbin \
gst-launch-1.0 -v rtpbin name=rtpbin \
udpsrc caps=$AUDIO_CAPS port=5002 ! rtpbin.recv_rtp_sink_0 \
rtpbin. ! $AUDIO_DEC ! $AUDIO_SINK \
udpsrc port=5003 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -5,8 +5,8 @@
VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
gst-launch-1.0 -v gstrtpbin name=rtpbin \
videotestsrc ! $VCAPS ! ffenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \
gst-launch-1.0 -v rtpbin name=rtpbin \
videotestsrc ! $VCAPS ! avenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! udpsink port=5000 \
rtpbin.send_rtcp_src_0 ! udpsink port=5001 sync=false async=false \
udpsrc port=5005 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -32,13 +32,13 @@ AOFFSET=0
VELEM="videotestsrc is-live=1"
VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
VSOURCE="$VELEM ! $VCAPS"
VENC="ffenc_h263p ! rtph263ppay"
VENC="avenc_h263p ! rtph263ppay"
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"
PIPELINE="gstrtpbin name=rtpbin
PIPELINE="rtpbin name=rtpbin
$VSOURCE ! $VENC ! rtpbin.send_rtp_sink_2
rtpbin.send_rtp_src_2 ! $VRTPSINK
rtpbin.send_rtcp_src_2 ! $VRTCPSINK
......
......@@ -28,7 +28,7 @@ AELEM=audiotestsrc
ASOURCE="$AELEM ! audioconvert"
AENC="alawenc ! rtppcmapay"
gst-launch-1.0 -v gstrtpbin name=rtpbin \
gst-launch-1.0 -v rtpbin name=rtpbin \
$ASOURCE ! $AENC ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! udpsink port=5002 host=$DEST \
rtpbin.send_rtcp_src_0 ! udpsink port=5003 host=$DEST sync=false async=false \
......
......@@ -17,7 +17,7 @@ VOFFSET=0
VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
# video and audio encoding and payloading
VENCPAY="ffenc_h263p ! rtph263ppay"
VENCPAY="avenc_h263p ! rtph263ppay"
AENCPAY="amrnbenc ! rtpamrpay"
# video conversion
......@@ -28,7 +28,7 @@ ACONV="audioconvert ! audioresample"
#HOST=192.168.1.126
HOST=127.0.0.1
gst-launch-1.0 -v gstrtpbin name=rtpbin \
gst-launch-1.0 -v rtpbin name=rtpbin \
uridecodebin uri="$1" name=decode \
decode. ! $VCONV ! $VENCPAY ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! queue ! udpsink host=$HOST port=5000 ts-offset=$AOFFSET \
......
......@@ -14,8 +14,8 @@ VCAPS="video/x-raw,width=352,height=288,framerate=15/1"
#DEST=192.168.1.126
DEST=localhost
gst-launch-1.0 -v gstrtpbin name=rtpbin \
v4l2src ! videorate ! videoconvert ! $VCAPS ! ffenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \
gst-launch-1.0 -v rtpbin name=rtpbin \
v4l2src ! videorate ! videoconvert ! $VCAPS ! avenc_h263p ! rtph263ppay ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! queue ! udpsink host=$DEST port=5000 ts-offset=$AOFFSET \
rtpbin.send_rtcp_src_0 ! udpsink host=$DEST port=5001 sync=false async=false \
udpsrc port=5005 ! rtpbin.recv_rtcp_sink_0 \
......
......@@ -67,7 +67,7 @@ ARTPSINK="udpsink port=5002 host=$DEST ts-offset=$AOFFSET name=artpsink"
ARTCPSINK="udpsink port=5003 host=$DEST sync=false async=false name=artcpsink"
ARTCPSRC="udpsrc port=5007 name=artpsrc"
gst-launch-1.0 -v gstrtpbin name=rtpbin \
gst-launch-1.0 -v rtpbin name=rtpbin \
$VSOURCE ! $VENC ! rtpbin.send_rtp_sink_0 \
rtpbin.send_rtp_src_0 ! $VRTPSINK \
rtpbin.send_rtcp_src_0 ! $VRTCPSINK \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment