evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] vivid: add support for [A|X]RGB555X

Browse source 
Only RGB555X was supported, add support for the other two variants.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-03-12 05:08:01 -03:00 • committed by Mauro Carvalho Chehab
parent 9e1b73cfed
commit 8f1ff5435d
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/platform/vivid/vivid-tpg.c
View file

@ -197,6 +197,8 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc)
case V4L2_PIX_FMT_XRGB555: case V4L2_PIX_FMT_XRGB555:
case V4L2_PIX_FMT_ARGB555: case V4L2_PIX_FMT_ARGB555:
case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_RGB555X:
case V4L2_PIX_FMT_XRGB555X:
case V4L2_PIX_FMT_ARGB555X:
case V4L2_PIX_FMT_RGB24: case V4L2_PIX_FMT_RGB24:
case V4L2_PIX_FMT_BGR24: case V4L2_PIX_FMT_BGR24:
case V4L2_PIX_FMT_RGB32: case V4L2_PIX_FMT_RGB32:
@ -274,6 +276,8 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc)
case V4L2_PIX_FMT_XRGB555: case V4L2_PIX_FMT_XRGB555:
case V4L2_PIX_FMT_ARGB555: case V4L2_PIX_FMT_ARGB555:
case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_RGB555X:
case V4L2_PIX_FMT_XRGB555X:
case V4L2_PIX_FMT_ARGB555X:
case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_UYVY: case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_YVYU: case V4L2_PIX_FMT_YVYU:
@ -718,6 +722,8 @@ static void precalculate_color(struct tpg_data *tpg, int k)
case V4L2_PIX_FMT_XRGB555: case V4L2_PIX_FMT_XRGB555:
case V4L2_PIX_FMT_ARGB555: case V4L2_PIX_FMT_ARGB555:
case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_RGB555X:
case V4L2_PIX_FMT_XRGB555X:
case V4L2_PIX_FMT_ARGB555X:
r >>= 7; r >>= 7;
g >>= 7; g >>= 7;
b >>= 7; b >>= 7;
@ -885,6 +891,10 @@ static void gen_twopix(struct tpg_data *tpg,
buf[0][offset + 1] = (alpha & 0x80) | (r_y << 2) | (g_u >> 3); buf[0][offset + 1] = (alpha & 0x80) | (r_y << 2) | (g_u >> 3);
break; break;
case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_RGB555X:
case V4L2_PIX_FMT_XRGB555X:
alpha = 0;
/* fall through */
case V4L2_PIX_FMT_ARGB555X:
buf[0][offset] = (alpha & 0x80) | (r_y << 2) | (g_u >> 3); buf[0][offset] = (alpha & 0x80) | (r_y << 2) | (g_u >> 3);
buf[0][offset + 1] = (g_u << 5) | b_v; buf[0][offset + 1] = (g_u << 5) | b_v;
break; break;

18
drivers/media/platform/vivid/vivid-vid-common.c
View file

@ -230,7 +230,23 @@ struct vivid_fmt vivid_formats[] = {
.bit_depth = { 16 }, .bit_depth = { 16 },
.planes = 1, .planes = 1,
.buffers = 1, .buffers = 1,
.can_do_overlay = true, },
{
.name = "XRGB555 (BE)",
.fourcc = V4L2_PIX_FMT_XRGB555X, /* xrrrrrgg gggbbbbb */
.vdownsampling = { 1 },
.bit_depth = { 16 },
.planes = 1,
.buffers = 1,
},
{
.name = "ARGB555 (BE)",
.fourcc = V4L2_PIX_FMT_ARGB555X, /* arrrrrgg gggbbbbb */
.vdownsampling = { 1 },
.bit_depth = { 16 },
.planes = 1,
.buffers = 1,
.alpha_mask = 0x0080,
}, },
{ {
.name = "RGB24 (LE)", .name = "RGB24 (LE)",