From: Alexandre Courbot <acourbot@chromium.org>
To: Tiffany Lin <tiffany.lin@mediatek.com>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Yunfei Dong <yunfei.dong@mediatek.com>,
Maoguang Meng <maoguang.meng@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexandre Courbot <acourbot@chromium.org>
Subject: [PATCH v4 11/17] Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding"
Date: Fri, 21 Aug 2020 19:36:02 +0900 [thread overview]
Message-ID: <20200821103608.2310097-12-acourbot@chromium.org> (raw)
In-Reply-To: <20200821103608.2310097-1-acourbot@chromium.org>
This reverts commit 81735ecb62f882853a37a8c157407ec4aed44fd0.
The hardware needs data to follow the previous alignment, so this extra
space was not superfluous after all. Besides, this also made
v4l2-compliance's G_FMT and S_FMT tests regress.
Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 05743a745a11..f2ba19c32400 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -299,12 +299,14 @@ static int vidioc_try_fmt(struct v4l2_format *f,
pix_fmt_mp->num_planes = fmt->num_planes;
pix_fmt_mp->plane_fmt[0].sizeimage =
- pix_fmt_mp->width * pix_fmt_mp->height;
+ pix_fmt_mp->width * pix_fmt_mp->height +
+ ((ALIGN(pix_fmt_mp->width, 16) * 2) * 16);
pix_fmt_mp->plane_fmt[0].bytesperline = pix_fmt_mp->width;
if (pix_fmt_mp->num_planes == 2) {
pix_fmt_mp->plane_fmt[1].sizeimage =
- (pix_fmt_mp->width * pix_fmt_mp->height) / 2;
+ (pix_fmt_mp->width * pix_fmt_mp->height) / 2 +
+ (ALIGN(pix_fmt_mp->width, 16) * 16);
pix_fmt_mp->plane_fmt[2].sizeimage = 0;
pix_fmt_mp->plane_fmt[1].bytesperline =
pix_fmt_mp->width;
@@ -312,7 +314,8 @@ static int vidioc_try_fmt(struct v4l2_format *f,
} else if (pix_fmt_mp->num_planes == 3) {
pix_fmt_mp->plane_fmt[1].sizeimage =
pix_fmt_mp->plane_fmt[2].sizeimage =
- (pix_fmt_mp->width * pix_fmt_mp->height) / 4;
+ (pix_fmt_mp->width * pix_fmt_mp->height) / 4 +
+ ((ALIGN(pix_fmt_mp->width, 16) / 2) * 16);
pix_fmt_mp->plane_fmt[1].bytesperline =
pix_fmt_mp->plane_fmt[2].bytesperline =
pix_fmt_mp->width / 2;
--
2.28.0.297.g1956fa8f8d-goog
next prev parent reply other threads:[~2020-08-21 10:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 10:35 [PATCH v4 00/17] media: mtk-vcodec: venc: support for MT8183 Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 01/17] media: mtk-vcodec: abstract firmware interface Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 02/17] dt-bindings: media: mtk-vcodec: document SCP node Alexandre Courbot
2020-08-28 22:00 ` Rob Herring
2020-08-21 10:35 ` [PATCH v4 03/17] media: mtk-vcodec: add SCP firmware ops Alexandre Courbot
2020-08-21 15:13 ` kernel test robot
2020-08-26 9:19 ` Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 04/17] media: mtk-vcodec: venc: support SCP firmware Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 05/17] media: mtk-vcodec: venc: handle firmware version field Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 06/17] media: mtk-vcodec: venc: specify bitrate range per-chip Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 07/17] media: mtk-vcodec: venc: specify supported formats per-chip Alexandre Courbot
2020-08-21 10:35 ` [PATCH v4 08/17] dt-bindings: media: document mediatek,mt8183-vcodec-enc Alexandre Courbot
2020-08-21 10:36 ` [PATCH v4 09/17] arm64: dts: mt8183: add encoder node Alexandre Courbot
2020-08-27 10:03 ` Matthias Brugger
2020-08-27 10:10 ` Alexandre Courbot
2020-08-27 10:23 ` Matthias Brugger
2020-08-27 10:29 ` Alexandre Courbot
2020-08-21 10:36 ` [PATCH v4 10/17] media: mtk-vcodec: add support for MT8183 encoder Alexandre Courbot
2020-08-21 10:36 ` Alexandre Courbot [this message]
2020-08-21 10:36 ` [PATCH v4 12/17] media: mtk-vcodec: venc support MIN_OUTPUT_BUFFERS control Alexandre Courbot
2020-08-21 10:36 ` [PATCH v4 13/17] media: mtk-vcodec: venc: set OUTPUT buffers field to V4L2_FIELD_NONE Alexandre Courbot
2020-08-21 10:36 ` [PATCH v4 14/17] media: mtk-vcodec: venc: use platform data for ENUM_FRAMESIZES Alexandre Courbot
2020-08-25 5:39 ` Tiffany Lin
2020-08-21 10:36 ` [PATCH v4 15/17] media: mtk-vcodec: venc: support ENUM_FRAMESIZES on OUTPUT formats Alexandre Courbot
2020-08-25 5:46 ` Tiffany Lin
2020-08-21 10:36 ` [PATCH v4 16/17] media: mtk-vcodec: venc: set default time per frame Alexandre Courbot
2020-08-25 5:48 ` Tiffany Lin
2020-08-21 10:36 ` [PATCH v4 17/17] media: mtk-vcodec: venc: fix invalid time per frame in S_PARM Alexandre Courbot
2020-08-25 5:49 ` Tiffany Lin
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=20200821103608.2310097-12-acourbot@chromium.org \
--to=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=maoguang.meng@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=tiffany.lin@mediatek.com \
--cc=yunfei.dong@mediatek.com \
/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).