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

Commit 49b966fa authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: don't start streaming without queued buffers 



We could support start streaming with an empty output queue for the
BIT decoders due to the bitstream buffer which could still contain
data at this point, but there is really no reason for userspace to
expect this to work. Simplify the code by disallowing it.

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 bb757d7b

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

+3 −10
Original line number Diff line number Diff line
@@ -1252,6 +1252,9 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
	struct vb2_v4l2_buffer *buf;

	int ret = 0;



	if (count < 1)

		return -EINVAL;



	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);

	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit) {
@@ -1264,20 +1267,10 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
				ret = -EINVAL;

				goto err;

			}

		} else {

			if (count < 1) {

				ret = -EINVAL;

				goto err;

			}

		}



		ctx->streamon_out = 1;

	} else {

		if (count < 1) {

			ret = -EINVAL;

			goto err;

		}



		ctx->streamon_cap = 1;

	}