ffmpegcolorspace is no more

This commit is contained in:
Wim Taymans 2012-09-14 16:45:34 +02:00
parent 0d8f8a5134
commit b8f913555d
35 changed files with 45 additions and 47 deletions

View file

@ -26,7 +26,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch -v filesrc location=/path/to/mkv ! matroskademux name=d ! queue ! mp3parse ! mad ! audioconvert ! autoaudiosink d. ! queue ! ffdec_h264 ! ffmpegcolorspace ! r. d. ! queue ! "application/x-ass" ! assrender name=r ! ffmpegcolorspace ! autovideosink
* gst-launch -v filesrc location=/path/to/mkv ! matroskademux name=d ! queue ! mp3parse ! mad ! audioconvert ! autoaudiosink d. ! queue ! ffdec_h264 ! videoconvert ! r. d. ! queue ! "application/x-ass" ! assrender name=r ! videoconvert ! autovideosink
* ]| This pipeline demuxes a Matroska file with h.264 video, MP3 audio and embedded ASS subtitles and renders the subtitles on top of the video.
* </refsect2>
*/

View file

@ -20,7 +20,7 @@
/**
* SECTION:element-videoscale
* @see_also: videorate, ffmpegcolorspace
* @see_also: videorate, videoconvert
*
* <refsect2>
* <para>
@ -37,7 +37,7 @@
* <title>Example pipelines</title>
* <para>
* <programlisting>
* gst-launch -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! ffmpegcolorspace ! videoscale ! ximagesink
* gst-launch -v filesrc location=videotestsrc.ogg ! oggdemux ! theoradec ! videoconvert ! videoscale ! ximagesink
* </programlisting>
* Decode an Ogg/Theora and display the video using ximagesink. Since
* ximagesink cannot perform scaling, the video scaling will be performed by

View file

@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch videotestsrc ! ffmpegcolorspace ! videoscale ! gsettingsvideosink
* gst-launch videotestsrc ! videoconvert ! videoscale ! gsettingsvideosink
* ]| Play on configured videosink
* </refsect2>
*/

View file

@ -25,7 +25,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch gsettingsvideosrc ! ffmpegcolorspace ! videoscale ! autovideosink
* gst-launch gsettingsvideosrc ! videoconvert ! videoscale ! autovideosink
* ]| Play from configured videosrc
* </refsect2>
*/

View file

@ -65,9 +65,9 @@
* <programlisting>
* gst-launch \
* filesrc location=video.ogg ! oggdemux name=demux \
* demux. ! queue ! theoradec ! ffmpegcolorspace ! tiger name=tiger \
* demux. ! queue ! theoradec ! videoconvert ! tiger name=tiger \
* demux. ! queue ! kateparse ! tiger. \
* tiger. ! ffmpegcolorspace ! autovideosink
* tiger. ! videoconvert ! autovideosink
* </programlisting>
* </para>
* </refsect2>

View file

@ -51,7 +51,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! edgedetect ! ffmpegcolorspace ! xvimagesink
* gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! edgedetect ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/

View file

@ -51,7 +51,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! faceblur ! ffmpegcolorspace ! xvimagesink
* gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! faceblur ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/

View file

@ -52,7 +52,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch-0.10 videotestsrc ! decodebin ! ffmpegcolorspace ! templatematch template=/path/to/file.jpg ! ffmpegcolorspace ! xvimagesink
* gst-launch-0.10 videotestsrc ! decodebin ! videoconvert ! templatematch template=/path/to/file.jpg ! videoconvert ! xvimagesink
* ]|
* </refsect2>
*/

View file

@ -7,7 +7,7 @@ else
fi
gst-launch rsndvdbin name=dvd "$DEVICE_OPT" \
dvdspu name=spu ! ffmpegcolorspace ! videoscale ! ximagesink force-aspect-ratio=true \
dvdspu name=spu ! videoconvert ! videoscale ! ximagesink force-aspect-ratio=true \
dvd. ! queue max-size-buffers=3 max-size-bytes=0 ! spu.video \
dvd. ! spu.subpicture \
dvd. ! audioconvert ! autoaudiosink

View file

@ -24,7 +24,7 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
* gst-launch filesrc location=image.svg ! rsvgdec ! imagefreeze ! ffmpegcolorspace ! autovideosink
* gst-launch filesrc location=image.svg ! rsvgdec ! imagefreeze ! videoconvert ! autovideosink
* ]| render and show a svg image.
* </refsect2>
*/

View file

@ -45,13 +45,13 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
* gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay location=foo.svg ! ffmpegcolorspace ! autovideosink
* gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay location=foo.svg ! videoconvert ! autovideosink
* ]| specifies the SVG location through the filename property.
* |[
* gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay name=overlay ! ffmpegcolorspace ! autovideosink filesrc location=foo.svg ! image/svg ! overlay.data_sink
* gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay name=overlay ! videoconvert ! autovideosink filesrc location=foo.svg ! image/svg ! overlay.data_sink
* ]| does the same by feeding data through the data_sink pad. You can also specify the SVG data itself as parameter:
* |[
* gst-launch -v videotestsrc ! ffmpegcolorspace ! rsvgoverlay data='&lt;svg viewBox="0 0 800 600"&gt;&lt;image x="80%" y="80%" width="10%" height="10%" xlink:href="foo.jpg" /&gt;&lt;/svg&gt;' ! ffmpegcolorspace ! autovideosink
* gst-launch -v videotestsrc ! videoconvert ! rsvgoverlay data='&lt;svg viewBox="0 0 800 600"&gt;&lt;image x="80%" y="80%" width="10%" height="10%" xlink:href="foo.jpg" /&gt;&lt;/svg&gt;' ! videoconvert ! autovideosink
* ]|
* </refsect2>
*/

View file

@ -27,7 +27,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch -v -m filesrc location=recording.mpeg ! mpegtsdemux ! private/teletext ! teletextdec ! ffmpegcolorspace ! ximagesink
* gst-launch -v -m filesrc location=recording.mpeg ! mpegtsdemux ! private/teletext ! teletextdec ! videoconvert ! ximagesink
* ]|
* </refsect2>
*/

View file

@ -61,10 +61,10 @@
* <refsect2>
* <title>Example launch lines</title>
* |[
* gst-launch -m v4l2src ! ffmpegcolorspace ! zbar ! ffmpegcolorspace ! xvimagesink
* gst-launch -m v4l2src ! videoconvert ! zbar ! videoconvert ! xvimagesink
* ]| This pipeline will detect barcodes and send them as messages.
* |[
* gst-launch -m v4l2src ! tee name=t ! queue ! ffmpegcolorspace ! zbar ! fakesink t. ! queue ! xvimagesink
* gst-launch -m v4l2src ! tee name=t ! queue ! videoconvert ! zbar ! fakesink t. ! queue ! xvimagesink
* ]| Same as above, but running the filter on a branch to keep the display in color
* </refsect2>
*/

View file

@ -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>

View file

@ -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.
*/

View file

@ -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>

View file

@ -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);

View file

@ -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>
*/

View file

@ -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>

View file

@ -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")

View file

@ -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")

View file

@ -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>
*

View file

@ -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.

View file

@ -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

View file

@ -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>
*/

View file

@ -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>
*/

View file

@ -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
* |[

View file

@ -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.

View file

@ -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>
*

View file

@ -95,7 +95,7 @@
* <refsect2>
* <title>Example launch line</title>
* |[
* gst-launch videotestsrc ! videodetect ! ffmpegcolorspace ! ximagesink
* gst-launch videotestsrc ! videodetect ! videoconvert ! ximagesink
* ]|
* </refsect2>
*

View file

@ -119,7 +119,7 @@ enum
static guint _signals[LAST_SIGNAL];
/* Default values */
#define DEFAULT_COLORSPACE_NAME "ffmpegcolorspace"
#define DEFAULT_COLORSPACE_NAME "videoconvert"
#define DEFAULT_JPEG_DECODER_NAME "jpegdec"
#define DEFAULT_NUM_CLOCK_SAMPLES 0
#define DEFAULT_NUM_BUFFERS -1

View file

@ -52,7 +52,7 @@ main (gint argc, gchar * argv[])
queue = gst_element_factory_make ("queue", "queue");
mpeg2dec = gst_element_factory_make ("mpeg2dec", "mpeg2dec");
g_return_val_if_fail (mpeg2dec, -1);
colorspace = gst_element_factory_make ("ffmpegcolorspace", "colorspace");
colorspace = gst_element_factory_make ("videoconvert", "colorspace");
g_return_val_if_fail (colorspace, -1);
videosink = gst_element_factory_make (DEFAULT_VIDEOSINK, "videosink");
g_return_val_if_fail (videosink, -1);

View file

@ -333,7 +333,7 @@ main (int argc, char *argv[])
v_queue = gst_element_factory_make ("queue", "v_queue");
v_scale = gst_element_factory_make ("videoscale", "v_scale");
cs = gst_element_factory_make ("ffmpegcolorspace", "cs");
cs = gst_element_factory_make ("videoconvert", "cs");
v_sink = gst_element_factory_make ("dfbvideosink", "v_sink");
g_object_set (v_sink, "surface", window_surface3, NULL);

View file

@ -104,7 +104,7 @@ setProperty (GstElement * mcells, char *property, char *prop_value, GType type,
}
}
// gst-launch v4l2src ! videoscale ! videorate ! capsfilter "caps=video/x-raw-yuv,width=320,height=240,framerate=10/1" ! ffmpegcolorspace ! motioncells ! ffmpegcolorspace ! xvimagesink
// gst-launch v4l2src ! videoscale ! videorate ! capsfilter "caps=video/x-raw-yuv,width=320,height=240,framerate=10/1" ! videoconvert ! motioncells ! videoconvert ! xvimagesink
int
main (int argc, char *argv[])
{
@ -143,9 +143,9 @@ main (int argc, char *argv[])
decodebin = gst_element_factory_make ("decodebin", "decode");
else
decodebin = NULL;
colorsp0 = gst_element_factory_make ("ffmpegcolorspace", "colorspace0");
colorsp0 = gst_element_factory_make ("videoconvert", "colorspace0");
mcells = gst_element_factory_make ("motioncells", "mcells");
colorsp1 = gst_element_factory_make ("ffmpegcolorspace", "colorspace1");
colorsp1 = gst_element_factory_make ("videoconvert", "colorspace1");
sink = gst_element_factory_make ("xvimagesink", "xv-image-sink");
if (!pipeline || !source || !videor || !videos || !capsf || !colorsp0
|| !mcells || !colorsp1 || !sink) {

View file

@ -1050,7 +1050,7 @@ me_gst_setup_capture_pipeline (const gchar * src_file, const gchar * dest_file,
gst_source = gst_element_factory_make ("v4l2src", NULL);
else
gst_source = gst_element_factory_make ("videotestsrc", NULL);
gst_video_convert = gst_element_factory_make ("ffmpegcolorspace", NULL);
gst_video_convert = gst_element_factory_make ("videoconvert", NULL);
gst_image_enc = gst_element_factory_make ("jpegenc", NULL);
gst_metadata_mux = gst_element_factory_make ("metadatamux", NULL);
gst_file_sink = gst_element_factory_make ("filesink", NULL);
@ -1238,7 +1238,7 @@ me_gst_setup_view_pipeline (const gchar * filename)
else
gst_image_dec = gst_element_factory_make ("jpegdec", NULL);
gst_video_scale = gst_element_factory_make ("videoscale", NULL);
gst_video_convert = gst_element_factory_make ("ffmpegcolorspace", NULL);
gst_video_convert = gst_element_factory_make ("videoconvert", NULL);
gst_video_sink = gst_element_factory_make ("gdkpixbufsink", NULL);
if (gst_video_sink == NULL) {