Commit b3ab1c60 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: Add V4L2_TYPE_IS_CAPTURE helper 



It's all too easy to get confused by the V4L2_TYPE_IS_OUTPUT
macro, when it's used as !V4L2_TYPE_IS_OUTPUT.

Reduce the risk of confusion with macro to explicitly
check for the CAPTURE queue type case.

This change does not affect functionality, and it's
only intended to make the code more readable.

Suggested-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: checkpatch: align with parenthesis]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d6129d36

drivers/media/common/videobuf2/videobuf2-v4l2.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b) 
	unsigned int bytesused;

	unsigned int plane;



	if (!V4L2_TYPE_IS_OUTPUT(b->type))

	if (V4L2_TYPE_IS_CAPTURE(b->type))

		return 0;



	if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
@@ -311,7 +311,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b 


	/* Zero flags that we handle */

	vbuf->flags = b->flags & ~V4L2_BUFFER_MASK_FLAGS;

	if (!vb->vb2_queue->copy_timestamp || !V4L2_TYPE_IS_OUTPUT(b->type)) {

	if (!vb->vb2_queue->copy_timestamp || V4L2_TYPE_IS_CAPTURE(b->type)) {

		/*

		 * Non-COPY timestamps and non-OUTPUT queues will get

		 * their timestamp and timestamp source flags from the

drivers/media/platform/exynos-gsc/gsc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ int gsc_try_selection(struct gsc_ctx *ctx, struct v4l2_selection *s) 
	v4l_bound_align_image(&tmp_w, min_w, max_w, mod_x,

			      &tmp_h, min_h, max_h, mod_y, 0);



	if (!V4L2_TYPE_IS_OUTPUT(s->type) &&

	if (V4L2_TYPE_IS_CAPTURE(s->type) &&

	    (ctx->gsc_ctrls.rotate->val == 90 ||

	     ctx->gsc_ctrls.rotate->val == 270))

		gsc_check_crop_change(tmp_h, tmp_w,

drivers/media/platform/exynos-gsc/gsc-m2m.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int gsc_m2m_buf_prepare(struct vb2_buffer *vb) 
	if (IS_ERR(frame))

		return PTR_ERR(frame);



	if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {

	if (V4L2_TYPE_IS_CAPTURE(vb->vb2_queue->type)) {

		for (i = 0; i < frame->fmt->num_planes; i++)

			vb2_set_plane_payload(vb, i, frame->payload[i]);

	}

drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q) 
	 * subsampling. Update capture queue when the stream is off.

	 */

	if (ctx->state == MTK_JPEG_SOURCE_CHANGE &&

	    !V4L2_TYPE_IS_OUTPUT(q->type)) {

	    V4L2_TYPE_IS_CAPTURE(q->type)) {

		struct mtk_jpeg_src_buf *src_buf;



		vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c

+3 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static const struct mtk_mdp_fmt *mtk_mdp_try_fmt_mplane(struct mtk_mdp_ctx *ctx, 


	pix_mp->field = V4L2_FIELD_NONE;

	pix_mp->pixelformat = fmt->pixelformat;

	if (!V4L2_TYPE_IS_OUTPUT(f->type)) {

	if (V4L2_TYPE_IS_CAPTURE(f->type)) {

		pix_mp->colorspace = ctx->colorspace;

		pix_mp->xfer_func = ctx->xfer_func;

		pix_mp->ycbcr_enc = ctx->ycbcr_enc;
@@ -327,9 +327,8 @@ static int mtk_mdp_try_crop(struct mtk_mdp_ctx *ctx, u32 type, 
	mtk_mdp_bound_align_image(&new_w, min_w, max_w, align_w,

				  &new_h, min_h, max_h, align_h);



	if (!V4L2_TYPE_IS_OUTPUT(type) &&

		(ctx->ctrls.rotate->val == 90 ||

		ctx->ctrls.rotate->val == 270))

	if (V4L2_TYPE_IS_CAPTURE(type) &&

	    (ctx->ctrls.rotate->val == 90 || ctx->ctrls.rotate->val == 270))

		mtk_mdp_check_crop_change(new_h, new_w,

					  &r->width, &r->height);

	else