Commit 4de69319 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab

[media] coda: add support for planar YCbCr 4:2:2 (YUV422P) format

This patch adds support for the three-plane YUV422P format with one luma plane
and two horizontally subsampled chroma planes.
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1cb12cf3
...@@ -1591,6 +1591,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) ...@@ -1591,6 +1591,7 @@ static void coda_finish_decode(struct coda_ctx *ctx)
struct coda_q_data *q_data_dst; struct coda_q_data *q_data_dst;
struct vb2_buffer *dst_buf; struct vb2_buffer *dst_buf;
struct coda_timestamp *ts; struct coda_timestamp *ts;
unsigned long payload;
int width, height; int width, height;
int decoded_idx; int decoded_idx;
int display_idx; int display_idx;
...@@ -1776,7 +1777,18 @@ static void coda_finish_decode(struct coda_ctx *ctx) ...@@ -1776,7 +1777,18 @@ static void coda_finish_decode(struct coda_ctx *ctx)
dst_buf->v4l2_buf.timecode = ts->timecode; dst_buf->v4l2_buf.timecode = ts->timecode;
dst_buf->v4l2_buf.timestamp = ts->timestamp; dst_buf->v4l2_buf.timestamp = ts->timestamp;
vb2_set_plane_payload(dst_buf, 0, width * height * 3 / 2); switch (q_data_dst->fourcc) {
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YVU420:
case V4L2_PIX_FMT_NV12:
default:
payload = width * height * 3 / 2;
break;
case V4L2_PIX_FMT_YUV422P:
payload = width * height * 2;
break;
}
vb2_set_plane_payload(dst_buf, 0, payload);
v4l2_m2m_buf_done(dst_buf, ctx->frame_errors[display_idx] ? v4l2_m2m_buf_done(dst_buf, ctx->frame_errors[display_idx] ?
VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
......
...@@ -100,6 +100,9 @@ void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data, ...@@ -100,6 +100,9 @@ void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
base_cb = base_y + q_data->bytesperline * q_data->height; base_cb = base_y + q_data->bytesperline * q_data->height;
base_cr = base_cb + q_data->bytesperline * q_data->height / 4; base_cr = base_cb + q_data->bytesperline * q_data->height / 4;
break; break;
case V4L2_PIX_FMT_YUV422P:
base_cb = base_y + q_data->bytesperline * q_data->height;
base_cr = base_cb + q_data->bytesperline * q_data->height / 2;
} }
coda_write(ctx->dev, base_y, reg_y); coda_write(ctx->dev, base_y, reg_y);
...@@ -123,6 +126,10 @@ static const struct coda_fmt coda_formats[] = { ...@@ -123,6 +126,10 @@ static const struct coda_fmt coda_formats[] = {
.name = "YUV 4:2:0 Partial interleaved Y/CbCr", .name = "YUV 4:2:0 Partial interleaved Y/CbCr",
.fourcc = V4L2_PIX_FMT_NV12, .fourcc = V4L2_PIX_FMT_NV12,
}, },
{
.name = "YUV 4:2:2 Planar, YCbCr",
.fourcc = V4L2_PIX_FMT_YUV422P,
},
{ {
.name = "H264 Encoded Stream", .name = "H264 Encoded Stream",
.fourcc = V4L2_PIX_FMT_H264, .fourcc = V4L2_PIX_FMT_H264,
...@@ -168,6 +175,7 @@ static bool coda_format_is_yuv(u32 fourcc) ...@@ -168,6 +175,7 @@ static bool coda_format_is_yuv(u32 fourcc)
case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YVU420: case V4L2_PIX_FMT_YVU420:
case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV12:
case V4L2_PIX_FMT_YUV422P:
return true; return true;
default: default:
return false; return false;
...@@ -393,6 +401,11 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec, ...@@ -393,6 +401,11 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
f->fmt.pix.height * 3 / 2; f->fmt.pix.height * 3 / 2;
break; break;
case V4L2_PIX_FMT_YUV422P:
f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 16);
f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
f->fmt.pix.height * 2;
break;
case V4L2_PIX_FMT_H264: case V4L2_PIX_FMT_H264:
case V4L2_PIX_FMT_MPEG4: case V4L2_PIX_FMT_MPEG4:
case V4L2_PIX_FMT_JPEG: case V4L2_PIX_FMT_JPEG:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment