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

media: imx-jpeg: Refactor function mxc_jpeg_parse

Browse Source 
[ Upstream commit 8dd504a3a0 ]

Refine code to support dynamic resolution change

Signed-off-by: Ming Qian <ming.qian@nxp.com>
Reviewed-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ming Qian
2022-03-23 10:05:54 +01:00
committed by Greg Kroah-Hartman
parent cab2a15969
commit 24eef33c38
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/platform/imx-jpeg/mxc-jpeg.c
View File

@ -1236,8 +1236,7 @@ static void mxc_jpeg_sizeimage(struct mxc_jpeg_q_data *q)
} }
} }
static int mxc_jpeg_parse(struct mxc_jpeg_ctx *ctx, static int mxc_jpeg_parse(struct mxc_jpeg_ctx *ctx, struct vb2_buffer *vb)
u8 *src_addr, u32 size, bool *dht_needed)
{ {
struct device *dev = ctx->mxc_jpeg->dev; struct device *dev = ctx->mxc_jpeg->dev;
struct mxc_jpeg_q_data *q_data_out, *q_data_cap; struct mxc_jpeg_q_data *q_data_out, *q_data_cap;
@ -1247,6 +1246,9 @@ static int mxc_jpeg_parse(struct mxc_jpeg_ctx *ctx,
struct v4l2_jpeg_header header; struct v4l2_jpeg_header header;
struct mxc_jpeg_sof *psof = NULL; struct mxc_jpeg_sof *psof = NULL;
struct mxc_jpeg_sos *psos = NULL; struct mxc_jpeg_sos *psos = NULL;
struct mxc_jpeg_src_buf *jpeg_src_buf = vb2_to_mxc_buf(vb);
u8 *src_addr = (u8 *)vb2_plane_vaddr(vb, 0);
u32 size = vb2_get_plane_payload(vb, 0);
int ret; int ret;
memset(&header, 0, sizeof(header)); memset(&header, 0, sizeof(header));
@ -1257,7 +1259,7 @@ static int mxc_jpeg_parse(struct mxc_jpeg_ctx *ctx,
} }
/* if DHT marker present, no need to inject default one */ /* if DHT marker present, no need to inject default one */
*dht_needed = (header.num_dht == 0); jpeg_src_buf->dht_needed = (header.num_dht == 0);
q_data_out = mxc_jpeg_get_q_data(ctx, q_data_out = mxc_jpeg_get_q_data(ctx,
V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
@ -1372,10 +1374,7 @@ static void mxc_jpeg_buf_queue(struct vb2_buffer *vb)
jpeg_src_buf = vb2_to_mxc_buf(vb); jpeg_src_buf = vb2_to_mxc_buf(vb);
jpeg_src_buf->jpeg_parse_error = false; jpeg_src_buf->jpeg_parse_error = false;
ret = mxc_jpeg_parse(ctx, ret = mxc_jpeg_parse(ctx, vb);
(u8 *)vb2_plane_vaddr(vb, 0),
vb2_get_plane_payload(vb, 0),
&jpeg_src_buf->dht_needed);
if (ret) if (ret)
jpeg_src_buf->jpeg_parse_error = true; jpeg_src_buf->jpeg_parse_error = true;