redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] vcodec: mediatek: Add g/s_selection support for V4L2 Encoder 

This patch add g/s_selection for MT8173 V4L2 Encoder.
Only output queue support g/s_selection to configure crop.
The top/left of active rectangle should always be (0,0)

Signed-off-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
hifive-unleashed-5.1
Tiffany Lin 2016-08-14 23:15:33 -03:00 committed by Mauro Carvalho Chehab
parent 43c784aab7
commit 3a549beef9
1 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
View File

@ -631,6 +631,69 @@ static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
return vidioc_try_fmt(f, fmt);
}
static int vidioc_venc_g_selection(struct file *file, void *priv,
struct v4l2_selection *s)
{
struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
struct mtk_q_data *q_data;
if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
return -EINVAL;
q_data = mtk_venc_get_q_data(ctx, s->type);
if (!q_data)
return -EINVAL;
switch (s->target) {
case V4L2_SEL_TGT_CROP_DEFAULT:
case V4L2_SEL_TGT_CROP_BOUNDS:
s->r.top = 0;
s->r.left = 0;
s->r.width = q_data->coded_width;
s->r.height = q_data->coded_height;
break;
case V4L2_SEL_TGT_CROP:
s->r.top = 0;
s->r.left = 0;
s->r.width = q_data->visible_width;
s->r.height = q_data->visible_height;
break;
default:
return -EINVAL;
}
return 0;
}
static int vidioc_venc_s_selection(struct file *file, void *priv,
struct v4l2_selection *s)
{
struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
struct mtk_q_data *q_data;
if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
return -EINVAL;
q_data = mtk_venc_get_q_data(ctx, s->type);
if (!q_data)
return -EINVAL;
switch (s->target) {
case V4L2_SEL_TGT_CROP:
/* Only support crop from (0,0) */
s->r.top = 0;
s->r.left = 0;
s->r.width = min(s->r.width, q_data->coded_width);
s->r.height = min(s->r.height, q_data->coded_height);
q_data->visible_width = s->r.width;
q_data->visible_height = s->r.height;
break;
default:
return -EINVAL;
}
return 0;
}
static int vidioc_venc_qbuf(struct file *file, void *priv,
struct v4l2_buffer *buf)
{
@ -689,6 +752,9 @@ const struct v4l2_ioctl_ops mtk_venc_ioctl_ops = {
.vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
.vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
.vidioc_g_selection = vidioc_venc_g_selection,
.vidioc_s_selection = vidioc_venc_s_selection,
};
static int vb2ops_venc_queue_setup(struct vb2_queue *vq,