]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: coda: use mem2mem try_en/decoder_cmd helpers
authorPhilipp Zabel <p.zabel@pengutronix.de>
Tue, 18 Jun 2019 16:45:09 +0000 (12:45 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 24 Jun 2019 18:16:05 +0000 (14:16 -0400)
Use mem2mem try_en/decoder_cmd helpers to ensure consistent behaviour
with other video codec drivers.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/coda/coda-common.c

index c7dcab4d1f6c6f93afd99d566424bdc13a81566d..8347169fadc0c369237beea0513694b1c299e0d5 100644 (file)
@@ -1001,13 +1001,7 @@ static int coda_try_encoder_cmd(struct file *file, void *fh,
        if (ctx->inst_type != CODA_INST_ENCODER)
                return -ENOTTY;
 
-       if (ec->cmd != V4L2_ENC_CMD_STOP)
-               return -EINVAL;
-
-       if (ec->flags & V4L2_ENC_CMD_STOP_AT_GOP_END)
-               return -EINVAL;
-
-       return 0;
+       return v4l2_m2m_ioctl_try_encoder_cmd(file, fh, ec);
 }
 
 static int coda_encoder_cmd(struct file *file, void *fh,
@@ -1043,16 +1037,7 @@ static int coda_try_decoder_cmd(struct file *file, void *fh,
        if (ctx->inst_type != CODA_INST_DECODER)
                return -ENOTTY;
 
-       if (dc->cmd != V4L2_DEC_CMD_STOP)
-               return -EINVAL;
-
-       if (dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK)
-               return -EINVAL;
-
-       if (!(dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY) && (dc->stop.pts != 0))
-               return -EINVAL;
-
-       return 0;
+       return v4l2_m2m_ioctl_try_decoder_cmd(file, fh, dc);
 }
 
 static int coda_decoder_cmd(struct file *file, void *fh,