From: Jonas Karlman <jonas@kwiboo.se>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Ezequiel Garcia <ezequiel@collabora.com>
Cc: Jonas Karlman <jonas@kwiboo.se>,
Hans Verkuil <hverkuil@xs4all.nl>,
Boris Brezillon <boris.brezillon@collabora.com>,
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: [PATCH v3 2/5] media: hantro: Reduce H264 extra space for motion vectors
Date: Wed, 6 Nov 2019 22:34:21 +0000 [thread overview]
Message-ID: <HE1PR06MB4011FF930111A869E4645C8CAC790@HE1PR06MB4011.eurprd06.prod.outlook.com> (raw)
In-Reply-To: <20191106223408.2176-1-jonas@kwiboo.se>
A decoded 8-bit 4:2:0 frame need memory for up to 448 bytes per
macroblock with additional 32 bytes on multi-core variants.
Memory layout is as follow:
+---------------------------+
| Y-plane 256 bytes x MBs |
+---------------------------+
| UV-plane 128 bytes x MBs |
+---------------------------+
| MV buffer 64 bytes x MBs |
+---------------------------+
| MC sync 32 bytes |
+---------------------------+
Reduce the extra space allocated now that motion vector buffer offset no
longer is based on the extra space.
Only allocate extra space for 64 bytes x MBs of motion vector buffer
and 32 bytes for multi-core sync.
Fixes: a9471e25629b ("media: hantro: Add core bits to support H264 decoding")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v3:
- add memory layout to code comment (Boris)
Changes in v2:
- updated commit message
---
drivers/staging/media/hantro/hantro_v4l2.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
index 3dae52abb96c..c8c896a06f58 100644
--- a/drivers/staging/media/hantro/hantro_v4l2.c
+++ b/drivers/staging/media/hantro/hantro_v4l2.c
@@ -240,14 +240,30 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f,
v4l2_fill_pixfmt_mp(pix_mp, fmt->fourcc, pix_mp->width,
pix_mp->height);
/*
+ * A decoded 8-bit 4:2:0 NV12 frame may need memory for up to
+ * 448 bytes per macroblock with additional 32 bytes on
+ * multi-core variants.
+ *
* The H264 decoder needs extra space on the output buffers
* to store motion vectors. This is needed for reference
* frames.
+ *
+ * Memory layout is as follow:
+ *
+ * +---------------------------+
+ * | Y-plane 256 bytes x MBs |
+ * +---------------------------+
+ * | UV-plane 128 bytes x MBs |
+ * +---------------------------+
+ * | MV buffer 64 bytes x MBs |
+ * +---------------------------+
+ * | MC sync 32 bytes |
+ * +---------------------------+
*/
if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_H264_SLICE)
pix_mp->plane_fmt[0].sizeimage +=
- 128 * DIV_ROUND_UP(pix_mp->width, 16) *
- DIV_ROUND_UP(pix_mp->height, 16);
+ 64 * MB_WIDTH(pix_mp->width) *
+ MB_WIDTH(pix_mp->height) + 32;
} else if (!pix_mp->plane_fmt[0].sizeimage) {
/*
* For coded formats the application can specify
--
2.17.1
next prev parent reply other threads:[~2019-11-06 22:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 22:32 [PATCH v3 0/5] media: hantro: H264 fixes and improvements Jonas Karlman
2019-11-06 22:34 ` [PATCH v3 1/5] media: hantro: Fix H264 motion vector buffer offset Jonas Karlman
2019-11-20 12:40 ` Tomasz Figa
[not found] ` <20191106223408.2176-1-jonas@kwiboo.se>
2019-11-06 22:34 ` Jonas Karlman [this message]
2019-11-20 12:44 ` [PATCH v3 2/5] media: hantro: Reduce H264 extra space for motion vectors Tomasz Figa
2019-12-09 18:11 ` Ezequiel Garcia
2020-01-08 12:59 ` Tomasz Figa
2020-01-08 15:10 ` Jonas Karlman
2020-01-16 3:56 ` Tomasz Figa
2019-11-06 22:34 ` [PATCH v3 3/5] media: hantro: Use output buffer width and height for H264 decoding Jonas Karlman
2019-11-09 19:04 ` Boris Brezillon
2019-11-06 22:35 ` [PATCH v3 4/5] media: hantro: Remove now unused H264 pic_size Jonas Karlman
[not found] ` <20191106223456.2231-1-jonas@kwiboo.se>
2019-11-06 22:35 ` [PATCH v3 5/5] media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly 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=HE1PR06MB4011FF930111A869E4645C8CAC790@HE1PR06MB4011.eurprd06.prod.outlook.com \
--to=jonas@kwiboo.se \
--cc=boris.brezillon@collabora.com \
--cc=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--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).