From: Boris Brezillon <boris.brezillon@collabora.com>
To: Jonas Karlman <jonas@kwiboo.se>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Ezequiel Garcia <ezequiel@collabora.com>,
Francois Buergisser <fbuergisser@chromium.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Tomasz Figa <tfiga@chromium.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 03/10] media: hantro: Fix picture order count table enable
Date: Thu, 31 Oct 2019 09:59:49 +0100 [thread overview]
Message-ID: <20191031095949.6c748526@collabora.com> (raw)
In-Reply-To: <HE1PR06MB4011525BAC0F0F1DC419EB7EAC610@HE1PR06MB4011.eurprd06.prod.outlook.com>
On Tue, 29 Oct 2019 01:24:48 +0000
Jonas Karlman <jonas@kwiboo.se> wrote:
> From: Francois Buergisser <fbuergisser@chromium.org>
>
> The picture order count table only makes sense for profiles
> higher than Baseline. This is confirmed by the H.264 specification
> (See 8.2.1 Decoding process for picture order count), which
> clarifies how POC are used for features not present in Baseline.
>
> """
> Picture order counts are used to determine initial picture orderings
> for reference pictures in the decoding of B slices, to represent picture
> order differences between frames or fields for motion vector derivation
> in temporal direct mode, for implicit mode weighted prediction in B slices,
> and for decoder conformance checking.
> """
>
> As a side note, this change matches various vendors downstream codebases,
> including ChromiumOS and IMX VPU libraries.
>
> 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>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
Same as for patch 2, it would be great to have this fix queued for
5.4-rc6 so we don't have to backport it manually.
> ---
> drivers/staging/media/hantro/hantro_g1_h264_dec.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> index a1cb18680200..70a6b5b26477 100644
> --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
> @@ -34,9 +34,11 @@ static void set_params(struct hantro_ctx *ctx)
> reg = G1_REG_DEC_CTRL0_DEC_AXI_WR_ID(0x0);
> 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 (sps->profile_idc > 66 && dec_param->nal_ref_idc)
> - reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E;
> + if (sps->profile_idc > 66) {
> + reg |= G1_REG_DEC_CTRL0_PICORD_COUNT_E;
> + if (dec_param->nal_ref_idc)
> + reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E;
> + }
>
> if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY) &&
> (sps->flags & V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD ||
next prev parent reply other threads:[~2019-10-31 8:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 1:23 [PATCH RFC v2 00/10] media: hantro: H264 fixes and improvements Jonas Karlman
2019-10-29 1:24 ` [PATCH v2 01/10] media: hantro: Fix H264 max frmsize supported on RK3288 Jonas Karlman
2019-10-31 8:52 ` Boris Brezillon
2019-11-01 8:36 ` Hans Verkuil
2019-11-05 7:56 ` Boris Brezillon
[not found] ` <20191029012430.24566-1-jonas@kwiboo.se>
2019-10-29 1:24 ` [PATCH v2 02/10] media: hantro: Fix motion vectors usage condition Jonas Karlman
2019-10-31 8:58 ` Boris Brezillon
2019-11-02 23:09 ` Ezequiel Garcia
2019-11-02 23:10 ` Ezequiel Garcia
2019-10-29 1:24 ` [PATCH v2 03/10] media: hantro: Fix picture order count table enable Jonas Karlman
2019-10-31 8:59 ` Boris Brezillon [this message]
2019-10-29 1:24 ` [PATCH v2 04/10] media: hantro: Fix H264 motion vector buffer offset Jonas Karlman
2019-10-31 9:47 ` Boris Brezillon
2019-10-29 1:24 ` [PATCH v2 05/10] media: hantro: Reduce H264 extra space for motion vectors Jonas Karlman
2019-10-31 9:50 ` Boris Brezillon
2019-10-29 1:24 ` [PATCH v2 06/10] media: hantro: Use capture buffer width and height for H264 decoding Jonas Karlman
2019-10-31 9:21 ` Boris Brezillon
2019-10-31 10:00 ` Jonas Karlman
2019-10-29 1:24 ` [PATCH v2 07/10] media: hantro: Remove now unused H264 pic_size Jonas Karlman
2019-10-31 9:53 ` Boris Brezillon
2019-10-29 1:26 ` [PATCH v2 08/10] media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly Jonas Karlman
2019-10-31 10:00 ` Boris Brezillon
[not found] ` <20191029012550.24628-1-jonas@kwiboo.se>
2019-10-29 1:26 ` [RFC v2 09/10] media: uapi: h264: Add DPB entry field reference flags Jonas Karlman
2019-10-31 10:20 ` Boris Brezillon
2019-11-15 6:26 ` Jonas Karlman
2019-11-15 7:45 ` Boris Brezillon
2019-11-15 8:15 ` Jonas Karlman
2019-10-29 1:26 ` [RFC v2 10/10] media: hantro: Fix H264 decoding of field encoded content Jonas Karlman
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=20191031095949.6c748526@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=ezequiel@collabora.com \
--cc=fbuergisser@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--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).