From: Michael Tretter <m.tret...@pengutronix.de>

The CMD_START shall be used to start the processing after a drain that
was initiated with CMD_STOP.

Up until now, a drain on coda could only be finished with a
STREAMOFF-STREAMON, which resulted in a reset of the device.

Signed-off-by: Michael Tretter <m.tret...@pengutronix.de>
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
 drivers/media/platform/coda/coda-common.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/coda/coda-common.c 
b/drivers/media/platform/coda/coda-common.c
index 751b0be1c2ea..a5e0d5c1528e 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1059,16 +1059,29 @@ static int coda_decoder_cmd(struct file *file, void *fh,
                            struct v4l2_decoder_cmd *dc)
 {
        struct coda_ctx *ctx = fh_to_ctx(fh);
+       struct vb2_queue *dst_vq;
        int ret;
 
        ret = coda_try_decoder_cmd(file, fh, dc);
        if (ret < 0)
                return ret;
 
-       /* Set the stream-end flag on this context */
-       coda_bit_stream_end_flag(ctx);
-       ctx->hold = false;
-       v4l2_m2m_try_schedule(ctx->fh.m2m_ctx);
+       switch (dc->cmd) {
+       case V4L2_DEC_CMD_START:
+               dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
+                                        V4L2_BUF_TYPE_VIDEO_CAPTURE);
+               vb2_clear_last_buffer_dequeued(dst_vq);
+               ctx->bit_stream_param &= ~CODA_BIT_STREAM_END_FLAG;
+               break;
+       case V4L2_DEC_CMD_STOP:
+               /* Set the stream-end flag on this context */
+               coda_bit_stream_end_flag(ctx);
+               ctx->hold = false;
+               v4l2_m2m_try_schedule(ctx->fh.m2m_ctx);
+               break;
+       default:
+               return -EINVAL;
+       }
 
        return 0;
 }
-- 
2.20.1

Reply via email to