From: Ezequiel Garcia <ezequiel@collabora.com> To: linux-media@vger.kernel.org Cc: kernel@collabora.com, Nicolas Dufresne <nicolas.dufresne@collabora.com>, Tomasz Figa <tfiga@chromium.org>, linux-rockchip@lists.infradead.org, Heiko Stuebner <heiko@sntech.de>, Jonas Karlman <jonas@kwiboo.se>, Philipp Zabel <p.zabel@pengutronix.de>, Boris Brezillon <boris.brezillon@collabora.com>, Alexandre Courbot <acourbot@chromium.org>, fbuergisser@chromium.org, linux-kernel@vger.kernel.org, Douglas Anderson <dianders@chromium.org>, Ezequiel Garcia <ezequiel@collabora.com> Subject: [PATCH v2 for 5.4 4/4] media: hantro: Fix picture order count table enable Date: Mon, 7 Oct 2019 14:45:05 -0300 [thread overview] Message-ID: <20191007174505.10681-5-ezequiel@collabora.com> (raw) In-Reply-To: <20191007174505.10681-1-ezequiel@collabora.com> 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> --- v2: * New patch. drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c index c92460407613..05576dbd39e2 100644 --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c @@ -34,9 +34,9 @@ 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) - reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E; + reg = G1_REG_DEC_CTRL0_PICORD_COUNT_E | + 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 || -- 2.22.0
WARNING: multiple messages have this Message-ID (diff)
From: Ezequiel Garcia <ezequiel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> To: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Douglas Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, fbuergisser-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, Nicolas Dufresne <nicolas.dufresne-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>, Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>, Alexandre Courbot <acourbot-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, Jonas Karlman <jonas-uIzNG4q0ceqzQB+pC5nmwQ@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Boris Brezillon <boris.brezillon-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>, Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>, kernel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org, Ezequiel Garcia <ezequiel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Subject: [PATCH v2 for 5.4 4/4] media: hantro: Fix picture order count table enable Date: Mon, 7 Oct 2019 14:45:05 -0300 [thread overview] Message-ID: <20191007174505.10681-5-ezequiel@collabora.com> (raw) In-Reply-To: <20191007174505.10681-1-ezequiel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> From: Francois Buergisser <fbuergisser-F7+t8E8rja9g9hUCZPvPmw@public.gmane.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-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Signed-off-by: Ezequiel Garcia <ezequiel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> --- v2: * New patch. drivers/staging/media/hantro/hantro_g1_h264_dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c index c92460407613..05576dbd39e2 100644 --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c @@ -34,9 +34,9 @@ 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) - reg |= G1_REG_DEC_CTRL0_WRITE_MVS_E; + reg = G1_REG_DEC_CTRL0_PICORD_COUNT_E | + 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 || -- 2.22.0
next prev parent reply other threads:[~2019-10-07 17:47 UTC|newest] Thread overview: 40+ 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 5:27 ` Tomasz Figa 2019-10-08 6:31 ` Jonas Karlman 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 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:27 ` Tomasz Figa 2019-10-10 7:23 ` 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 2019-10-07 18:33 ` Jonas Karlman 2019-10-08 3:29 ` Tomasz Figa 2019-10-08 3:29 ` Tomasz Figa 2019-10-08 6:23 ` Jonas Karlman 2019-10-08 6:23 ` Jonas Karlman 2019-10-08 10:26 ` Tomasz Figa 2019-10-08 10:26 ` Tomasz Figa 2019-10-08 13:57 ` Jonas Karlman 2019-10-08 13:57 ` Jonas Karlman 2019-10-10 7:36 ` Tomasz Figa 2019-10-10 7:36 ` Tomasz Figa 2019-10-07 17:45 ` Ezequiel Garcia [this message] 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=20191007174505.10681-5-ezequiel@collabora.com \ --to=ezequiel@collabora.com \ --cc=acourbot@chromium.org \ --cc=boris.brezillon@collabora.com \ --cc=dianders@chromium.org \ --cc=fbuergisser@chromium.org \ --cc=heiko@sntech.de \ --cc=jonas@kwiboo.se \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.