Commit 6c2eb77b authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab

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: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Tested-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 341772b8
...@@ -111,8 +111,6 @@ static void hantro_job_finish(struct hantro_dev *vpu, ...@@ -111,8 +111,6 @@ static void hantro_job_finish(struct hantro_dev *vpu,
src->sequence = ctx->sequence_out++; src->sequence = ctx->sequence_out++;
dst->sequence = ctx->sequence_cap++; dst->sequence = ctx->sequence_cap++;
v4l2_m2m_buf_copy_metadata(src, dst, true);
ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused); ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
if (ret) if (ret)
result = VB2_BUF_STATE_ERROR; result = VB2_BUF_STATE_ERROR;
...@@ -178,8 +176,12 @@ void hantro_finish_run(struct hantro_ctx *ctx) ...@@ -178,8 +176,12 @@ void hantro_finish_run(struct hantro_ctx *ctx)
static void device_run(void *priv) static void device_run(void *priv)
{ {
struct hantro_ctx *ctx = priv; struct hantro_ctx *ctx = priv;
struct vb2_v4l2_buffer *src, *dst;
int ret; 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); ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
if (ret) if (ret)
goto err_cancel_job; goto err_cancel_job;
...@@ -187,6 +189,8 @@ static void device_run(void *priv) ...@@ -187,6 +189,8 @@ static void device_run(void *priv)
if (ret < 0) if (ret < 0)
goto err_cancel_job; goto err_cancel_job;
v4l2_m2m_buf_copy_metadata(src, dst, true);
ctx->codec_ops->run(ctx); ctx->codec_ops->run(ctx);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment