Commit 784867d2 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: coda: disable encoder command on decoder and vice versa 



Return -ENOTTY when userspace tries to call VIDIOC_(TRY_)ENCODER_CMD on
a decoder instance or VIDIOC_(TRY_)DECODER_CMD on an encoder instance.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c1b6761e

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

+10 −8
Original line number Diff line number Diff line
@@ -1000,6 +1000,11 @@ static int coda_s_selection(struct file *file, void *fh, 
static int coda_try_encoder_cmd(struct file *file, void *fh,

				struct v4l2_encoder_cmd *ec)

{

	struct coda_ctx *ctx = fh_to_ctx(fh);



	if (ctx->inst_type != CODA_INST_ENCODER)

		return -ENOTTY;



	if (ec->cmd != V4L2_ENC_CMD_STOP)

		return -EINVAL;
@@ -1020,10 +1025,6 @@ static int coda_encoder_cmd(struct file *file, void *fh, 
	if (ret < 0)

		return ret;



	/* Ignore encoder stop command silently in decoder context */

	if (ctx->inst_type != CODA_INST_ENCODER)

		return 0;



	/* Set the stream-end flag on this context */

	ctx->bit_stream_param |= CODA_BIT_STREAM_END_FLAG;
@@ -1041,6 +1042,11 @@ static int coda_encoder_cmd(struct file *file, void *fh, 
static int coda_try_decoder_cmd(struct file *file, void *fh,

				struct v4l2_decoder_cmd *dc)

{

	struct coda_ctx *ctx = fh_to_ctx(fh);



	if (ctx->inst_type != CODA_INST_DECODER)

		return -ENOTTY;



	if (dc->cmd != V4L2_DEC_CMD_STOP)

		return -EINVAL;
@@ -1063,10 +1069,6 @@ static int coda_decoder_cmd(struct file *file, void *fh, 
	if (ret < 0)

		return ret;



	/* Ignore decoder stop command silently in encoder context */

	if (ctx->inst_type != CODA_INST_DECODER)

		return 0;



	/* Set the stream-end flag on this context */

	coda_bit_stream_end_flag(ctx);

	ctx->hold = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE