From: Alexandre Courbot <acourbot@chromium.org>
To: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Cc: "Linux Media Mailing List" <linux-media@vger.kernel.org>,
kernel@collabora.com,
"Andrew-CT Chen" <andrew-ct.chen@mediatek.com>,
courbot@chromium.org, "Dafna Hirschfeld" <dafna3@gmail.com>,
eizan@chromium.org, houlong.wei@mediatek.com,
"Hsin-Yi Wang" <hsinyi@chromium.org>,
"Hans Verkuil" <hverkuil@xs4all.nl>,
"Irui Wang" <irui.wang@mediatek.com>,
LKML <linux-kernel@vger.kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
"Maoguang Meng (孟毛广)" <maoguang.meng@mediatek.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
minghsiu.tsai@mediatek.com, "Tomasz Figa" <tfiga@chromium.org>,
"Tiffany Lin" <tiffany.lin@mediatek.com>
Subject: Re: [PATCH v2 5/7] media: mtk-vcodec: replace func vidioc_try_fmt with two funcs for out/cap
Date: Mon, 27 Dec 2021 16:06:16 +0900 [thread overview]
Message-ID: <CAPBb6MXyV7K3NuSLCWApC_TNjhFW=+3Eb_7d2028Nyno7fnkMA@mail.gmail.com> (raw)
In-Reply-To: <20211117130635.11633-6-dafna.hirschfeld@collabora.com>
On Wed, Nov 17, 2021 at 10:07 PM Dafna Hirschfeld
<dafna.hirschfeld@collabora.com> wrote:
>
> The function vidioc_try_fmt has a big 'if-else' for
> the capture and output cases. There is hardly any code
> outside of that condition. It is therefore better to split
> that functions into two different functions, one for each case.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Makes much more sense that way, thanks!
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
> ---
> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 149 +++++++++---------
> 1 file changed, 72 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index fb3cf804c96a..be28f2401839 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> @@ -263,87 +263,82 @@ static struct mtk_q_data *mtk_venc_get_q_data(struct mtk_vcodec_ctx *ctx,
> return &ctx->q_data[MTK_Q_DATA_DST];
> }
>
> +static void vidioc_try_fmt_cap(struct v4l2_format *f)
> +{
> + f->fmt.pix_mp.field = V4L2_FIELD_NONE;
> + f->fmt.pix_mp.num_planes = 1;
> + f->fmt.pix_mp.plane_fmt[0].bytesperline = 0;
> + f->fmt.pix_mp.flags = 0;
> +}
> +
> /* V4L2 specification suggests the driver corrects the format struct if any of
> * the dimensions is unsupported
> */
> -static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx, struct v4l2_format *f,
> - const struct mtk_video_fmt *fmt)
> +static int vidioc_try_fmt_out(struct mtk_vcodec_ctx *ctx, struct v4l2_format *f,
> + const struct mtk_video_fmt *fmt)
> {
> struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp;
> + int tmp_w, tmp_h;
> + unsigned int max_width, max_height;
>
> pix_fmt_mp->field = V4L2_FIELD_NONE;
>
> - if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> - pix_fmt_mp->num_planes = 1;
> - pix_fmt_mp->plane_fmt[0].bytesperline = 0;
> - } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> - int tmp_w, tmp_h;
> - unsigned int max_width, max_height;
> -
> - if (ctx->dev->enc_capability & MTK_VENC_4K_CAPABILITY_ENABLE) {
> - max_width = MTK_VENC_4K_MAX_W;
> - max_height = MTK_VENC_4K_MAX_H;
> - } else {
> - max_width = MTK_VENC_HD_MAX_W;
> - max_height = MTK_VENC_HD_MAX_H;
> - }
> + if (ctx->dev->enc_capability & MTK_VENC_4K_CAPABILITY_ENABLE) {
> + max_width = MTK_VENC_4K_MAX_W;
> + max_height = MTK_VENC_4K_MAX_H;
> + } else {
> + max_width = MTK_VENC_HD_MAX_W;
> + max_height = MTK_VENC_HD_MAX_H;
> + }
>
> - pix_fmt_mp->height = clamp(pix_fmt_mp->height,
> - MTK_VENC_MIN_H,
> - max_height);
> - pix_fmt_mp->width = clamp(pix_fmt_mp->width,
> - MTK_VENC_MIN_W,
> - max_width);
> + pix_fmt_mp->height = clamp(pix_fmt_mp->height, MTK_VENC_MIN_H, max_height);
> + pix_fmt_mp->width = clamp(pix_fmt_mp->width, MTK_VENC_MIN_W, max_width);
>
> - /* find next closer width align 16, heign align 32, size align
> - * 64 rectangle
> - */
> - tmp_w = pix_fmt_mp->width;
> - tmp_h = pix_fmt_mp->height;
> - v4l_bound_align_image(&pix_fmt_mp->width,
> - MTK_VENC_MIN_W,
> - max_width, 4,
> - &pix_fmt_mp->height,
> - MTK_VENC_MIN_H,
> - max_height, 5, 6);
> -
> - if (pix_fmt_mp->width < tmp_w &&
> - (pix_fmt_mp->width + 16) <= max_width)
> - pix_fmt_mp->width += 16;
> - if (pix_fmt_mp->height < tmp_h &&
> - (pix_fmt_mp->height + 32) <= max_height)
> - pix_fmt_mp->height += 32;
> -
> - mtk_v4l2_debug(0,
> - "before resize width=%d, height=%d, after resize width=%d, height=%d, sizeimage=%d %d",
> - tmp_w, tmp_h, pix_fmt_mp->width,
> - pix_fmt_mp->height,
> - pix_fmt_mp->plane_fmt[0].sizeimage,
> - pix_fmt_mp->plane_fmt[1].sizeimage);
> -
> - pix_fmt_mp->num_planes = fmt->num_planes;
> - pix_fmt_mp->plane_fmt[0].sizeimage =
> - 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 +
> - (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;
> - pix_fmt_mp->plane_fmt[2].bytesperline = 0;
> - } 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 +
> - ((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;
> - }
> + /* find next closer width align 16, heign align 32, size align
> + * 64 rectangle
> + */
> + tmp_w = pix_fmt_mp->width;
> + tmp_h = pix_fmt_mp->height;
> + v4l_bound_align_image(&pix_fmt_mp->width,
> + MTK_VENC_MIN_W,
> + max_width, 4,
> + &pix_fmt_mp->height,
> + MTK_VENC_MIN_H,
> + max_height, 5, 6);
> +
> + if (pix_fmt_mp->width < tmp_w && (pix_fmt_mp->width + 16) <= max_width)
> + pix_fmt_mp->width += 16;
> + if (pix_fmt_mp->height < tmp_h && (pix_fmt_mp->height + 32) <= max_height)
> + pix_fmt_mp->height += 32;
> +
> + mtk_v4l2_debug(0, "before resize w=%d, h=%d, after resize w=%d, h=%d, sizeimage=%d %d",
> + tmp_w, tmp_h, pix_fmt_mp->width,
> + pix_fmt_mp->height,
> + pix_fmt_mp->plane_fmt[0].sizeimage,
> + pix_fmt_mp->plane_fmt[1].sizeimage);
> +
> + pix_fmt_mp->num_planes = fmt->num_planes;
> + pix_fmt_mp->plane_fmt[0].sizeimage =
> + 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 +
> + (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;
> + pix_fmt_mp->plane_fmt[2].bytesperline = 0;
> + } 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 +
> + ((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;
> }
>
> pix_fmt_mp->flags = 0;
> @@ -432,9 +427,7 @@ static int vidioc_venc_s_fmt_cap(struct file *file, void *priv,
> }
>
> q_data->fmt = fmt;
> - ret = vidioc_try_fmt(ctx, f, q_data->fmt);
> - if (ret)
> - return ret;
> + vidioc_try_fmt_cap(f);
>
> q_data->coded_width = f->fmt.pix_mp.width;
> q_data->coded_height = f->fmt.pix_mp.height;
> @@ -494,7 +487,7 @@ static int vidioc_venc_s_fmt_out(struct file *file, void *priv,
> f->fmt.pix.pixelformat = fmt->fourcc;
> }
>
> - ret = vidioc_try_fmt(ctx, f, fmt);
> + ret = vidioc_try_fmt_out(ctx, f, fmt);
> if (ret)
> return ret;
>
> @@ -572,7 +565,9 @@ static int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv,
> f->fmt.pix_mp.quantization = ctx->quantization;
> f->fmt.pix_mp.xfer_func = ctx->xfer_func;
>
> - return vidioc_try_fmt(ctx, f, fmt);
> + vidioc_try_fmt_cap(f);
> +
> + return 0;
> }
>
> static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
> @@ -594,7 +589,7 @@ static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
> f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT;
> }
>
> - return vidioc_try_fmt(ctx, f, fmt);
> + return vidioc_try_fmt_out(ctx, f, fmt);
> }
>
> static int vidioc_venc_g_selection(struct file *file, void *priv,
> --
> 2.17.1
>
next prev parent reply other threads:[~2021-12-27 7:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 13:06 [PATCH v2 0/7] media: mtk-vcodec: few fixes Dafna Hirschfeld
2021-11-17 13:06 ` [PATCH v2 1/7] media: mtk-vcodec: enc: add vp8 profile ctrl Dafna Hirschfeld
2021-11-17 13:06 ` [PATCH v2 2/7] media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released Dafna Hirschfeld
2021-12-27 7:06 ` Alexandre Courbot
2021-11-17 13:06 ` [PATCH v2 3/7] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Dafna Hirschfeld
2021-11-25 8:30 ` Hans Verkuil
2021-11-17 13:06 ` [PATCH v2 4/7] media: mtk-vcodec: fix debugging defines Dafna Hirschfeld
2021-11-17 13:06 ` [PATCH v2 5/7] media: mtk-vcodec: replace func vidioc_try_fmt with two funcs for out/cap Dafna Hirschfeld
2021-12-27 7:06 ` Alexandre Courbot [this message]
2021-11-17 13:06 ` [PATCH v2 6/7] media: mtk-vcodec: don't check return val of mtk_venc_get_q_data Dafna Hirschfeld
2021-12-27 7:06 ` Alexandre Courbot
2021-11-17 13:06 ` [PATCH v2 7/7] meida: mtk-vcodec: remove unused func parameter Dafna Hirschfeld
2021-11-18 14:35 ` Nicolas Dufresne
2021-12-27 7:06 ` Alexandre Courbot
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='CAPBb6MXyV7K3NuSLCWApC_TNjhFW=+3Eb_7d2028Nyno7fnkMA@mail.gmail.com' \
--to=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=courbot@chromium.org \
--cc=dafna.hirschfeld@collabora.com \
--cc=dafna3@gmail.com \
--cc=eizan@chromium.org \
--cc=houlong.wei@mediatek.com \
--cc=hsinyi@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=irui.wang@mediatek.com \
--cc=kernel@collabora.com \
--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=mchehab@kernel.org \
--cc=minghsiu.tsai@mediatek.com \
--cc=tfiga@chromium.org \
--cc=tiffany.lin@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).