openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: vim2m: don't accept YUYV anymore as output format 

Handling any Y,Cr,Cb formats require some extra logic, as it
handles a group of two pixels. That's easy while we don't do
horizontal scaling.

However, doing horizontal scaling with such formats would require
a lot more code, in order to avoid distortions, as, if it scales
to two non-consecutive points, the logic would need to read 4
points in order to properly convert to RGB.

As this is just a test driver, and we want fast algorithms,
let's just get rid of this format as an output one.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2019-03-01 07:41:24 -05:00
parent 0b390d0c2e
commit 69d68a4e9b
1 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/media/platform/vim2m.c
View File

@ -113,7 +113,7 @@ static struct vim2m_fmt formats[] = {
}, {
.fourcc = V4L2_PIX_FMT_YUYV,
.depth = 16,
.types = MEM2MEM_CAPTURE | MEM2MEM_OUTPUT,
.types = MEM2MEM_CAPTURE,
}, {
.fourcc = V4L2_PIX_FMT_SBGGR8,
.depth = 8,
@ -280,26 +280,6 @@ static void fast_copy_two_pixels(struct vim2m_q_data *q_data_in,
return;
}
/* Copy line at reverse order - YUYV format */
if (q_data_in->fmt->fourcc == V4L2_PIX_FMT_YUYV) {
int u, v, y, y1;
*src -= 2;
y1 = (*src)[0]; /* copy as second point */
u = (*src)[1];
y = (*src)[2]; /* copy as first point */
v = (*src)[3];
*src -= 2;
*(*dst)++ = y;
*(*dst)++ = u;
*(*dst)++ = y1;
*(*dst)++ = v;
return;
}
/* copy RGB formats in reverse order */
memcpy(*dst, *src, depth);
memcpy(*dst + depth, *src - depth, depth);
@ -352,6 +332,7 @@ static void copy_two_pixels(struct vim2m_q_data *q_data_in,
*src += step << 1;
}
break;
default:
case V4L2_PIX_FMT_RGB24:
for (i = 0; i < 2; i++) {
*r++ = (*src)[0];
@ -370,40 +351,6 @@ static void copy_two_pixels(struct vim2m_q_data *q_data_in,
*src += step * 3;
}
break;
default: /* V4L2_PIX_FMT_YUYV */
{
int u, v, y, y1, u1, v1, tmp;
if (reverse) {
*src -= 2;
y1 = (*src)[0]; /* copy as second point */
u = (*src)[1];
y = (*src)[2]; /* copy as first point */
v = (*src)[3];
*src -= 2;
} else {
y = *(*src)++;
u = *(*src)++;
y1 = *(*src)++;
v = *(*src)++;
}
u1 = (((u - 128) << 7) + (u - 128)) >> 6;
tmp = (((u - 128) << 1) + (u - 128) +
((v - 128) << 2) + ((v - 128) << 1)) >> 3;
v1 = (((v - 128) << 1) + (v - 128)) >> 1;
*r++ = CLIP(y + v1);
*g++ = CLIP(y - tmp);
*b++ = CLIP(y + u1);
*r = CLIP(y1 + v1);
*g = CLIP(y1 - tmp);
*b = CLIP(y1 + u1);
break;
}
}
/* Step 2: store two consecutive points, reversing them if needed */