Commit 73a1d432 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab
Browse files

media: cedrus: mpeg2: Use v4l2_m2m_get_vq helper for capture queue 



Since there's a v4l2_m2m_get_vq helper, use it instead of accessing the
queue directly, which slightly increases readability.

Also reformat the code using the queue a bit while at it.

Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 9dacde5e

drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run) 
	dma_addr_t fwd_luma_addr, fwd_chroma_addr;

	dma_addr_t bwd_luma_addr, bwd_chroma_addr;

	struct cedrus_dev *dev = ctx->dev;

	struct vb2_queue *cap_q = &ctx->fh.m2m_ctx->cap_q_ctx.q;

	struct vb2_queue *vq;

	const u8 *matrix;

	int forward_idx;

	int backward_idx;
@@ -159,17 +159,17 @@ static void cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run) 
	cedrus_write(dev, VE_DEC_MPEG_PICBOUNDSIZE, reg);



	/* Forward and backward prediction reference buffers. */

	forward_idx = vb2_find_timestamp(cap_q,

					 slice_params->forward_ref_ts, 0);



	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);



	forward_idx = vb2_find_timestamp(vq, slice_params->forward_ref_ts, 0);

	fwd_luma_addr = cedrus_dst_buf_addr(ctx, forward_idx, 0);

	fwd_chroma_addr = cedrus_dst_buf_addr(ctx, forward_idx, 1);



	cedrus_write(dev, VE_DEC_MPEG_FWD_REF_LUMA_ADDR, fwd_luma_addr);

	cedrus_write(dev, VE_DEC_MPEG_FWD_REF_CHROMA_ADDR, fwd_chroma_addr);



	backward_idx = vb2_find_timestamp(cap_q,

					  slice_params->backward_ref_ts, 0);

	backward_idx = vb2_find_timestamp(vq, slice_params->backward_ref_ts, 0);

	bwd_luma_addr = cedrus_dst_buf_addr(ctx, backward_idx, 0);

	bwd_chroma_addr = cedrus_dst_buf_addr(ctx, backward_idx, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE