From c81a2d1c6cf1e26c3722c324846a435dd4cdcb08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 10 Aug 2014 18:07:28 +0100 Subject: [PATCH] opengl: update element docs for 1.x --- ext/gl/gstglcolorscale.c | 6 +++--- ext/gl/gstglfiltercube.c | 6 +++--- ext/gl/gstglfilterglass.c | 4 ++-- ext/gl/gstglimagesink.c | 8 ++++---- ext/gl/gstglmosaic.c | 7 ++++++- ext/gl/gstgloverlay.c | 2 +- ext/gl/gstglvideomixer.c | 8 +++++++- 7 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ext/gl/gstglcolorscale.c b/ext/gl/gstglcolorscale.c index e56da5b..4ec29b5 100644 --- a/ext/gl/gstglcolorscale.c +++ b/ext/gl/gstglcolorscale.c @@ -32,12 +32,12 @@ * * Examples * |[ - * gst-launch -v videotestsrc ! "video/x-raw-yuv" ! glcolorscale ! ximagesink + * gst-launch-1.0 -v videotestsrc ! video/x-raw ! glcolorscale ! ximagesink * ]| A pipeline to test colorspace conversion. * FBO is required. |[ - * gst-launch -v videotestsrc ! "video/x-raw-yuv, width=640, height=480, format=(fourcc)AYUV" ! glcolorscale ! \ - * "video/x-raw-yuv, width=320, height=240, format=(fourcc)YV12" ! autovideosink + * gst-launch-1.0 -v videotestsrc ! video/x-raw, width=640, height=480, format=AYUV ! glcolorscale ! \ + * video/x-raw, width=320, height=240, format=YV12 ! videoconvert ! autovideosink * ]| A pipeline to test hardware scaling and colorspace conversion. * FBO and GLSL are required. * diff --git a/ext/gl/gstglfiltercube.c b/ext/gl/gstglfiltercube.c index 35bf677..0eadac2 100644 --- a/ext/gl/gstglfiltercube.c +++ b/ext/gl/gstglfiltercube.c @@ -26,15 +26,15 @@ * * Examples * |[ - * gst-launch -v videotestsrc ! glupload ! glfiltercube ! glimagesink + * gst-launch-1.0 -v videotestsrc ! glfiltercube ! glimagesink * ]| A pipeline to mpa textures on the 6 cube faces.. * FBO is required. * |[ - * gst-launch -v videotestsrc ! glupload ! glfiltercube ! video/x-raw-gl, width=640, height=480 ! glimagesink + * gst-launch-1.0 -v videotestsrc ! glfiltercube ! video/x-raw, width=640, height=480 ! glimagesink * ]| Resize scene after drawing the cube. * The scene size is greater than the input video size. |[ - * gst-launch -v videotestsrc ! glupload ! video/x-raw-gl, width=640, height=480 ! glfiltercube ! glimagesink + * gst-launch-1.0 -v videotestsrc ! video/x-raw, width=640, height=480 ! glfiltercube ! glimagesink * ]| Resize scene before drawing the cube. * The scene size is greater than the input video size. * diff --git a/ext/gl/gstglfilterglass.c b/ext/gl/gstglfilterglass.c index 4b26552..d45b8e2 100644 --- a/ext/gl/gstglfilterglass.c +++ b/ext/gl/gstglfilterglass.c @@ -27,11 +27,11 @@ * * Examples * |[ - * gst-launch -v videotestsrc ! glupload ! glfilterglass ! glimagesink + * gst-launch-1.0 -v videotestsrc ! glfilterglass ! glimagesink * ]| A pipeline inspired from http://www.mdk.org.pl/2007/11/17/gl-colorspace-conversions * FBO is required. * |[ - * gst-launch -v videotestsrc ! glupload ! glfilterglass ! "video/x-raw-gl, width=640, height=480" ! glimagesink + * gst-launch-1.0 -v videotestsrc ! glfilterglass ! video/x-raw, width=640, height=480 ! glimagesink * ]| The scene is greater than the input size. * */ diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index ba6c138..165c892 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -56,12 +56,12 @@ * * Examples * |[ - * gst-launch -v videotestsrc ! "video/x-raw-rgb" ! glimagesink + * gst-launch-1.0 -v videotestsrc ! video/x-raw ! glimagesink * ]| A pipeline to test hardware scaling. * No special opengl extension is used in this pipeline, that's why it should work * with OpenGL >= 1.1. That's the case if you are using the MESA3D driver v1.3. * |[ - * gst-launch -v videotestsrc ! "video/x-raw-yuv, format=(fourcc)I420" ! glimagesink + * gst-launch-1.0 -v videotestsrc ! video/x-raw,format=I420 ! glimagesink * ]| A pipeline to test hardware scaling and hardware colorspace conversion. * When your driver supports GLSL (OpenGL Shading Language needs OpenGL >= 2.1), * the 4 following format YUY2, UYVY, I420, YV12 and AYUV are converted to RGB32 @@ -70,12 +70,12 @@ * the you can use YUY2 and UYVY. In this case the colorspace conversion is automatically * made when loading the texture and therefore no framebuffer is used. * |[ - * gst-launch -v gltestsrc ! glimagesink + * gst-launch-1.0 -v gltestsrc ! glimagesink * ]| A pipeline 100% OpenGL. * No special opengl extension is used in this pipeline, that's why it should work * with OpenGL >= 1.1. That's the case if you are using the MESA3D driver v1.3. * |[ - * gst-plugins-gl/tests/examples/generic/cube + * gst-plugins-bas/tests/examples/gl/generic/cube * ]| The graphic FPS scene can be greater than the input video FPS. * The graphic scene can be written from a client code through the * two glfilterapp properties. diff --git a/ext/gl/gstglmosaic.c b/ext/gl/gstglmosaic.c index 5a5c418..1274a3d 100644 --- a/ext/gl/gstglmosaic.c +++ b/ext/gl/gstglmosaic.c @@ -29,7 +29,12 @@ * * Examples * |[ - * gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YUY2" ! glupload ! queue ! glmosaic name=m ! glimagesink videotestsrc pattern=12 ! "video/x-raw-yuv, format=(fourcc)I420, framerate=(fraction)5/1, width=100, height=200" ! glupload ! queue ! m. videotestsrc ! "video/x-raw-rgb, framerate=(fraction)15/1, width=1500, height=1500" ! glupload ! gleffects effect=3 ! queue ! m. videotestsrc ! glupload ! gleffects effect=2 ! queue ! m. videotestsrc ! glupload ! glfiltercube ! queue ! m. videotestsrc ! glupload ! gleffects effect=6 ! queue ! m. + * gst-launch-1.0 videotestsrc ! video/x-raw, format=YUY2 ! queue ! glmosaic name=m ! glimagesink \ + * videotestsrc pattern=12 ! video/x-raw, format=I420, framerate=5/1, width=100, height=200 ! queue ! m. \ + * videotestsrc ! video/x-raw, framerate=15/1, width=1500, height=1500 ! gleffects effect=3 ! queue ! m. \ + * videotestsrc ! gleffects effect=2 ! queue ! m. \ + * videotestsrc ! glfiltercube ! queue ! m. \ + * videotestsrc ! gleffects effect=6 ! queue ! m. * ]| * FBO (Frame Buffer Object) is required. * diff --git a/ext/gl/gstgloverlay.c b/ext/gl/gstgloverlay.c index ba108a9..5a75458 100644 --- a/ext/gl/gstgloverlay.c +++ b/ext/gl/gstgloverlay.c @@ -26,7 +26,7 @@ * * Examples * |[ - * gst-launch videotestsrc ! "video/x-raw-rgb" ! glupload ! gloverlay location=imagefile ! glimagesink + * gst-launch-1.0 videotestsrc ! gloverlay location=image.jpg ! glimagesink * ]| * FBO (Frame Buffer Object) is required. * diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c index 2564887..18b7b20 100644 --- a/ext/gl/gstglvideomixer.c +++ b/ext/gl/gstglvideomixer.c @@ -29,7 +29,13 @@ * * Examples * |[ - * gst-launch-0.10 videotestsrc ! "video/x-raw-yuv, format=(fourcc)YUY2" ! glupload ! queue ! glvideomixer name=m ! glimagesink videotestsrc pattern=12 ! "video/x-raw-yuv, format=(fourcc)I420, framerate=(fraction)5/1, width=100, height=200" ! glupload ! queue ! m. videotestsrc ! "video/x-raw-rgb, framerate=(fraction)15/1, width=1500, height=1500" ! glupload ! gleffects effect=3 ! queue ! m. videotestsrc ! glupload ! gleffects effect=2 ! queue ! m. videotestsrc ! glupload ! glfiltercube ! queue ! m. videotestsrc ! glupload ! gleffects effect=6 ! queue ! m. + * gst-launch-1.0 glvideomixer name=m ! glimagesink \ + * videotestsrc ! video/x-raw, format=YUY2 ! m. \ + * videotestsrc pattern=12 ! video/x-raw, format=I420, framerate=5/1, width=100, height=200 ! queue ! m. \ + * videotestsrc ! video/x-raw, format=RGB, framerate=15/1, width=1500, height=1500 ! gleffects effect=3 ! queue ! m. \ + * videotestsrc ! gleffects effect=2 ! queue ! m. \ + * videotestsrc ! glfiltercube ! queue ! m. \ + * videotestsrc ! gleffects effect=6 ! queue ! m. * ]| * FBO (Frame Buffer Object) is required. * -- 2.7.4