iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: ti-vpe: cal: Drop cal_ctx m_fmt field

Browse Source 
The struct cal_ctx m_fmt field stores the media bus format for the
context input. Only the format 'field' field is used, store it in the
video format instead, and drop m_fmt.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart 2020-12-07 00:53:31 +01:00 committed by Mauro Carvalho Chehab
parent 5acc3e22c2
commit 9ccd0021d0
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/platform/ti-vpe/cal-video.c
View File

@ -387,10 +387,10 @@ static int cal_s_fmt_vid_cap(struct file *file, void *priv,
v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);
ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
ctx->v_fmt.fmt.pix.field = mbus_fmt.field;
cal_calc_format_size(ctx, fmt, &ctx->v_fmt);
ctx->fmt = fmt;
ctx->m_fmt = mbus_fmt;
*f = ctx->v_fmt;
return 0;
@ -775,13 +775,13 @@ static int cal_ctx_v4l2_init_formats(struct cal_ctx *ctx)
return -EINVAL;
}
/* Save current subdev format */
/* Save current format */
v4l2_fill_pix_format(&ctx->v_fmt.fmt.pix, &mbus_fmt);
ctx->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
ctx->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
ctx->v_fmt.fmt.pix.field = mbus_fmt.field;
cal_calc_format_size(ctx, fmt, &ctx->v_fmt);
ctx->fmt = fmt;
ctx->m_fmt = mbus_fmt;
return 0;
}

2
drivers/media/platform/ti-vpe/cal.c
View File

@ -314,7 +314,7 @@ static inline void cal_schedule_next_buffer(struct cal_ctx *ctx)
static inline void cal_process_buffer_complete(struct cal_ctx *ctx)
{
ctx->cur_frm->vb.vb2_buf.timestamp = ktime_get_ns();
ctx->cur_frm->vb.field = ctx->m_fmt.field;
ctx->cur_frm->vb.field = ctx->v_fmt.fmt.pix.field;
ctx->cur_frm->vb.sequence = ctx->sequence++;
vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);

4
drivers/media/platform/ti-vpe/cal.h
View File

@ -164,9 +164,7 @@ struct cal_ctx {
/* video capture */
const struct cal_fmt *fmt;
/* Used to store current pixel format */
struct v4l2_format v_fmt;
/* Used to store current mbus frame format */
struct v4l2_mbus_framefmt m_fmt;
struct v4l2_format v_fmt;
/* Current subdev enumerated format */
const struct cal_fmt **active_fmt;