gst-libs/gst/video/video.h: Fix caps template names to be understandable.

Original commit message from CVS:
2004-01-12  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* 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.
This commit is contained in:
Benjamin Otte 2004-01-12 02:01:52 +00:00
parent f4acaab147
commit f768ab94c7
19 changed files with 193 additions and 165 deletions

View file

@ -1,3 +1,45 @@
2004-01-12 Benjamin Otte <in7y118@public.uni-hamburg.de>
* 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.
2004-01-11 Julien MOUTTE <julien@moutte.net> 2004-01-11 Julien MOUTTE <julien@moutte.net>
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_chain): Fixing the * ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_chain): Fixing the

View file

@ -53,7 +53,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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 */ /* FIXME: 15/16/24/32bpp RGB */
) )
); );

View file

@ -40,7 +40,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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 */ /* FIXME: 15/16/24/32bpp RGB */
) )
); );

View file

@ -321,11 +321,15 @@ gst_colorspace_base_init (gpointer g_class)
/* create caps for templates */ /* create caps for templates */
caps = gst_caps_from_string ( caps = gst_caps_from_string (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YV12, YUY2 }") "; " GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2 }") "; "
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE "; " GST_VIDEO_CAPS_RGB "; "
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 "; " GST_VIDEO_CAPS_BGR "; "
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15 "; " GST_VIDEO_CAPS_xBGR "; "
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16); GST_VIDEO_CAPS_xRGB "; "
GST_VIDEO_CAPS_BGRx "; "
GST_VIDEO_CAPS_RGBx "; "
GST_VIDEO_CAPS_RGB_15 "; "
GST_VIDEO_CAPS_RGB_16);
/* build templates */ /* build templates */
srctempl = gst_pad_template_new ("src", srctempl = gst_pad_template_new ("src",

View file

@ -41,7 +41,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate snapshot_sink_factory =
@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink", "sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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 */ /* Snapshot signals and args */

View file

@ -49,7 +49,7 @@ GST_STATIC_PAD_TEMPLATE (
"video_00", "video_00",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate audio_template_factory =

View file

@ -54,13 +54,14 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "
RGB_24_32_STATIC_CAPS (24, 0x0000ff, 0x00ff00, 0xff0000) "; " 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
) )
); );

View file

@ -42,13 +42,14 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; " RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; " RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; " RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "
RGB_24_32_STATIC_CAPS (24, 0x0000ff, 0x00ff00, 0xff0000) "; " 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
) )
); );

View file

@ -23,156 +23,136 @@
#include <gst/gst.h> #include <gst/gst.h>
#define R_MASK_32 "0xff000000" #define GST_VIDEO_BYTE1_MASK_32 "0xFF000000"
#define G_MASK_32 "0x00ff0000" #define GST_VIDEO_BYTE2_MASK_32 "0x00FF0000"
#define B_MASK_32 "0x0000ff00" #define GST_VIDEO_BYTE3_MASK_32 "0x0000FF00"
#define GST_VIDEO_BYTE4_MASK_32 "0x000000FF"
#define R_MASK_32_REVERSE "0x000000ff" #define GST_VIDEO_BYTE1_MASK_24 "0x00FF0000"
#define G_MASK_32_REVERSE "0x0000ff00" #define GST_VIDEO_BYTE2_MASK_24 "0x0000FF00"
#define B_MASK_32_REVERSE "0x00ff0000" #define GST_VIDEO_BYTE3_MASK_24 "0x000000FF"
#define R_MASK_24 "0xff0000" #define GST_VIDEO_BYTE1_MASK_32_INT 0xFF000000
#define G_MASK_24 "0x00ff00" #define GST_VIDEO_BYTE2_MASK_32_INT 0x00FF0000
#define B_MASK_24 "0x0000ff" #define GST_VIDEO_BYTE3_MASK_32_INT 0x0000FF00
#define GST_VIDEO_BYTE4_MASK_32_INT 0x000000FF
#define R_MASK_24_REVERSE "0x0000ff" #define GST_VIDEO_BYTE1_MASK_24_INT 0x00FF0000
#define G_MASK_24_REVERSE "0x00ff00" #define GST_VIDEO_BYTE2_MASK_24_INT 0x0000FF00
#define B_MASK_24_REVERSE "0xff0000" #define GST_VIDEO_BYTE3_MASK_24_INT 0x000000FF
#define R_MASK_16 "0xf800" #define GST_VIDEO_RED_MASK_16 "0xf800"
#define G_MASK_16 "0x07e0" #define GST_VIDEO_GREEN_MASK_16 "0x07e0"
#define B_MASK_16 "0x001f" #define GST_VIDEO_BLUE_MASK_16 "0x001f"
#define R_MASK_15 "0x7c00" #define GST_VIDEO_RED_MASK_15 "0x7c00"
#define G_MASK_15 "0x03e0" #define GST_VIDEO_GREEN_MASK_15 "0x03e0"
#define B_MASK_15 "0x001f" #define GST_VIDEO_BLUE_MASK_15 "0x001f"
#define R_MASK_32_INT 0xff000000 #define GST_VIDEO_RED_MASK_16_INT 0xf800
#define G_MASK_32_INT 0x00ff0000 #define GST_VIDEO_GREEN_MASK_16_INT 0x07e0
#define B_MASK_32_INT 0x0000ff00 #define GST_VIDEO_BLUE_MASK_16_INT 0x001f
#define R_MASK_32_REVERSE_INT 0x000000ff #define GST_VIDEO_RED_MASK_15_INT 0x7c00
#define G_MASK_32_REVERSE_INT 0x0000ff00 #define GST_VIDEO_GREEN_MASK_15_INT 0x03e0
#define B_MASK_32_REVERSE_INT 0x00ff0000 #define GST_VIDEO_BLUE_MASK_15_INT 0x001f
#define R_MASK_24_INT 0xff0000 #define GST_VIDEO_SIZE_RANGE "(int) [ 16, 4096 ]"
#define G_MASK_24_INT 0x00ff00 #define GST_VIDEO_FPS_RANGE "(double) [ 0, max ]"
#define B_MASK_24_INT 0x0000ff
#define R_MASK_24_REVERSE_INT 0x0000ff /* consider the next 2 protected */
#define G_MASK_24_REVERSE_INT 0x00ff00 #define __GST_VIDEO_CAPS_MAKE_32(R, G, B) \
#define B_MASK_24_REVERSE_INT 0xff0000 "video/x-raw-rgb, " \
"bpp = (int) 32, " \
"depth = (int) 24, " \
"endianness = (int) BIG_ENDIAN, " \
"red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", " \
"green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", " \
"blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE
#define R_MASK_16_INT 0xf800 #define __GST_VIDEO_CAPS_MAKE_24(R, G, B) \
#define G_MASK_16_INT 0x07e0 "video/x-raw-rgb, " \
#define B_MASK_16_INT 0x001f "bpp = (int) 24, " \
"depth = (int) 24, " \
"endianness = (int) BIG_ENDIAN, " \
"red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_24 ", " \
"green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_24 ", " \
"blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_24 ", " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE
#define R_MASK_15_INT 0x7c00
#define G_MASK_15_INT 0x03e0
#define B_MASK_15_INT 0x001f
#define SIZE_RANGE "(int) [ 16, 4096 ]" /* 24 bit */
#define FPS_RANGE "(double) [ 0, max ]"
/* properties for pad templates */ #define GST_VIDEO_CAPS_RGB \
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 \ __GST_VIDEO_CAPS_MAKE_24 (1, 2, 3)
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 "; " \
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE \ #define GST_VIDEO_CAPS_BGR \
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32_REVERSE "; " \ __GST_VIDEO_CAPS_MAKE_24 (3, 2, 1)
GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_REVERSE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 \ /* 32 bit */
"video/x-raw-rgb, " \
"bpp = (int) 32, " \
"depth = (int) 24, " \
"endianness = (int) BIG_ENDIAN, " \
"red_mask = (int) " R_MASK_32 ", " \
"green_mask = (int) " G_MASK_32 ", " \
"blue_mask = (int) " B_MASK_32 ", " \
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \
"framerate = " FPS_RANGE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24 \ #define GST_VIDEO_CAPS_RGBx \
"video/x-raw-rgb, " \ __GST_VIDEO_CAPS_MAKE_32 (1, 2, 3)
"bpp = (int) 24, " \
"depth = (int) 24, " \ #define GST_VIDEO_CAPS_xRGB \
"endianness = (int) BIG_ENDIAN, " \ __GST_VIDEO_CAPS_MAKE_32 (2, 3, 4)
"red_mask = (int) " R_MASK_24 ", " \
"green_mask = (int) " G_MASK_24 ", " \ #define GST_VIDEO_CAPS_BGRx \
"blue_mask = (int) " B_MASK_24 ", " \ __GST_VIDEO_CAPS_MAKE_32 (3, 2, 1)
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \ #define GST_VIDEO_CAPS_xBGR \
"framerate = " FPS_RANGE __GST_VIDEO_CAPS_MAKE_32 (4, 3, 2)
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32_REVERSE \ /* note: the macro name uses the order on BE systems */
"video/x-raw-rgb, " \ #if G_BYTE_ORDER == G_BIG_ENDIAN
"bpp = (int) 32, " \ #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \
"depth = (int) 24, " \ GST_VIDEO_CAPS_xRGB
"endianness = (int) BIG_ENDIAN, " \ #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \
"red_mask = (int) " R_MASK_32_REVERSE ", " \ GST_VIDEO_CAPS_BGRx
"green_mask = (int) " G_MASK_32_REVERSE ", " \ #else
"blue_mask = (int) " B_MASK_32_REVERSE ", " \ #define GST_VIDEO_CAPS_xRGB_HOST_ENDIAN \
"width = " SIZE_RANGE ", " \ GST_VIDEO_CAPS_BGRx
"height = " SIZE_RANGE ", " \ #define GST_VIDEO_CAPS_BGRx_HOST_ENDIAN \
"framerate = " FPS_RANGE GST_VIDEO_CAPS_xRGB
#endif
/* 15/16 bit */
#define GST_VIDEO_CAPS_RGB_16 \
"video/x-raw-rgb, " \
"bpp = (int) 16, " \
"depth = (int) 16, " \
"endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " GST_VIDEO_RED_MASK_16 ", " \
"green_mask = (int) " GST_VIDEO_GREEN_MASK_16 ", " \
"blue_mask = (int) " GST_VIDEO_BLUE_MASK_16 ", " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_REVERSE \ #define GST_VIDEO_CAPS_RGB_15 \
"video/x-raw-rgb, " \ "video/x-raw-rgb, " \
"bpp = (int) 24, " \ "bpp = (int) 16, " \
"depth = (int) 24, " \ "depth = (int) 15, " \
"endianness = (int) BIG_ENDIAN, " \ "endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " R_MASK_24_REVERSE ", " \ "red_mask = (int) " GST_VIDEO_RED_MASK_15 ", " \
"green_mask = (int) " G_MASK_24_REVERSE ", " \ "green_mask = (int) " GST_VIDEO_GREEN_MASK_15 ", " \
"blue_mask = (int) " B_MASK_24_REVERSE ", " \ "blue_mask = (int) " GST_VIDEO_BLUE_MASK_15 ", " \
"width = " SIZE_RANGE ", " \ "width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \ "height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " FPS_RANGE "framerate = " GST_VIDEO_FPS_RANGE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15_16 \ #define GST_VIDEO_CAPS_YUV(fourcc) \
"video/x-raw-rgb, " \ "video/x-raw-yuv, " \
"bpp = (int) 16, " \ "format = (fourcc) " fourcc ", " \
"depth = (int) { 15, 16 }, " \ "width = " GST_VIDEO_SIZE_RANGE ", " \
"endianness = (int) BYTE_ORDER, " \ "height = " GST_VIDEO_SIZE_RANGE ", " \
"red_mask = (int) { " R_MASK_15 ", " R_MASK_16 " }, " \ "framerate = " GST_VIDEO_FPS_RANGE
"green_mask = (int) { " G_MASK_15 ", " G_MASK_16 " }, " \
"blue_mask = (int) { " B_MASK_15 ", " B_MASK_16 " }, " \
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \
"framerate = " FPS_RANGE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16 \
"video/x-raw-rgb, " \
"bpp = (int) 16, " \
"depth = (int) 16, " \
"endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " R_MASK_16 ", " \
"green_mask = (int) " G_MASK_16 ", " \
"blue_mask = (int) " B_MASK_16 ", " \
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \
"framerate = " FPS_RANGE
#define GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15 \
"video/x-raw-rgb, " \
"bpp = (int) 16, " \
"depth = (int) 15, " \
"endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " R_MASK_15 ", " \
"green_mask = (int) " G_MASK_15 ", " \
"blue_mask = (int) " B_MASK_15 ", " \
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \
"framerate = " FPS_RANGE
#define GST_VIDEO_YUV_PAD_TEMPLATE_CAPS(fourcc) \
"video/x-raw-yuv, " \
"format = (fourcc) " fourcc ", " \
"width = " SIZE_RANGE ", " \
"height = " SIZE_RANGE ", " \
"framerate = " FPS_RANGE
/* functions */ /* functions */
gdouble gst_video_frame_rate (GstPad *pad); gdouble gst_video_frame_rate (GstPad *pad);

View file

@ -85,7 +85,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate sink_factory =

View file

@ -55,7 +55,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate deinterlace_sink_factory =
@ -63,7 +63,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink", "sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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); static GType gst_deinterlace_get_type (void);

View file

@ -61,7 +61,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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; 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, gst_caps_set_simple (caps,
"width", G_TYPE_INT, flxh->width, "width", G_TYPE_INT, flxh->width,
"height", G_TYPE_INT, flxh->height, "height", G_TYPE_INT, flxh->height,

View file

@ -37,7 +37,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate overlay_sink1_factory =
@ -45,7 +45,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink1", "sink1",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate overlay_sink2_factory =
@ -53,7 +53,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink2", "sink2",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate overlay_sink3_factory =
@ -61,7 +61,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink3", "sink3",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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 */ /* OVERLAY signals and args */

View file

@ -53,7 +53,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") GST_VIDEO_CAPS_YUV("I420")
) )
); );

View file

@ -39,7 +39,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( 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_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420") GST_VIDEO_CAPS_YUV("I420")
) )
); );

View file

@ -85,7 +85,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, 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 = static GstStaticPadTemplate gst_video_crop_sink_template =
@ -93,7 +93,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink", "sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("I420")) GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420"))
); );

View file

@ -50,7 +50,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS( 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_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS( GST_STATIC_CAPS(
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("{ YUY2, I420, YV12, YUYV, UYVY }") GST_VIDEO_CAPS_YUV("{ YUY2, I420, YV12, YUYV, UYVY }")
) )
); );

View file

@ -59,7 +59,7 @@ GST_STATIC_PAD_TEMPLATE (
"sink", "sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, 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); static void gst_y4mencode_base_init (gpointer g_class);

View file

@ -60,7 +60,7 @@ GST_STATIC_PAD_TEMPLATE (
"src", "src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420"))
); );
#define GST_TYPE_AUTOEXP_MODE (gst_autoexp_mode_get_type()) #define GST_TYPE_AUTOEXP_MODE (gst_autoexp_mode_get_type())