Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b6ee5c authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: fail to start streaming if userspace set invalid formats 



Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 6ba53b81

drivers/media/platform/coda/coda-common.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -1282,12 +1282,23 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
	if (!(ctx->streamon_out & ctx->streamon_cap))

	if (!(ctx->streamon_out & ctx->streamon_cap))

		return 0;

		return 0;





	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);

	if ((q_data_src->width != q_data_dst->width &&

	     round_up(q_data_src->width, 16) != q_data_dst->width) ||

	    (q_data_src->height != q_data_dst->height &&

	     round_up(q_data_src->height, 16) != q_data_dst->height)) {

		v4l2_err(v4l2_dev, "can't convert %dx%d to %dx%d\n",

			 q_data_src->width, q_data_src->height,

			 q_data_dst->width, q_data_dst->height);

		ret = -EINVAL;

		goto err;

	}



	/* Allow BIT decoder device_run with no new buffers queued */

	/* Allow BIT decoder device_run with no new buffers queued */

	if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit)

	if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit)

		v4l2_m2m_set_src_buffered(ctx->fh.m2m_ctx, true);

		v4l2_m2m_set_src_buffered(ctx->fh.m2m_ctx, true);





	ctx->gopcounter = ctx->params.gop_size - 1;

	ctx->gopcounter = ctx->params.gop_size - 1;

	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);





	ctx->codec = coda_find_codec(ctx->dev, q_data_src->fourcc,

	ctx->codec = coda_find_codec(ctx->dev, q_data_src->fourcc,

				     q_data_dst->fourcc);

				     q_data_dst->fourcc);