media: hantro: Move copy_metadata() before doing a decode operation

Some decoders use intra slice/frame references. The capture buffer
pointed by these references might be new and thus have invalid
timestamp which prevents the decoder logic from retrieving the
vb2_buffer object based on the output buf timestamp.
Copy all metadata (including the timestamp) before starting the decode
operation.

Suggested-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Tested-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>

diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index 4af6ee8..6e2351e 100644 (file)
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -111,8 +111,6 @@ static void hantro_job_finish(struct hantro_dev *vpu,
        src->sequence = ctx->sequence_out++;
        dst->sequence = ctx->sequence_cap++;
 
-       v4l2_m2m_buf_copy_metadata(src, dst, true);
-
        ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
        if (ret)
                result = VB2_BUF_STATE_ERROR;
@@ -178,8 +176,12 @@ void hantro_finish_run(struct hantro_ctx *ctx)
 static void device_run(void *priv)
 {
        struct hantro_ctx *ctx = priv;
+       struct vb2_v4l2_buffer *src, *dst;
        int ret;
 
+       src = hantro_get_src_buf(ctx);
+       dst = hantro_get_dst_buf(ctx);
+
        ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
        if (ret)
                goto err_cancel_job;
@@ -187,6 +189,8 @@ static void device_run(void *priv)
        if (ret < 0)
                goto err_cancel_job;
 
+       v4l2_m2m_buf_copy_metadata(src, dst, true);
+
        ctx->codec_ops->run(ctx);
        return;