From: Jonas Karlman <jonas@kwiboo.se>
To: Ezequiel Garcia <ezequiel@collabora.com>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
Cc: "kernel@collabora.com" <kernel@collabora.com>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Tomasz Figa <tfiga@chromium.org>,
"linux-rockchip@lists.infradead.org"
<linux-rockchip@lists.infradead.org>,
Heiko Stuebner <heiko@sntech.de>,
Philipp Zabel <p.zabel@pengutronix.de>,
Boris Brezillon <boris.brezillon@collabora.com>,
Alexandre Courbot <acourbot@chromium.org>,
"fbuergisser@chromium.org" <fbuergisser@chromium.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Douglas Anderson <dianders@chromium.org>
Subject: Re: [PATCH v2 for 5.4 3/4] media: hantro: Fix motion vectors usage condition
Date: Mon, 7 Oct 2019 18:33:52 +0000 [thread overview]
Message-ID: <HE1PR06MB4011204B3FC2DAABB4BD1BACAC9B0@HE1PR06MB4011.eurprd06.prod.outlook.com> (raw)
In-Reply-To: <20191007174505.10681-4-ezequiel@collabora.com>
On 2019-10-07 19:45, Ezequiel Garcia wrote:
> From: Francois Buergisser <fbuergisser@chromium.org>
>
> The setting of the motion vectors usage and the setting of motion
> vectors address are currently done under different conditions.
>
> When decoding pre-recorded videos, this results of leaving the motion
> vectors address unset, resulting in faulty memory accesses. Fix it
> by using the same condition everywhere, which matches the profiles
> that support motion vectors.
This does not fully match hantro sdk:
enable direct MV writing and POC tables for high/main streams.
enable it also for any "baseline" stream which have main/high tools enabled.
(sps->profile_idc > 66 && sps->constrained_set0_flag == 0) ||
sps->frame_mbs_only_flag != 1 ||
sps->chroma_format_idc != 1 ||
sps->scaling_matrix_present_flag != 0 ||
pps->entropy_coding_mode_flag != 0 ||
pps->weighted_pred_flag != 0 ||
pps->weighted_bi_pred_idc != 0 ||
pps->transform8x8_flag != 0 ||
pps->scaling_matrix_present_flag != 0
Above check is used when DIR_MV_BASE should be written.
And WRITE_MVS_E is set to nal_ref_idc != 0 when above is true.
I think it may be safer to always set DIR_MV_BASE and keep the existing nal_ref_idc check for WRITE_MVS_E.
(That is what I did in my "media: hantro: H264 fixes and improvements" series, v2 is incoming)
Or have you found any video that is having issues in such case?
Regards,
Jonas
>
> Fixes: dea0a82f3d22 ("media: hantro: Add support for H264 decoding on G1")
> Signed-off-by: Francois Buergisser <fbuergisser@chromium.org>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
> v2:
> * New patch.
>
> 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 7ab534936843..c92460407613 100644
> --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> @@ -35,7 +35,7 @@ static void set_params(struct hantro_ctx *ctx)
> if (sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD)
> reg |= G1_REG_DEC_CTRL0_SEQ_MBAFF_E;
> reg |= G1_REG_DEC_CTRL0_PICORD_COUNT_E;
> - if (dec_param->nal_ref_idc)
> + if (sps->profile_idc > 66)
> reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E;
>
> if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY) &&
next prev parent reply other threads:[~2019-10-07 18:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 17:45 [PATCH v2 for 5.4 0/4] media: hantro: Collected fixes for v5.4 Ezequiel Garcia
2019-10-07 17:45 ` [PATCH v2 for 5.4 1/4] media: hantro: Fix s_fmt for dynamic resolution changes Ezequiel Garcia
2019-11-08 10:19 ` Boris Brezillon
2019-11-08 11:52 ` Tomasz Figa
2019-11-09 12:17 ` Hans Verkuil
2019-11-09 12:25 ` Hans Verkuil
2019-11-09 16:01 ` Ezequiel Garcia
2019-11-09 19:13 ` Boris Brezillon
2019-10-07 17:45 ` [PATCH v2 for 5.4 2/4] media: hantro: Fix H264 max frmsize supported on RK3288 Ezequiel Garcia
2019-10-08 5:27 ` Tomasz Figa
2019-10-08 6:31 ` Jonas Karlman
2019-10-08 10:42 ` Tomasz Figa
2019-10-08 13:35 ` Tomasz Figa
2019-10-08 13:53 ` Tomasz Figa
2019-10-08 14:12 ` Jonas Karlman
2019-10-08 20:39 ` Jonas Karlman
2019-10-10 7:27 ` Tomasz Figa
2019-10-10 7:23 ` Tomasz Figa
2019-10-13 22:10 ` Nicolas Dufresne
2019-10-15 3:27 ` Tomasz Figa
2019-10-07 17:45 ` [PATCH v2 for 5.4 3/4] media: hantro: Fix motion vectors usage condition Ezequiel Garcia
2019-10-07 18:33 ` Jonas Karlman [this message]
2019-10-08 3:29 ` Tomasz Figa
2019-10-08 6:23 ` Jonas Karlman
2019-10-08 10:26 ` Tomasz Figa
2019-10-08 13:57 ` Jonas Karlman
2019-10-10 7:36 ` Tomasz Figa
2019-10-07 17:45 ` [PATCH v2 for 5.4 4/4] media: hantro: Fix picture order count table enable Ezequiel Garcia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=HE1PR06MB4011204B3FC2DAABB4BD1BACAC9B0@HE1PR06MB4011.eurprd06.prod.outlook.com \
--to=jonas@kwiboo.se \
--cc=acourbot@chromium.org \
--cc=boris.brezillon@collabora.com \
--cc=dianders@chromium.org \
--cc=ezequiel@collabora.com \
--cc=fbuergisser@chromium.org \
--cc=heiko@sntech.de \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).