From f768ab94c7f8fe3aa53ee32499cedd810f1159a4 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 12 Jan 2004 02:01:52 +0000 Subject: gst-libs/gst/video/video.h: Fix caps template names to be understandable. Original commit message from CVS: 2004-01-12 Benjamin Otte * gst-libs/gst/video/video.h: Fix caps template names to be understandable. Prefix everything with GST_VIDEO. * ext/aalib/gstaasink.c: * ext/divx/gstdivxdec.c: * ext/divx/gstdivxenc.c: * ext/gdk_pixbuf/gstgdkpixbuf.c: * ext/hermes/gstcolorspace.c: (gst_colorspace_base_init): * ext/jpeg/gstjpegdec.c: (raw_caps_factory): * ext/jpeg/gstjpegenc.c: (raw_caps_factory): * ext/libcaca/gstcacasink.c: * ext/libpng/gstpngenc.c: (raw_caps_factory): * ext/snapshot/gstsnapshot.c: * ext/swfdec/gstswfdec.c: * ext/xvid/gstxviddec.c: * ext/xvid/gstxvidenc.c: * gst/chart/gstchart.c: * gst/deinterlace/gstdeinterlace.c: * gst/effectv/gsteffectv.c: * gst/flx/gstflxdec.c: (gst_flxdec_loop): * gst/goom/gstgoom.c: * gst/median/gstmedian.c: * gst/monoscope/gstmonoscope.c: (gst_monoscope_init), (gst_monoscope_srcconnect), (gst_monoscope_chain): * gst/overlay/gstoverlay.c: * gst/smooth/gstsmooth.c: * gst/smpte/gstsmpte.c: * gst/synaesthesia/gstsynaesthesia.c: * gst/videocrop/gstvideocrop.c: * gst/videodrop/gstvideodrop.c: * gst/y4m/gsty4mencode.c: * sys/qcam/gstqcamsrc.c: * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_palette_to_caps): Make them work with new video.h file. * sys/ximage/ximagesink.c: (gst_ximagesink_chain), (gst_ximagesink_buffer_free), (gst_ximagesink_buffer_alloc): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain), (gst_xvimagesink_buffer_free), (gst_xvimagesink_buffer_alloc): Make it work with new buffer allocation system. --- gst/chart/gstchart.c | 2 +- gst/deinterlace/gstdeinterlace.c | 4 ++-- gst/flx/gstflxdec.c | 4 ++-- gst/overlay/gstoverlay.c | 8 ++++---- gst/smooth/gstsmooth.c | 4 ++-- gst/smpte/gstsmpte.c | 6 +++--- gst/videocrop/gstvideocrop.c | 4 ++-- gst/videodrop/gstvideodrop.c | 4 ++-- gst/y4m/gsty4mencode.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'gst') diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index 329b672e..cafc1416 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -85,7 +85,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ( GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16) + GST_STATIC_CAPS ( GST_VIDEO_CAPS_RGB_16) ); static GstStaticPadTemplate sink_factory = diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index 605eb3f6..31cc7a9d 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -55,7 +55,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ( GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) + GST_STATIC_CAPS ( GST_VIDEO_CAPS_YUV ("I420")) ); static GstStaticPadTemplate deinterlace_sink_factory = @@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ( GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) + GST_STATIC_CAPS ( GST_VIDEO_CAPS_YUV ("I420")) ); static GType gst_deinterlace_get_type (void); diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index ca893394..a8269ef6 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -61,7 +61,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ( GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 ) + GST_STATIC_CAPS ( GST_VIDEO_CAPS_xRGB_HOST_ENDIAN ) ); @@ -484,7 +484,7 @@ gst_flxdec_loop (GstElement *element) flxdec->frame_time = flxh->speed * GST_MSECOND; } - caps = gst_caps_from_string (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32); + caps = gst_caps_from_string (GST_VIDEO_CAPS_xRGB_HOST_ENDIAN); gst_caps_set_simple (caps, "width", G_TYPE_INT, flxh->width, "height", G_TYPE_INT, flxh->height, diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c index f2c01b3f..fccd88b9 100644 --- a/gst/overlay/gstoverlay.c +++ b/gst/overlay/gstoverlay.c @@ -37,7 +37,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) ); static GstStaticPadTemplate overlay_sink1_factory = @@ -45,7 +45,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink1", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) ); static GstStaticPadTemplate overlay_sink2_factory = @@ -53,7 +53,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink2", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) ); static GstStaticPadTemplate overlay_sink3_factory = @@ -61,7 +61,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink3", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) ); /* OVERLAY signals and args */ diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index 6e38fe86..286786e8 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -53,7 +53,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") + GST_VIDEO_CAPS_YUV("I420") ) ); @@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") + GST_VIDEO_CAPS_YUV("I420") ) ); diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index fffc4caa..ea17dc8c 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -39,7 +39,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") + GST_VIDEO_CAPS_YUV("I420") ) ); @@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") + GST_VIDEO_CAPS_YUV("I420") ) ); @@ -59,7 +59,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") + GST_VIDEO_CAPS_YUV("I420") ) ); diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index ab975a23..6a90b5b3 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -85,7 +85,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) ); static GstStaticPadTemplate gst_video_crop_sink_template = @@ -93,7 +93,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) ); diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c index e3dd45a7..b72e4252 100644 --- a/gst/videodrop/gstvideodrop.c +++ b/gst/videodrop/gstvideodrop.c @@ -50,7 +50,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("{ YUY2, I420, YV12, YUYV, UYVY }") + GST_VIDEO_CAPS_YUV("{ YUY2, I420, YV12, YUYV, UYVY }") ) ); @@ -60,7 +60,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("{ YUY2, I420, YV12, YUYV, UYVY }") + GST_VIDEO_CAPS_YUV("{ YUY2, I420, YV12, YUYV, UYVY }") ) ); diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index f45cf109..d27ff613 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -59,7 +59,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")) ); static void gst_y4mencode_base_init (gpointer g_class); -- cgit v1.2.1