6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
71 lines
2 KiB
Diff
71 lines
2 KiB
Diff
From 1f1d93391b9662de72187a5a709bacf2d25f6e86 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dsteve@broadcom.com>
|
|
Date: Wed, 12 Feb 2014 15:35:41 +0000
|
|
Subject: [PATCH 171/196] V4L2: Add additional pixel formats. Correct
|
|
colourspace
|
|
|
|
Adds the other flavours of YUYV, and NV12.
|
|
Corrects the overlay advertised colourspace.
|
|
|
|
Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
|
|
---
|
|
drivers/media/platform/bcm2835/bcm2835-camera.c | 36 +++++++++++++++++++++++--
|
|
1 file changed, 34 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
index 8285e6a..3dea993 100644
|
|
--- a/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
+++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
|
|
@@ -114,7 +114,39 @@ static struct mmal_fmt formats[] = {
|
|
.mmal = MMAL_ENCODING_MJPEG,
|
|
.depth = 8,
|
|
.mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
|
|
- }
|
|
+ },
|
|
+ {
|
|
+ .name = "4:2:2, packed, YVYU",
|
|
+ .fourcc = V4L2_PIX_FMT_YVYU,
|
|
+ .flags = 0,
|
|
+ .mmal = MMAL_ENCODING_YVYU,
|
|
+ .depth = 16,
|
|
+ .mmal_component = MMAL_COMPONENT_CAMERA,
|
|
+ },
|
|
+ {
|
|
+ .name = "4:2:2, packed, VYUY",
|
|
+ .fourcc = V4L2_PIX_FMT_VYUY,
|
|
+ .flags = 0,
|
|
+ .mmal = MMAL_ENCODING_VYUY,
|
|
+ .depth = 16,
|
|
+ .mmal_component = MMAL_COMPONENT_CAMERA,
|
|
+ },
|
|
+ {
|
|
+ .name = "4:2:2, packed, UYVY",
|
|
+ .fourcc = V4L2_PIX_FMT_UYVY,
|
|
+ .flags = 0,
|
|
+ .mmal = MMAL_ENCODING_UYVY,
|
|
+ .depth = 16,
|
|
+ .mmal_component = MMAL_COMPONENT_CAMERA,
|
|
+ },
|
|
+ {
|
|
+ .name = "4:2:0, packed, NV12",
|
|
+ .fourcc = V4L2_PIX_FMT_NV12,
|
|
+ .flags = 0,
|
|
+ .mmal = MMAL_ENCODING_NV12,
|
|
+ .depth = 12,
|
|
+ .mmal_component = MMAL_COMPONENT_CAMERA,
|
|
+ },
|
|
};
|
|
|
|
static struct mmal_fmt *get_format(struct v4l2_format *f)
|
|
@@ -691,7 +723,7 @@ static int vidioc_g_fbuf(struct file *file, void *fh,
|
|
a->fmt.bytesperline = (preview_port->es.video.width * 3)>>1;
|
|
a->fmt.sizeimage = (preview_port->es.video.width *
|
|
preview_port->es.video.height * 3)>>1;
|
|
- a->fmt.colorspace = V4L2_COLORSPACE_SMPTE170M;
|
|
+ a->fmt.colorspace = V4L2_COLORSPACE_JPEG;
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
1.9.1
|
|
|