[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20191031110036.1af7fa3e@collabora.com>
Date: Thu, 31 Oct 2019 11:00:36 +0100
From: Boris Brezillon <boris.brezillon@...labora.com>
To: Jonas Karlman <jonas@...boo.se>
Cc: Mauro Carvalho Chehab <mchehab+samsung@...nel.org>,
Ezequiel Garcia <ezequiel@...labora.com>,
Hans Verkuil <hverkuil@...all.nl>,
Tomasz Figa <tfiga@...omium.org>,
Philipp Zabel <p.zabel@...gutronix.de>,
"linux-media@...r.kernel.org" <linux-media@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 08/10] media: hantro: Set H264 FIELDPIC_FLAG_E flag
correctly
On Tue, 29 Oct 2019 01:26:00 +0000
Jonas Karlman <jonas@...boo.se> wrote:
> The FIELDPIC_FLAG_E bit should be set when field_pic_flag exists in stream,
> it is currently set based on field_pic_flag of current frame.
> The PIC_FIELDMODE_E bit is correctly set based on the field_pic_flag.
>
> Fix this by setting the FIELDPIC_FLAG_E bit when frame_mbs_only is not set.
>
> Fixes: dea0a82f3d22 ("media: hantro: Add support for H264 decoding on G1")
> Signed-off-by: Jonas Karlman <jonas@...boo.se>
Reviewed-by: Boris Brezillon <boris.brezillon@...labora.com>
> ---
> drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> index eeed11366135..c07da0ee4973 100644
> --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> @@ -63,7 +63,7 @@ static void set_params(struct hantro_ctx *ctx)
> /* always use the matrix sent from userspace */
> reg |= G1_REG_DEC_CTRL2_TYPE1_QUANT_E;
>
> - if (slices[0].flags & V4L2_H264_SLICE_FLAG_FIELD_PIC)
> + if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY))
> reg |= G1_REG_DEC_CTRL2_FIELDPIC_FLAG_E;
> vdpu_write_relaxed(vpu, reg, G1_REG_DEC_CTRL2);
>
Powered by blists - more mailing lists