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. --- ext/divx/gstdivxdec.c | 2 +- ext/divx/gstdivxenc.c | 2 +- ext/hermes/gstcolorspace.c | 14 +++++++++----- ext/snapshot/gstsnapshot.c | 4 ++-- ext/swfdec/gstswfdec.c | 2 +- ext/xvid/gstxviddec.c | 5 +++-- ext/xvid/gstxvidenc.c | 5 +++-- 7 files changed, 20 insertions(+), 14 deletions(-) (limited to 'ext') diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index c2cd6324..a61466c7 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.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, YUY2, YV12, UYVY }") + GST_VIDEO_CAPS_YUV ("{ I420, YUY2, YV12, UYVY }") /* FIXME: 15/16/24/32bpp RGB */ ) ); diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c index 823805ad..bf71c317 100644 --- a/ext/divx/gstdivxenc.c +++ b/ext/divx/gstdivxenc.c @@ -40,7 +40,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") + GST_VIDEO_CAPS_YUV ("{ I420, YUY2, YV12, YVYU, UYVY }") /* FIXME: 15/16/24/32bpp RGB */ ) ); diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index 92fa4b49..7c97ff23 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -321,11 +321,15 @@ gst_colorspace_base_init (gpointer g_class) /* create caps for templates */ caps = gst_caps_from_string ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YV12, YUY2 }") "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15 "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16); + GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2 }") "; " + GST_VIDEO_CAPS_RGB "; " + GST_VIDEO_CAPS_BGR "; " + GST_VIDEO_CAPS_xBGR "; " + GST_VIDEO_CAPS_xRGB "; " + GST_VIDEO_CAPS_BGRx "; " + GST_VIDEO_CAPS_RGBx "; " + GST_VIDEO_CAPS_RGB_15 "; " + GST_VIDEO_CAPS_RGB_16); /* build templates */ srctempl = gst_pad_template_new ("src", diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index eff6567a..10d8e3b7 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -41,7 +41,7 @@ GST_STATIC_PAD_TEMPLATE ( "src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2 }")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YUY2 }")) ); static GstStaticPadTemplate snapshot_sink_factory = @@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2 }")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YUY2 }")) ); /* Snapshot signals and args */ diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index a7837ede..b589be8c 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE ( "video_00", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24) + GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB) ); static GstStaticPadTemplate audio_template_factory = diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index 82655f1f..c74b9947 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -54,13 +54,14 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " + GST_VIDEO_CAPS_YUV ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (24, 0x0000ff, 0x00ff00, 0xff0000) "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15_16 + GST_VIDEO_CAPS_RGB_15 "; " + GST_VIDEO_CAPS_RGB_16 ) ); diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c index 72ec9d78..9945f125 100644 --- a/ext/xvid/gstxvidenc.c +++ b/ext/xvid/gstxvidenc.c @@ -42,13 +42,14 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " + GST_VIDEO_CAPS_YUV ("{ I420, YUY2, YV12, YVYU, UYVY }") "; " RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (24, 0x0000ff, 0x00ff00, 0xff0000) "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15_16 + GST_VIDEO_CAPS_RGB_15 "; " + GST_VIDEO_CAPS_RGB_16 ) ); -- cgit v1.2.1