summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-07-20 08:07:13 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-07-20 08:08:22 +0200
commit9d9d08622b49306b9c64fe76d200e6533c0c3106 (patch)
treeac8244cafb6ef4d5e7e9a85caaca7260c5c59f34 /ext
parent085f87d85f83659b86e4ab880e389fa934f03962 (diff)
cairorender: Add support for ARGB/BGRA input
Note that videotestsrc outputs 100% transparent video which will result in white output from cairorender.
Diffstat (limited to 'ext')
-rw-r--r--ext/cairo/gstcairorender.c47
1 files changed, 43 insertions, 4 deletions
diff --git a/ext/cairo/gstcairorender.c b/ext/cairo/gstcairorender.c
index 4e329ea4..e86d46a8 100644
--- a/ext/cairo/gstcairorender.c
+++ b/ext/cairo/gstcairorender.c
@@ -137,9 +137,41 @@ gst_cairo_render_chain (GstPad * pad, GstBuffer * buf)
if (c->png) {
GST_BUFFER_OFFSET (buf) = 0;
s = cairo_image_surface_create_from_png_stream (read_buffer, buf);
- } else
+ } else {
+ if (c->format == CAIRO_FORMAT_ARGB32) {
+ guint i, j;
+ guint8 *data = GST_BUFFER_DATA (buf);
+
+ buf = gst_buffer_make_writable (buf);
+
+ /* Cairo ARGB is pre-multiplied with the alpha
+ * value, i.e. 0x80008000 is half transparent
+ * green
+ */
+ for (i = 0; i < c->height; i++) {
+ for (j = 0; j < c->width; j++) {
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+ guint8 alpha = data[3];
+
+ data[0] = (data[0] * alpha) >> 8;
+ data[1] = (data[1] * alpha) >> 8;
+ data[2] = (data[2] * alpha) >> 8;
+#else
+ guint8 alpha = data[0];
+
+ data[1] = (data[1] * alpha) >> 8;
+ data[2] = (data[2] * alpha) >> 8;
+ data[3] = (data[3] * alpha) >> 8;
+#endif
+ data += 4;
+ }
+ }
+ }
+
s = cairo_image_surface_create_for_data (GST_BUFFER_DATA (buf),
c->format, c->width, c->height, c->stride);
+ }
+
success = gst_cairo_render_push_surface (c, s);
gst_buffer_unref (buf);
return success ? GST_FLOW_OK : GST_FLOW_ERROR;
@@ -170,7 +202,14 @@ gst_cairo_render_setcaps_sink (GstPad * pad, GstCaps * caps)
c->format = CAIRO_FORMAT_A8;
c->stride = GST_ROUND_UP_4 (c->width);
} else if (!strcmp (mime, "video/x-raw-rgb")) {
- c->format = CAIRO_FORMAT_RGB24;
+ gint bpp;
+
+ if (!gst_structure_get_int (s, "bpp", &bpp)) {
+ GST_ERROR_OBJECT (c, "Invalid caps");
+ return FALSE;
+ }
+
+ c->format = (bpp == 32) ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
c->stride = 4 * c->width;
} else {
GST_DEBUG_OBJECT (c, "Unknown mime type '%s'.", mime);
@@ -255,9 +294,9 @@ static GstStaticPadTemplate t_src = GST_STATIC_PAD_TEMPLATE ("src",
static GstStaticPadTemplate t_snk = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS (
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- GST_VIDEO_CAPS_BGRx " ; "
+ GST_VIDEO_CAPS_BGRx " ; " GST_VIDEO_CAPS_BGRA " ; "
#else
- GST_VIDEO_CAPS_xRGB " ; "
+ GST_VIDEO_CAPS_xRGB " ; " GST_VIDEO_CAPS_ARGB " ; "
#endif
GST_VIDEO_CAPS_YUV ("Y800") " ; "
"video/x-raw-gray, "