diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-09-14 16:45:34 +0200 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-09-14 16:45:34 +0200 |
commit | b8f913555d75504c0b19bed76d936685182d1b03 (patch) | |
tree | ea81b29f674032601b606e6c36c46a091b99b4a4 /gst | |
parent | 0d8f8a5134c16e6bb4754a2d712a5bcad401e44d (diff) | |
download | gstreamer-plugins-bad-b8f913555d75504c0b19bed76d936685182d1b03.tar.gz |
ffmpegcolorspace is no more
Diffstat (limited to 'gst')
-rw-r--r-- | gst/asfmux/gstasfmux.c | 2 | ||||
-rw-r--r-- | gst/coloreffects/gstchromahold.c | 2 | ||||
-rw-r--r-- | gst/coloreffects/gstcoloreffects.c | 2 | ||||
-rw-r--r-- | gst/faceoverlay/gstfaceoverlay.c | 6 | ||||
-rw-r--r-- | gst/fieldanalysis/gstfieldanalysis.c | 2 | ||||
-rw-r--r-- | gst/freeze/gstfreeze.c | 2 | ||||
-rw-r--r-- | gst/gaudieffects/blur-example.py | 3 | ||||
-rw-r--r-- | gst/gaudieffects/burn-example.py | 3 | ||||
-rw-r--r-- | gst/hls/gsthlsdemux.c | 2 | ||||
-rw-r--r-- | gst/jp2kdecimator/gstjp2kdecimator.c | 2 | ||||
-rw-r--r-- | gst/nuvdemux/gstnuvdemux.c | 2 | ||||
-rw-r--r-- | gst/pnm/gstpnmdec.c | 2 | ||||
-rw-r--r-- | gst/pnm/gstpnmenc.c | 2 | ||||
-rw-r--r-- | gst/scaletempo/gstscaletempo.c | 2 | ||||
-rw-r--r-- | gst/videomeasure/gstvideomeasure_ssim.c | 2 | ||||
-rw-r--r-- | gst/videosignal/gstvideoanalyse.c | 2 | ||||
-rw-r--r-- | gst/videosignal/gstvideodetect.c | 2 |
17 files changed, 19 insertions, 21 deletions
diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c index 2e894c593..0526e3cd7 100644 --- a/gst/asfmux/gstasfmux.c +++ b/gst/asfmux/gstasfmux.c @@ -62,7 +62,7 @@ * |[ * gst-launch udpsrc port=3333 ! "caps_from_rtpasfpay_at_sender" \ * ! rtpasfdepay ! decodebin2 name=d ! queue \ - * ! ffmpegcolorspace ! autovideosink \ + * ! videoconvert ! autovideosink \ * d. ! queue ! audioconvert ! autoaudiosink * ]| * </refsect2> diff --git a/gst/coloreffects/gstchromahold.c b/gst/coloreffects/gstchromahold.c index a2cd5d5cd..cd3d977f4 100644 --- a/gst/coloreffects/gstchromahold.c +++ b/gst/coloreffects/gstchromahold.c @@ -31,7 +31,7 @@ * |[ * gst-launch videotestsrc pattern=smpte75 ! \ * chromahold target-r=0 target-g=0 target-b=255 ! \ - * ffmpegcolorspace ! autovideosink \ + * videoconvert ! autovideosink \ * ]| This pipeline only keeps the red color. */ diff --git a/gst/coloreffects/gstcoloreffects.c b/gst/coloreffects/gstcoloreffects.c index 623a22913..86dd8d891 100644 --- a/gst/coloreffects/gstcoloreffects.c +++ b/gst/coloreffects/gstcoloreffects.c @@ -25,7 +25,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch -v videotestsrc ! coloreffects preset=heat ! ffmpegcolorspace ! + * gst-launch -v videotestsrc ! coloreffects preset=heat ! videoconvert ! * autovideosink * ]| This pipeline shows the effect of coloreffects on a test stream. * </refsect2> diff --git a/gst/faceoverlay/gstfaceoverlay.c b/gst/faceoverlay/gstfaceoverlay.c index ce59b42fb..6ca7e404f 100644 --- a/gst/faceoverlay/gstfaceoverlay.c +++ b/gst/faceoverlay/gstfaceoverlay.c @@ -50,7 +50,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch autovideosrc ! ffmpegcolorspace ! faceoverlay location=/path/to/gnome-video-effects/pixmaps/bow.svg x=-5 y=-15 w=0.3 h=0.1 ! ffmpegcolorspace ! autovideosink + * gst-launch autovideosrc ! videoconvert ! faceoverlay location=/path/to/gnome-video-effects/pixmaps/bow.svg x=-5 y=-15 w=0.3 h=0.1 ! videoconvert ! autovideosink * ]| * </refsect2> */ @@ -108,7 +108,7 @@ gst_face_overlay_create_children (GstFaceOverlay * filter) GstElement *csp, *face_detect, *overlay; GstPad *pad; - csp = gst_element_factory_make ("ffmpegcolorspace", NULL); + csp = gst_element_factory_make ("videoconvert", NULL); face_detect = gst_element_factory_make ("facedetect", NULL); overlay = gst_element_factory_make ("rsvgoverlay", NULL); @@ -141,7 +141,7 @@ missing_element: { /* clean up */ if (csp == NULL) - GST_ERROR_OBJECT (filter, "ffmpegcolorspace element not found"); + GST_ERROR_OBJECT (filter, "videoconvert element not found"); else gst_object_unref (csp); diff --git a/gst/fieldanalysis/gstfieldanalysis.c b/gst/fieldanalysis/gstfieldanalysis.c index 7597c1567..56063f62e 100644 --- a/gst/fieldanalysis/gstfieldanalysis.c +++ b/gst/fieldanalysis/gstfieldanalysis.c @@ -51,7 +51,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch -v uridecodebin uri=/path/to/foo.bar ! fieldanalysis ! deinterlace ! ffmpegcolorspace ! autovideosink + * gst-launch -v uridecodebin uri=/path/to/foo.bar ! fieldanalysis ! deinterlace ! videoconvert ! autovideosink * ]| This pipeline will analyse a video stream with default metrics and thresholds and output progressive frames. * </refsect2> */ diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c index 432a0277e..d101b06d8 100644 --- a/gst/freeze/gstfreeze.c +++ b/gst/freeze/gstfreeze.c @@ -24,7 +24,7 @@ * <title>Example launch line</title> * <para> * |[ - * gst-launch-0.10 filesrc location=gnome-home.png blocksize=4135 ! pngdec ! freeze ! ffmpegcolorspace ! xvimagesink + * gst-launch-0.10 filesrc location=gnome-home.png blocksize=4135 ! pngdec ! freeze ! videoconvert ! xvimagesink * ]| Produces a video stream from one picture. * </para> * </refsect2> diff --git a/gst/gaudieffects/blur-example.py b/gst/gaudieffects/blur-example.py index 63920ec84..db19e8199 100644 --- a/gst/gaudieffects/blur-example.py +++ b/gst/gaudieffects/blur-example.py @@ -5,8 +5,7 @@ import gst p = gst.parse_launch (""" v4l2src ! - ffmpegcolorspace ! queue ! video/x-raw-yuv,width=320,height=240,framerate=30/1 ! gaussianblur qos=true name=vf ! ffmpegcolorspace ! - timeoverlay ! xvimagesink + videoconvert ! queue ! video/x-raw-yuv,width=320,height=240,framerate=30/1 ! gaussianblur qos=true name=vf ! videoconvert ! timeoverlay ! xvimagesink """) m = p.get_by_name ("vf") diff --git a/gst/gaudieffects/burn-example.py b/gst/gaudieffects/burn-example.py index 01080b909..ec1b4a1a0 100644 --- a/gst/gaudieffects/burn-example.py +++ b/gst/gaudieffects/burn-example.py @@ -5,8 +5,7 @@ import gst p = gst.parse_launch (""" v4l2src ! - ffmpegcolorspace ! queue ! video/x-raw-rgb,width=320,height=240,framerate=30/1 ! burn qos=true name=vf ! ffmpegcolorspace ! - timeoverlay ! xvimagesink + videoconvert ! queue ! video/x-raw-rgb,width=320,height=240,framerate=30/1 ! burn qos=true name=vf ! videoconvert ! timeoverlay ! xvimagesink """) m = p.get_by_name ("vf") diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c index 51d4d68af..404edcc9f 100644 --- a/gst/hls/gsthlsdemux.c +++ b/gst/hls/gsthlsdemux.c @@ -30,7 +30,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch souphttpsrc location=http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8 ! hlsdemux ! decodebin2 ! ffmpegcolorspace ! videoscale ! autovideosink + * gst-launch souphttpsrc location=http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8 ! hlsdemux ! decodebin2 ! videoconvert ! videoscale ! autovideosink * ]| * </refsect2> * diff --git a/gst/jp2kdecimator/gstjp2kdecimator.c b/gst/jp2kdecimator/gstjp2kdecimator.c index 9315ac789..99d4446d6 100644 --- a/gst/jp2kdecimator/gstjp2kdecimator.c +++ b/gst/jp2kdecimator/gstjp2kdecimator.c @@ -27,7 +27,7 @@ * |[ * gst-launch -v videotestsrc num-buffers=1 ! jp2kenc ! \ * gstjp2kdecimator max-decomposition-levels=2 ! jp2kdec ! \ - * ffmpegcolorspace ! autovideosink + * videoconvert ! autovideosink * ]| * This pipelines encodes a test image to JPEG2000, only keeps 3 decomposition levels * decodes the decimated image again and shows it on the screen. diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c index b59b8e704..5eecace8c 100644 --- a/gst/nuvdemux/gstnuvdemux.c +++ b/gst/nuvdemux/gstnuvdemux.c @@ -31,7 +31,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch filesrc test.nuv ! nuvdemux name=demux demux.audio_00 ! decodebin ! audioconvert ! audioresample ! autoaudiosink demux.video_00 ! queue ! decodebin ! ffmpegcolorspace ! videoscale ! autovideosink + * gst-launch filesrc test.nuv ! nuvdemux name=demux demux.audio_00 ! decodebin ! audioconvert ! audioresample ! autoaudiosink demux.video_00 ! queue ! decodebin ! videoconvert ! videoscale ! autovideosink * ]| Play (parse and decode) an .nuv file and try to output it to * an automatically detected soundcard and videosink. If the NUV file contains * compressed audio or video data, this will only work if you have the diff --git a/gst/pnm/gstpnmdec.c b/gst/pnm/gstpnmdec.c index 56dcb8e32..ee43f5923 100644 --- a/gst/pnm/gstpnmdec.c +++ b/gst/pnm/gstpnmdec.c @@ -25,7 +25,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch filesrc location=test.pnm ! pnmdec ! ffmpegcolorspace ! autovideosink + * gst-launch filesrc location=test.pnm ! pnmdec ! videoconvert ! autovideosink * ]| The above pipeline reads a pnm file and renders it to the screen. * </refsect2> */ diff --git a/gst/pnm/gstpnmenc.c b/gst/pnm/gstpnmenc.c index 8e623097b..46e9ef43d 100644 --- a/gst/pnm/gstpnmenc.c +++ b/gst/pnm/gstpnmenc.c @@ -27,7 +27,7 @@ * <refsect> * <title>Example launch line</title> * |[ - * gst-launch videotestsrc num_buffers=1 ! ffmpegcolorspace ! "video/x-raw,format=GRAY8" ! pnmenc ascii=true ! filesink location=test.pnm + * gst-launch videotestsrc num_buffers=1 ! videoconvert ! "video/x-raw,format=GRAY8" ! pnmenc ascii=true ! filesink location=test.pnm * ]| The above pipeline writes a test pnm file (ASCII encoding). * </refsect2> */ diff --git a/gst/scaletempo/gstscaletempo.c b/gst/scaletempo/gstscaletempo.c index fa25528a7..a2ec38ee7 100644 --- a/gst/scaletempo/gstscaletempo.c +++ b/gst/scaletempo/gstscaletempo.c @@ -33,7 +33,7 @@ * |[ * filesrc location=media.ext ! decodebin name=d \ * d. ! queue ! audioconvert ! audioresample ! scaletempo ! audioconvert ! audioresample ! autoaudiosink \ - * d. ! queue ! ffmpegcolorspace ! autovideosink + * d. ! queue ! videoconvert ! autovideosink * ]| * OR * |[ diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c index 69533c1b4..3b6941818 100644 --- a/gst/videomeasure/gstvideomeasure_ssim.c +++ b/gst/videomeasure/gstvideomeasure_ssim.c @@ -38,7 +38,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch ssim name=ssim ssim.src0 ! ffmpegcolorspace ! glimagesink filesrc + * gst-launch ssim name=ssim ssim.src0 ! videoconvert ! glimagesink filesrc * location=orig.avi ! decodebin2 ! ssim.original filesrc location=compr.avi ! * decodebin2 ! ssim.modified0 * ]| This pipeline produces a video stream that consists of SSIM frames. diff --git a/gst/videosignal/gstvideoanalyse.c b/gst/videosignal/gstvideoanalyse.c index 7ca6626c2..fc7a04fa2 100644 --- a/gst/videosignal/gstvideoanalyse.c +++ b/gst/videosignal/gstvideoanalyse.c @@ -73,7 +73,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch -m videotestsrc ! videoanalyse ! ffmpegcolorspace ! ximagesink + * gst-launch -m videotestsrc ! videoanalyse ! videoconvert ! ximagesink * ]| This pipeline emits messages to the console for each frame that has been analysed. * </refsect2> * diff --git a/gst/videosignal/gstvideodetect.c b/gst/videosignal/gstvideodetect.c index 09de8b676..7dafd3808 100644 --- a/gst/videosignal/gstvideodetect.c +++ b/gst/videosignal/gstvideodetect.c @@ -95,7 +95,7 @@ * <refsect2> * <title>Example launch line</title> * |[ - * gst-launch videotestsrc ! videodetect ! ffmpegcolorspace ! ximagesink + * gst-launch videotestsrc ! videodetect ! videoconvert ! ximagesink * ]| * </refsect2> * |