diff options
| author | Benjamin Otte <otte@gnome.org> | 2003-11-11 22:40:43 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2003-11-11 22:40:43 +0000 |
| commit | 425a3fef254f7acb7ce9ff7e7596b9c2fcc95adf (patch) | |
| tree | efa887943375b2dd94d7221a607791327b9594b5 | |
| parent | 983e8d120e0413277acce9f5a794ec764cb75651 (diff) | |
| download | gstreamer-plugins-bad-425a3fef254f7acb7ce9ff7e7596b9c2fcc95adf.tar.gz | |
make colorspace handle the original RGB format, too, since it handles both. Add the template caps for the reverse for...
Original commit message from CVS:
make colorspace handle the original RGB format, too, since it handles both. Add the template caps for the reverse format to video.h
| -rw-r--r-- | ext/hermes/gstcolorspace.c | 4 | ||||
| -rw-r--r-- | gst-libs/gst/video/video.h | 62 |
2 files changed, 66 insertions, 0 deletions
diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index 006c7beac..a59ef39d7 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -446,6 +446,10 @@ gst_colorspace_base_init (gpointer g_class) caps = gst_caps_append (caps, gst_caps_new ("csp_templ_rgb24_32", "video/x-raw-rgb", + GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_32_REVERSE)); + caps = gst_caps_append (caps, + gst_caps_new ("csp_templ_rgb24_32", + "video/x-raw-rgb", GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_32)); caps = gst_caps_append (caps, gst_caps_new ("csp_templ_rgb15", diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index dd9ac76fb..3ce2a2e92 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -27,10 +27,18 @@ #define G_MASK_32 0x00ff0000 #define B_MASK_32 0x0000ff00 +#define R_MASK_32_REVERSE 0x000000ff +#define G_MASK_32_REVERSE 0x0000ff00 +#define B_MASK_32_REVERSE 0x00ff0000 + #define R_MASK_24 0xff0000 #define G_MASK_24 0x00ff00 #define B_MASK_24 0x0000ff +#define R_MASK_24_REVERSE 0x0000ff +#define G_MASK_24_REVERSE 0x00ff00 +#define B_MASK_24_REVERSE 0xff0000 + #define R_MASK_16 0xf800 #define G_MASK_16 0x07e0 #define B_MASK_16 0x001f @@ -71,6 +79,34 @@ "framerate", FPS_RANGE, \ NULL) +#define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_32_REVERSE \ + gst_props_new ( \ + "bpp", GST_PROPS_LIST ( \ + GST_PROPS_INT (24), \ + GST_PROPS_INT (32) \ + ), \ + "depth", GST_PROPS_LIST ( \ + GST_PROPS_INT (24), \ + GST_PROPS_INT (32) \ + ), \ + "endianness", GST_PROPS_INT (G_BIG_ENDIAN), \ + "red_mask", GST_PROPS_LIST ( \ + GST_PROPS_INT (R_MASK_32_REVERSE), \ + GST_PROPS_INT (R_MASK_24_REVERSE) \ + ), \ + "green_mask", GST_PROPS_LIST ( \ + GST_PROPS_INT (G_MASK_32_REVERSE), \ + GST_PROPS_INT (G_MASK_24_REVERSE) \ + ), \ + "blue_mask", GST_PROPS_LIST ( \ + GST_PROPS_INT (B_MASK_32_REVERSE), \ + GST_PROPS_INT (B_MASK_24_REVERSE) \ + ), \ + "width", SIZE_RANGE, \ + "height", SIZE_RANGE, \ + "framerate", FPS_RANGE, \ + NULL) + #define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_32 \ gst_props_new ( \ "bpp", GST_PROPS_INT (32), \ @@ -97,6 +133,32 @@ "framerate", FPS_RANGE, \ NULL) +#define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_32_REVERSE \ + gst_props_new ( \ + "bpp", GST_PROPS_INT (32), \ + "depth", GST_PROPS_INT (32), \ + "endianness", GST_PROPS_INT (G_BIG_ENDIAN), \ + "red_mask", GST_PROPS_INT (R_MASK_32_REVERSE), \ + "green_mask", GST_PROPS_INT (G_MASK_32_REVERSE), \ + "blue_mask", GST_PROPS_INT (B_MASK_32_REVERSE), \ + "width", SIZE_RANGE, \ + "height", SIZE_RANGE, \ + "framerate", FPS_RANGE, \ + NULL) + +#define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_24_REVERSE \ + gst_props_new ( \ + "bpp", GST_PROPS_INT (24), \ + "depth", GST_PROPS_INT (24), \ + "endianness", GST_PROPS_INT (G_BIG_ENDIAN), \ + "red_mask", GST_PROPS_INT (R_MASK_24_REVERSE), \ + "green_mask", GST_PROPS_INT (G_MASK_24_REVERSE), \ + "blue_mask", GST_PROPS_INT (B_MASK_24_REVERSE), \ + "width", SIZE_RANGE, \ + "height", SIZE_RANGE, \ + "framerate", FPS_RANGE, \ + NULL) + #define GST_VIDEO_RGB_PAD_TEMPLATE_PROPS_15_16 \ gst_props_new ( \ "bpp", GST_PROPS_INT (16), \ |