diff options
| author | Hans Verkuil | 2015-03-07 18:57:50 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-04-03 01:43:41 +0200 |
| commit | 51f309683510ced24b1b3886f0935a0ab32d1e0b (patch) | |
| tree | ec43e97cfbc7c9a2308863e744351824b85670a1 /drivers/media/platform/vivid/vivid-tpg.c | |
| parent | [media] vivid-tpg: add support for more planar formats (diff) | |
| download | kernel-qcow2-linux-51f309683510ced24b1b3886f0935a0ab32d1e0b.tar.gz kernel-qcow2-linux-51f309683510ced24b1b3886f0935a0ab32d1e0b.tar.xz kernel-qcow2-linux-51f309683510ced24b1b3886f0935a0ab32d1e0b.zip | |
[media] vivid-tpg: add support for V4L2_PIX_FMT_GREY
Add monochrome support to the TPG.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-tpg.c')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-tpg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-tpg.c b/drivers/media/platform/vivid/vivid-tpg.c index 79dc3101eb86..ccb4a6be26c1 100644 --- a/drivers/media/platform/vivid/vivid-tpg.c +++ b/drivers/media/platform/vivid/vivid-tpg.c @@ -199,6 +199,7 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc) case V4L2_PIX_FMT_XBGR32: case V4L2_PIX_FMT_ARGB32: case V4L2_PIX_FMT_ABGR32: + case V4L2_PIX_FMT_GREY: tpg->is_yuv = false; break; case V4L2_PIX_FMT_YUV420M: @@ -279,6 +280,9 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc) case V4L2_PIX_FMT_ABGR32: tpg->twopixelsize[0] = 2 * 4; break; + case V4L2_PIX_FMT_GREY: + tpg->twopixelsize[0] = 2; + break; case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV21: case V4L2_PIX_FMT_NV12M: @@ -598,7 +602,7 @@ static void precalculate_color(struct tpg_data *tpg, int k) g <<= 4; b <<= 4; } - if (tpg->qual == TPG_QUAL_GRAY) { + if (tpg->qual == TPG_QUAL_GRAY || tpg->fourcc == V4L2_PIX_FMT_GREY) { /* Rec. 709 Luma function */ /* (0.2126, 0.7152, 0.0722) * (255 * 256) */ r = g = b = (13879 * r + 46688 * g + 4713 * b) >> 16; @@ -739,6 +743,9 @@ static void gen_twopix(struct tpg_data *tpg, b_v = tpg->colors[color][2]; /* B or precalculated V */ switch (tpg->fourcc) { + case V4L2_PIX_FMT_GREY: + buf[0][offset] = r_y; + break; case V4L2_PIX_FMT_YUV422P: case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_YUV420M: |