diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/alsa/gstalsasink.c | 6 | ||||
-rw-r--r-- | ext/alsa/gstalsasrc.c | 2 | ||||
-rw-r--r-- | ext/ogg/gstoggdemux.c | 4 | ||||
-rw-r--r-- | ext/pango/gstbasetextoverlay.c | 49 | ||||
-rw-r--r-- | ext/pango/gstclockoverlay.c | 6 | ||||
-rw-r--r-- | ext/pango/gsttextoverlay.c | 13 | ||||
-rw-r--r-- | ext/pango/gsttextrender.c | 2 | ||||
-rw-r--r-- | ext/pango/gsttimeoverlay.c | 7 | ||||
-rw-r--r-- | ext/theora/gsttheoradec.c | 6 | ||||
-rw-r--r-- | ext/theora/gsttheoraenc.c | 2 | ||||
-rw-r--r-- | ext/theora/gsttheoraparse.c | 4 | ||||
-rw-r--r-- | ext/vorbis/gstvorbisdec.c | 6 | ||||
-rw-r--r-- | ext/vorbis/gstvorbisenc.c | 6 | ||||
-rw-r--r-- | ext/vorbis/gstvorbisparse.c | 4 | ||||
-rw-r--r-- | ext/vorbis/gstvorbistag.c | 4 |
15 files changed, 32 insertions, 89 deletions
diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index 5c6a95899..77fa0a1b9 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -24,13 +24,13 @@ * SECTION:element-alsasink * @see_also: alsasrc * - * This element renders raw audio samples using the ALSA api. + * This element renders raw audio samples using the ALSA audio API. * * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=sine.ogg ! oggdemux ! vorbisdec ! audioconvert ! audioresample ! alsasink - * ]| Play an Ogg/Vorbis file. + * gst-launch-1.0 -v uridecodebin uri=file:///path/to/audio.ogg ! audioconvert ! audioresample ! autoaudiosink + * ]| Play an Ogg/Vorbis file and output audio via ALSA. * </refsect2> */ diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 6d11ba412..0233748b2 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -28,7 +28,7 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v alsasrc ! audioconvert ! vorbisenc ! oggmux ! filesink location=alsasrc.ogg + * gst-launch-1.0 -v alsasrc ! queue ! audioconvert ! vorbisenc ! oggmux ! filesink location=alsasrc.ogg * ]| Record from a sound card using ALSA and encode to Ogg/Vorbis. * </refsect2> */ diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index c6c652f71..05ce495bf 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -28,8 +28,8 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=test.ogg ! oggdemux ! vorbisdec ! audioconvert ! alsasink - * ]| Decodes the vorbis audio stored inside an ogg container. + * gst-launch-1.0 -v filesrc location=test.ogg ! oggdemux ! vorbisdec ! audioconvert ! audioresample ! autoaudiosink + * ]| Decodes a vorbis audio stream stored inside an ogg container and plays it. * </refsect2> */ diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c index b66768d3f..a8d82d0c2 100644 --- a/ext/pango/gstbasetextoverlay.c +++ b/ext/pango/gstbasetextoverlay.c @@ -22,55 +22,6 @@ * Boston, MA 02110-1301, USA. */ -/** - * SECTION:element-textoverlay - * @see_also: #GstTextRender, #GstClockOverlay, #GstTimeOverlay, #GstSubParse - * - * This plugin renders text on top of a video stream. This can be either - * static text or text from buffers received on the text sink pad, e.g. - * as produced by the subparse element. If the text sink pad is not linked, - * the text set via the "text" property will be rendered. If the text sink - * pad is linked, text will be rendered as it is received on that pad, - * honouring and matching the buffer timestamps of both input streams. - * - * The text can contain newline characters and text wrapping is enabled by - * default. - * - * <refsect2> - * <title>Example launch lines</title> - * |[ - * gst-launch -v videotestsrc ! textoverlay text="Room A" valign=top halign=left ! xvimagesink - * ]| Here is a simple pipeline that displays a static text in the top left - * corner of the video picture - * |[ - * gst-launch -v filesrc location=subtitles.srt ! subparse ! txt. videotestsrc ! timeoverlay ! textoverlay name=txt shaded-background=yes ! xvimagesink - * ]| Here is another pipeline that displays subtitles from an .srt subtitle - * file, centered at the bottom of the picture and with a rectangular shading - * around the text in the background: - * <para> - * If you do not have such a subtitle file, create one looking like this - * in a text editor: - * |[ - * 1 - * 00:00:03,000 --> 00:00:05,000 - * Hello? (3-5s) - * - * 2 - * 00:00:08,000 --> 00:00:13,000 - * Yes, this is a subtitle. Don't - * you like it? (8-13s) - * - * 3 - * 00:00:18,826 --> 00:01:02,886 - * Uh? What are you talking about? - * I don't understand (18-62s) - * ]| - * </para> - * </refsect2> - */ - -/* FIXME: alloc segment as part of instance struct */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/ext/pango/gstclockoverlay.c b/ext/pango/gstclockoverlay.c index 8fb1ecf62..e5e177fc6 100644 --- a/ext/pango/gstclockoverlay.c +++ b/ext/pango/gstclockoverlay.c @@ -31,10 +31,10 @@ * <refsect2> * <title>Example launch lines</title> * |[ - * gst-launch -v videotestsrc ! clockoverlay ! xvimagesink - * ]| Display the current time in the top left corner of the video picture + * gst-launch-1.0 -v videotestsrc ! clockoverlay ! autovideosink + * ]| Display the current wall clock time in the top left corner of the video picture * |[ - * gst-launch -v videotestsrc ! clockoverlay halign=right valign=bottom text="Edge City" shaded-background=true ! videoconvert ! ximagesink + * gst-launch-1.0 -v videotestsrc ! clockoverlay halignment=right valignment=bottom text="Edge City" shaded-background=true font-desc="Sans, 36" ! videoconvert ! autovideosink * ]| Another pipeline that displays the current time with some leading * text in the bottom right corner of the video picture, with the background * of the text being shaded in order to make it more legible on top of a diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index 9e3f9dec5..d036579e5 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -40,11 +40,11 @@ * <refsect2> * <title>Example launch lines</title> * |[ - * gst-launch -v videotestsrc ! textoverlay text="Room A" valign=top halign=left ! xvimagesink + * gst-launch-1.0 -v gst-launch-1.0 videotestsrc ! textoverlay text="Room A" valignment=top halignment=left font-desc="Sans, 72" ! autovideosink * ]| Here is a simple pipeline that displays a static text in the top left * corner of the video picture * |[ - * gst-launch -v filesrc location=subtitles.srt ! subparse ! txt. videotestsrc ! timeoverlay ! textoverlay name=txt shaded-background=yes ! xvimagesink + * gst-launch-1.0 -v filesrc location=subtitles.srt ! subparse ! txt. videotestsrc ! timeoverlay ! textoverlay name=txt shaded-background=yes ! autovideosink * ]| Here is another pipeline that displays subtitles from an .srt subtitle * file, centered at the bottom of the picture and with a rectangular shading * around the text in the background: @@ -66,15 +66,6 @@ * Uh? What are you talking about? * I don't understand (18-62s) * ]| - * One can also feed arbitrary live text into the element: - * |[ - * gst-launch fdsrc fd=0 ! text/x-raw,format=utf8 ! txt. videotestsrc ! \ - * textoverlay name=txt shaded-background=yes font-desc="Serif 40" wait-text=false ! \ - * xvimagesink - * ]| This shows new text as entered on the terminal (stdin). This is not suited - * for subtitles as the test overlay is not timed. Subtitles should use - * timestamped formats. For the above use case one can also read the text from - * the application as set the #GstTextOverlay:text property. * </para> * </refsect2> */ diff --git a/ext/pango/gsttextrender.c b/ext/pango/gsttextrender.c index be7df6229..603457ce3 100644 --- a/ext/pango/gsttextrender.c +++ b/ext/pango/gsttextrender.c @@ -34,7 +34,7 @@ * <refsect2> * <title>Example launch lines</title> * |[ - * gst-launch -v filesrc location=subtitles.srt ! subparse ! textrender ! xvimagesink + * gst-launch-1.0 -v filesrc location=subtitles.srt ! subparse ! textrender ! videoconvert ! autovideosink * ]| * </refsect2> */ diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c index 535202fb9..0cedd6674 100644 --- a/ext/pango/gsttimeoverlay.c +++ b/ext/pango/gsttimeoverlay.c @@ -30,11 +30,10 @@ * * <refsect2> * |[ - * gst-launch -v videotestsrc ! timeoverlay ! xvimagesink - * ]| Display the time stamps in the top left - * corner of the video picture. + * gst-launch-1.0 -v videotestsrc ! timeoverlay ! autovideosink + * ]| Display the time stamps in the top left corner of the video picture. * |[ - * gst-launch -v videotestsrc ! timeoverlay halign=right valign=bottom text="Stream time:" shaded-background=true ! xvimagesink + * gst-launch-1.0 -v videotestsrc ! timeoverlay halignment=right valignment=bottom text="Stream time:" shaded-background=true font-desc="Sans, 24" ! autovideosink * ]| Another pipeline that displays the time stamps with some leading * text in the bottom right corner of the video picture, with the background * of the text being shaded in order to make it more legible on top of a diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c index 5adb057c0..fdb8a835b 100644 --- a/ext/theora/gsttheoradec.c +++ b/ext/theora/gsttheoradec.c @@ -32,9 +32,9 @@ * <refsect2> * <title>Example pipeline</title> * |[ - * gst-launch -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! xvimagesink - * ]| This example pipeline will decode an ogg stream and decodes the theora video. Refer to - * the theoraenc example to create the ogg file. + * gst-launch-1.0 -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! videoconvert ! videoscale ! autovideosink + * ]| This example pipeline will decode an ogg stream and decodes the theora video in it. + * Refer to the theoraenc example to create the ogg file. * </refsect2> */ diff --git a/ext/theora/gsttheoraenc.c b/ext/theora/gsttheoraenc.c index 126c5e3d4..f8af35310 100644 --- a/ext/theora/gsttheoraenc.c +++ b/ext/theora/gsttheoraenc.c @@ -45,7 +45,7 @@ * <refsect2> * <title>Example pipeline</title> * |[ - * gst-launch -v videotestsrc num-buffers=1000 ! theoraenc ! oggmux ! filesink location=videotestsrc.ogg + * gst-launch-1.0 -v videotestsrc num-buffers=500 ! video/x-raw,width=1280,height=720 ! queue ! progressreport ! theoraenc ! oggmux ! filesink location=videotestsrc.ogg * ]| This example pipeline will encode a test video source to theora muxed in an * ogg container. Refer to the theoradec documentation to decode the create * stream. diff --git a/ext/theora/gsttheoraparse.c b/ext/theora/gsttheoraparse.c index f3558e80e..5c58644c6 100644 --- a/ext/theora/gsttheoraparse.c +++ b/ext/theora/gsttheoraparse.c @@ -43,11 +43,11 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=video.ogg ! oggdemux ! theoraparse ! fakesink + * gst-launch-1.0 -v filesrc location=video.ogg ! oggdemux ! theoraparse ! fakesink * ]| This pipeline shows that the streamheader is set in the caps, and that each * buffer has the timestamp, duration, offset, and offset_end set. * |[ - * gst-launch filesrc location=video.ogg ! oggdemux ! theoraparse \ + * gst-launch-1.0 filesrc location=video.ogg ! oggdemux ! theoraparse \ * ! oggmux ! filesink location=video-remuxed.ogg * ]| This pipeline shows remuxing. video-remuxed.ogg might not be exactly the same * as video.ogg, but they should produce exactly the same decoded data. diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c index 5741053af..00dc784f0 100644 --- a/ext/vorbis/gstvorbisdec.c +++ b/ext/vorbis/gstvorbisdec.c @@ -24,12 +24,14 @@ * This element decodes a Vorbis stream to raw float audio. * <ulink url="http://www.vorbis.com/">Vorbis</ulink> is a royalty-free * audio codec maintained by the <ulink url="http://www.xiph.org/">Xiph.org - * Foundation</ulink>. + * Foundation</ulink>. As it outputs raw float audio you will often need to + * put an audioconvert element after it. + * * * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=sine.ogg ! oggdemux ! vorbisdec ! audioconvert ! alsasink + * gst-launch-1.0 -v filesrc location=sine.ogg ! oggdemux ! vorbisdec ! audioconvert ! audioresample ! autoaudiosink * ]| Decode an Ogg/Vorbis. To create an Ogg/Vorbis file refer to the documentation of vorbisenc. * </refsect2> */ diff --git a/ext/vorbis/gstvorbisenc.c b/ext/vorbis/gstvorbisenc.c index 8dec47762..7e9f504d9 100644 --- a/ext/vorbis/gstvorbisenc.c +++ b/ext/vorbis/gstvorbisenc.c @@ -29,12 +29,12 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! vorbisenc ! oggmux ! filesink location=sine.ogg + * gst-launch-1.0 -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! vorbisenc ! oggmux ! filesink location=sine.ogg * ]| Encode a test sine signal to Ogg/Vorbis. Note that the resulting file * will be really small because a sine signal compresses very well. * |[ - * gst-launch -v alsasrc ! audioconvert ! vorbisenc ! oggmux ! filesink location=alsasrc.ogg - * ]| Record from a sound card using ALSA and encode to Ogg/Vorbis. + * gst-launch-1.0 -v autoaudiosrc ! audioconvert ! vorbisenc ! oggmux ! filesink location=alsasrc.ogg + * ]| Record from a sound card and encode to Ogg/Vorbis. * </refsect2> */ #ifdef HAVE_CONFIG_H diff --git a/ext/vorbis/gstvorbisparse.c b/ext/vorbis/gstvorbisparse.c index 6cf8510f5..f9f9198f7 100644 --- a/ext/vorbis/gstvorbisparse.c +++ b/ext/vorbis/gstvorbisparse.c @@ -36,11 +36,11 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=sine.ogg ! oggdemux ! vorbisparse ! fakesink + * gst-launch-1.0 -v filesrc location=sine.ogg ! oggdemux ! vorbisparse ! fakesink * ]| This pipeline shows that the streamheader is set in the caps, and that each * buffer has the timestamp, duration, offset, and offset_end set. * |[ - * gst-launch filesrc location=sine.ogg ! oggdemux ! vorbisparse \ + * gst-launch-1.0 filesrc location=sine.ogg ! oggdemux ! vorbisparse \ * ! oggmux ! filesink location=sine-remuxed.ogg * ]| This pipeline shows remuxing. sine-remuxed.ogg might not be exactly the same * as sine.ogg, but they should produce exactly the same decoded data. diff --git a/ext/vorbis/gstvorbistag.c b/ext/vorbis/gstvorbistag.c index fa7af7ac7..fded30cb6 100644 --- a/ext/vorbis/gstvorbistag.c +++ b/ext/vorbis/gstvorbistag.c @@ -37,8 +37,8 @@ * <refsect2> * <title>Example pipelines</title> * |[ - * gst-launch -v filesrc location=foo.ogg ! oggdemux ! vorbistag ! oggmux ! filesink location=bar.ogg - * ]| This element is not useful with gst-launch, because it does not support + * gst-launch-1.0 -v filesrc location=foo.ogg ! oggdemux ! vorbistag ! oggmux ! filesink location=bar.ogg + * ]| This element is not useful with gst-launch-1.0, because it does not support * setting the tags on a #GstTagSetter interface. Conceptually, the element * will usually be used in this order though. * </refsect2> |