[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240822161145.jv7i45wlajcxpazw@basti-XPS-13-9310>
Date: Thu, 22 Aug 2024 18:11:45 +0200
From: Sebastian Fricke <sebastian.fricke@...labora.com>
To: Yunfei Dong <yunfei.dong@...iatek.com>
Cc: NĂcolas F . R . A . Prado <nfraprado@...labora.com>,
Nicolas Dufresne <nicolas.dufresne@...labora.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Benjamin Gaignard <benjamin.gaignard@...labora.com>,
Nathan Hebert <nhebert@...omium.org>,
Daniel Almeida <daniel.almeida@...labora.com>,
Hsin-Yi Wang <hsinyi@...omium.org>,
Fritz Koenig <frkoenig@...omium.org>,
Daniel Vetter <daniel@...ll.ch>, Steve Cho <stevecho@...omium.org>,
linux-media@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org,
Project_Global_Chrome_Upstream_Group@...iatek.com
Subject: Re: [PATCH v4 3/7] media: mediatek: vcodec: flush decoder before
stream off
Hey Yunfei,
On 07.08.2024 16:24, Yunfei Dong wrote:
>Flush decoder will reset the driver to flush status. If lat or core
>work queue in active before flush when stream off, will lead to get
>dst buffer NULL or buff done with one non-existent source buffer.
>
>Flush decoder when stream off no matter output or capture queue
>calling stream off firstly.
>
>Signed-off-by: Yunfei Dong <yunfei.dong@...iatek.com>
>---
> .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 45 ++++++++++---------
> 1 file changed, 23 insertions(+), 22 deletions(-)
>
>diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
>index 7080ca3e18b0..fc4ee1fb7cd1 100644
>--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
>+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
>@@ -882,6 +882,29 @@ void vb2ops_vdec_stop_streaming(struct vb2_queue *q)
> mtk_v4l2_vdec_dbg(3, ctx, "[%d] (%d) state=(%x) ctx->decoded_frame_cnt=%d",
> ctx->id, q->type, ctx->state, ctx->decoded_frame_cnt);
>
>+ if (ctx->state >= MTK_STATE_HEADER && ctx->state != MTK_STATE_FLUSH) {
>+ /*
>+ * The resolution hasn't been changed when STREAMOFF is called.
>+ * Update the picinfo here with previous resolution if VIDIOC_G_FMT
>+ * is called.
>+ */
>+ ctx->picinfo = ctx->last_decoded_picinfo;
>+
>+ mtk_v4l2_vdec_dbg(2, ctx,
>+ "[%d]-> new(%d,%d), old(%d,%d), real(%d,%d)",
>+ ctx->id, ctx->last_decoded_picinfo.pic_w,
>+ ctx->last_decoded_picinfo.pic_h,
>+ ctx->picinfo.pic_w, ctx->picinfo.pic_h,
>+ ctx->last_decoded_picinfo.buf_w,
>+ ctx->last_decoded_picinfo.buf_h);
>+
>+ ret = ctx->dev->vdec_pdata->flush_decoder(ctx);
>+ if (ret)
>+ mtk_v4l2_vdec_err(ctx, "DecodeFinal failed, ret=%d", ret);
>+
>+ ctx->state = MTK_STATE_FLUSH;
>+ }
>+
> if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> while ((src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx))) {
> if (src_buf != &ctx->empty_flush_buf.vb) {
>@@ -894,28 +917,6 @@ void vb2ops_vdec_stop_streaming(struct vb2_queue *q)
> }
> }
>
>- if (ctx->state >= MTK_STATE_HEADER) {
>- /*
>- * The resolution hasn't been changed when STREAMOFF is called.
>- * Update the picinfo here with previous resolution if VIDIOC_G_FMT
>- * is called.
>- */
>- ctx->picinfo = ctx->last_decoded_picinfo;
>-
>- mtk_v4l2_vdec_dbg(2, ctx,
>- "[%d]-> new(%d,%d), old(%d,%d), real(%d,%d)",
>- ctx->id, ctx->last_decoded_picinfo.pic_w,
>- ctx->last_decoded_picinfo.pic_h,
>- ctx->picinfo.pic_w, ctx->picinfo.pic_h,
>- ctx->last_decoded_picinfo.buf_w,
>- ctx->last_decoded_picinfo.buf_h);
>-
>- ret = ctx->dev->vdec_pdata->flush_decoder(ctx);
>- if (ret)
>- mtk_v4l2_vdec_err(ctx, "DecodeFinal failed, ret=%d", ret);
>- }
>-
>- ctx->state = MTK_STATE_FLUSH;
you just changed this routine in patch 2/7, why was patch 2/7 needed if
you remove it right away in the next patch?
regards,
Sebastian Fricke
> return;
> }
>
>--
>2.46.0
>
>
Powered by blists - more mailing lists