aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2014-05-27 09:12:43 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 11:44:47 -0400
commitc96fd46afb34a554406bce9784126b96ad09091e (patch)
tree41da27a48407bbd8d8c50d72221ea7f2ad232754 /drivers/media/v4l2-core
parentd52e23813672c3c72f92e7b39c7408d4b9a40a96 (diff)
[media] v4l: Add premultiplied alpha flag for pixel formats
When set, the new V4L2_PIX_FMT_FLAG_PREMUL_ALPHA flag indicates that the pixel values are premultiplied by the alpha channel value. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 2e630005676f..e0bafda89e13 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -256,7 +256,8 @@ static void v4l_print_format(const void *arg, bool write_only)
256 pix = &p->fmt.pix; 256 pix = &p->fmt.pix;
257 pr_cont(", width=%u, height=%u, " 257 pr_cont(", width=%u, height=%u, "
258 "pixelformat=%c%c%c%c, field=%s, " 258 "pixelformat=%c%c%c%c, field=%s, "
259 "bytesperline=%u, sizeimage=%u, colorspace=%d\n", 259 "bytesperline=%u, sizeimage=%u, colorspace=%d, "
260 "flags %u\n",
260 pix->width, pix->height, 261 pix->width, pix->height,
261 (pix->pixelformat & 0xff), 262 (pix->pixelformat & 0xff),
262 (pix->pixelformat >> 8) & 0xff, 263 (pix->pixelformat >> 8) & 0xff,
@@ -264,7 +265,7 @@ static void v4l_print_format(const void *arg, bool write_only)
264 (pix->pixelformat >> 24) & 0xff, 265 (pix->pixelformat >> 24) & 0xff,
265 prt_names(pix->field, v4l2_field_names), 266 prt_names(pix->field, v4l2_field_names),
266 pix->bytesperline, pix->sizeimage, 267 pix->bytesperline, pix->sizeimage,
267 pix->colorspace); 268 pix->colorspace, pix->flags);
268 break; 269 break;
269 case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: 270 case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
270 case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: 271 case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: