[09/10,media] coda: v4l2-compliance fix: implement decoder_try_cmd

Commit Message

Philipp Zabel Sept. 19, 2013, 9:13 a.m. UTC

Signed-off-by: Philipp Zabel <[e-mail]>
---
 drivers/media/platform/coda.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

Patch

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 1d44a4b..d15238a 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -835,23 +835,34 @@  static int coda_vidioc_streamoff(struct file *file, void *priv,
 	return ret;
 }
 
-static int coda_vidioc_decoder_cmd(struct file *file, void *fh,
-				   struct v4l2_decoder_cmd *dc)
+static int coda_vidioc_try_decoder_cmd(struct file *file, void *fh,
+				       struct v4l2_decoder_cmd *dc)
 {
-	struct coda_ctx *ctx = fh_to_ctx(fh);
-
 	if (dc->cmd != V4L2_DEC_CMD_STOP)
 		return -EINVAL;
 
-	if ((dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK) ||
-	    (dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY))
+	if (dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK)
 		return -EINVAL;
 
-	if (dc->stop.pts != 0)
+	if (!(dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY) && (dc->stop.pts != 0))
 		return -EINVAL;
 
+	return 0;
+}
+
+static int coda_vidioc_decoder_cmd(struct file *file, void *fh,
+				   struct v4l2_decoder_cmd *dc)
+{
+	struct coda_ctx *ctx = fh_to_ctx(fh);
+	int ret;
+
+	ret = coda_vidioc_try_decoder_cmd(file, fh, dc);
+	if (ret < 0)
+		return ret;
+
+	/* Ignore decoder stop command silently in encoder context */
 	if (ctx->inst_type != CODA_INST_DECODER)
-		return -EINVAL;
+		return 0;
 
 	/* Set the strem-end flag on this context */
 	ctx->bit_stream_param |= CODA_BIT_STREAM_END_FLAG;
@@ -894,6 +905,7 @@  static const struct v4l2_ioctl_ops coda_ioctl_ops = {
 	.vidioc_streamon	= coda_vidioc_streamon,
 	.vidioc_streamoff	= coda_vidioc_streamoff,
 
+	.vidioc_try_decoder_cmd	= coda_vidioc_try_decoder_cmd,
 	.vidioc_decoder_cmd	= coda_vidioc_decoder_cmd,
 
 	.vidioc_subscribe_event = coda_vidioc_subscribe_event,