From: Helen Koike <helen.koike@collabora.com>
To: "André Almeida" <andrealmeid@collabora.com>, linux-media@vger.kernel.org
Cc: mchehab@kernel.org, hverkuil@xs4all.nl, lucmaga@gmail.com,
linux-kernel@vger.kernel.org, kernel@collabora.com,
lkcamp@lists.libreplanetbr.org
Subject: Re: [PATCH v2 07/15] media: vimc: cap: Add multiplanar formats
Date: Fri, 12 Apr 2019 19:49:13 -0300 [thread overview]
Message-ID: <fa00d040-edcb-11b2-d9f7-40ea264684b2@collabora.com> (raw)
In-Reply-To: <20190327151743.18528-8-andrealmeid@collabora.com>
On 3/27/19 12:17 PM, André Almeida wrote:
> Add multiplanar formats to be exposed to the userspace as
> supported formats. Since we don't want to support multiplanar
> formats when the driver is in singleplanar mode, we only access
> the multiplanar formats array if the multiplanar mode is enabled.
>
> Signed-off-by: André Almeida <andrealmeid@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> Changes in v2:
> - Change line break style
> - Add TODO comment
>
> drivers/media/platform/vimc/vimc-capture.c | 34 ++++++++++++++++++++--
> 1 file changed, 32 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
> index 5e13c6580aff..a65611be63bb 100644
> --- a/drivers/media/platform/vimc/vimc-capture.c
> +++ b/drivers/media/platform/vimc/vimc-capture.c
> @@ -32,6 +32,10 @@
> #define IS_MULTIPLANAR(vcap) \
> (vcap->vdev.device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE)
>
> +/**
> + * TODO: capture device should only enum formats that all subdevices on
> + * topology accepts
> + */
> static const u32 vimc_cap_supported_pixfmt[] = {
> V4L2_PIX_FMT_BGR24,
> V4L2_PIX_FMT_RGB24,
> @@ -58,6 +62,19 @@ static const u32 vimc_cap_supported_pixfmt[] = {
> V4L2_PIX_FMT_SRGGB12,
> };
>
> +static const u32 vimc_cap_supported_pixfmt_mp[] = {
> + V4L2_PIX_FMT_YUV420M,
> + V4L2_PIX_FMT_YVU420M,
> + V4L2_PIX_FMT_YUV422M,
> + V4L2_PIX_FMT_YVU422M,
> + V4L2_PIX_FMT_YUV444M,
> + V4L2_PIX_FMT_YVU444M,
> + V4L2_PIX_FMT_NV12M,
> + V4L2_PIX_FMT_NV21M,
> + V4L2_PIX_FMT_NV16M,
> + V4L2_PIX_FMT_NV61M,
> +};
> +
> struct vimc_cap_device {
> struct vimc_ent_device ved;
> struct video_device vdev;
> @@ -157,13 +174,26 @@ static int _vimc_cap_try_fmt_vid_cap_mp(struct file *file, void *priv,
> format->width, format->height);
> }
>
> +/**
> + * When multiplanar is true, consider that the vimc_cap_enum_fmt_vid_cap_mp
> + * is concantenate in the vimc_cap_enum_fmt_vid_cap array. Otherwise, just
> + * consider the single-planar array
> + */
> static int vimc_cap_enum_fmt_vid_cap(struct file *file, void *priv,
> struct v4l2_fmtdesc *f)
> {
> - if (f->index >= ARRAY_SIZE(vimc_cap_supported_pixfmt))
> + struct vimc_cap_device *vcap = video_drvdata(file);
> + const unsigned int sp_size = ARRAY_SIZE(vimc_cap_supported_pixfmt);
> + const unsigned int mp_size = ARRAY_SIZE(vimc_cap_supported_pixfmt_mp);
> +
> + if (f->index >= sp_size + (IS_MULTIPLANAR(vcap) ? mp_size : 0))
> return -EINVAL;
>
> - f->pixelformat = vimc_cap_supported_pixfmt[f->index];
> + if (f->index >= sp_size)
> + f->pixelformat =
> + vimc_cap_supported_pixfmt_mp[f->index - sp_size];
> + else
> + f->pixelformat = vimc_cap_supported_pixfmt[f->index];
>
> return 0;
> }
>
next prev parent reply other threads:[~2019-04-12 22:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 15:17 [PATCH v2 00/15] media: vimc: Add support for multiplanar formats André Almeida
2019-03-27 15:17 ` [PATCH v2 01/15] media: Move sp2mp functions to v4l2-common André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 02/15] media: vimc: Remove unnecessary stream checks André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 03/15] media: vimc: cap: Change vimc_cap_device.format type André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 04/15] media: vimc: cap: Dynamically define stream pixelformat André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 05/15] media: vimc: cap: Add handler for singleplanar fmt ioctls André Almeida
2019-04-12 22:48 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 06/15] media: vimc: cap: Add handler for multiplanar " André Almeida
2019-03-27 15:17 ` [PATCH v2 07/15] media: vimc: cap: Add multiplanar formats André Almeida
2019-04-12 22:49 ` Helen Koike [this message]
2019-03-27 15:17 ` [PATCH v2 08/15] media: vimc: cap: Add multiplanar default format André Almeida
2019-04-12 22:49 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 09/15] media: vimc: cap: Allocate and verify mplanar buffers André Almeida
2019-04-12 22:49 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 10/15] media: vimc: Propagate multiplanar state in the stream André Almeida
2019-04-12 22:50 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 11/15] media: vimc: Add and use new struct vimc_frame André Almeida
2019-04-16 15:17 ` Helen Koike
2019-03-27 15:17 ` [PATCH v2 12/15] media: vimc: sen: Add support for multiplanar formats André Almeida
2019-03-27 15:17 ` [PATCH v2 13/15] media: vimc: sca: " André Almeida
2019-03-27 15:17 ` [PATCH v2 14/15] media: vimc: cap: " André Almeida
2019-03-27 15:17 ` [PATCH v2 15/15] media: vimc: Create multiplanar parameter André Almeida
2019-04-12 22:50 ` Helen Koike
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=fa00d040-edcb-11b2-d9f7-40ea264684b2@collabora.com \
--to=helen.koike@collabora.com \
--cc=andrealmeid@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lkcamp@lists.libreplanetbr.org \
--cc=lucmaga@gmail.com \
--cc=mchehab@kernel.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).