From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: gregkh@linuxfoundation.org, mchehab@kernel.org,
hverkuil-cisco@xs4all.nl, linux-usb@vger.kernel.org,
linux-media@vger.kernel.org, kernel@pengutronix.de,
Daniel Scally <dan.scally@ideasonboard.com>
Subject: Re: [PATCH v3 5/5] usb: uvc: use v4l2_fill_fmtdesc instead of open coded format name
Date: Fri, 27 Jan 2023 01:26:36 +0200 [thread overview]
Message-ID: <Y9MMLFDSFftPFGZg@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20230126231456.3402323-6-m.grzeschik@pengutronix.de>
Hi Michael,
Thank you for the patch.
On Fri, Jan 27, 2023 at 12:14:56AM +0100, Michael Grzeschik wrote:
> Since v4l2_fill_fmtdesc will be called in the ioctl v4l_enum_fmt anyway.
> We can set the format description and compressed flag from v4l_fill_fmtdesc
> and can remove the extra name field in uvc_format_desc.
>
> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
> Tested-by: Daniel Scally <dan.scally@ideasonboard.com>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Happy to see the name field being dropped.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> v1 -> v2: - added reviewed and tested tags
> v2 -> v3: - removed corresponding code in uvc_driver
> - using call from v4l_enum_fmt in uvc_v4l2.c
>
> drivers/media/common/uvc.c | 38 --------------------------
> drivers/usb/gadget/function/uvc_v4l2.c | 6 ----
> include/linux/usb/uvc.h | 1 -
> 3 files changed, 45 deletions(-)
>
> diff --git a/drivers/media/common/uvc.c b/drivers/media/common/uvc.c
> index 2b4df3e8f48aa6..9c0ba7a6c185b1 100644
> --- a/drivers/media/common/uvc.c
> +++ b/drivers/media/common/uvc.c
> @@ -13,192 +13,154 @@
>
> static const struct uvc_format_desc uvc_fmts[] = {
> {
> - .name = "YUV 4:2:2 (YUYV)",
> .guid = UVC_GUID_FORMAT_YUY2,
> .fcc = V4L2_PIX_FMT_YUYV,
> },
> {
> - .name = "YUV 4:2:2 (YUYV)",
> .guid = UVC_GUID_FORMAT_YUY2_ISIGHT,
> .fcc = V4L2_PIX_FMT_YUYV,
> },
> {
> - .name = "YUV 4:2:0 (NV12)",
> .guid = UVC_GUID_FORMAT_NV12,
> .fcc = V4L2_PIX_FMT_NV12,
> },
> {
> - .name = "MJPEG",
> .guid = UVC_GUID_FORMAT_MJPEG,
> .fcc = V4L2_PIX_FMT_MJPEG,
> },
> {
> - .name = "YVU 4:2:0 (YV12)",
> .guid = UVC_GUID_FORMAT_YV12,
> .fcc = V4L2_PIX_FMT_YVU420,
> },
> {
> - .name = "YUV 4:2:0 (I420)",
> .guid = UVC_GUID_FORMAT_I420,
> .fcc = V4L2_PIX_FMT_YUV420,
> },
> {
> - .name = "YUV 4:2:0 (M420)",
> .guid = UVC_GUID_FORMAT_M420,
> .fcc = V4L2_PIX_FMT_M420,
> },
> {
> - .name = "YUV 4:2:2 (UYVY)",
> .guid = UVC_GUID_FORMAT_UYVY,
> .fcc = V4L2_PIX_FMT_UYVY,
> },
> {
> - .name = "Greyscale 8-bit (Y800)",
> .guid = UVC_GUID_FORMAT_Y800,
> .fcc = V4L2_PIX_FMT_GREY,
> },
> {
> - .name = "Greyscale 8-bit (Y8 )",
> .guid = UVC_GUID_FORMAT_Y8,
> .fcc = V4L2_PIX_FMT_GREY,
> },
> {
> - .name = "Greyscale 8-bit (D3DFMT_L8)",
> .guid = UVC_GUID_FORMAT_D3DFMT_L8,
> .fcc = V4L2_PIX_FMT_GREY,
> },
> {
> - .name = "IR 8-bit (L8_IR)",
> .guid = UVC_GUID_FORMAT_KSMEDIA_L8_IR,
> .fcc = V4L2_PIX_FMT_GREY,
> },
> {
> - .name = "Greyscale 10-bit (Y10 )",
> .guid = UVC_GUID_FORMAT_Y10,
> .fcc = V4L2_PIX_FMT_Y10,
> },
> {
> - .name = "Greyscale 12-bit (Y12 )",
> .guid = UVC_GUID_FORMAT_Y12,
> .fcc = V4L2_PIX_FMT_Y12,
> },
> {
> - .name = "Greyscale 16-bit (Y16 )",
> .guid = UVC_GUID_FORMAT_Y16,
> .fcc = V4L2_PIX_FMT_Y16,
> },
> {
> - .name = "BGGR Bayer (BY8 )",
> .guid = UVC_GUID_FORMAT_BY8,
> .fcc = V4L2_PIX_FMT_SBGGR8,
> },
> {
> - .name = "BGGR Bayer (BA81)",
> .guid = UVC_GUID_FORMAT_BA81,
> .fcc = V4L2_PIX_FMT_SBGGR8,
> },
> {
> - .name = "GBRG Bayer (GBRG)",
> .guid = UVC_GUID_FORMAT_GBRG,
> .fcc = V4L2_PIX_FMT_SGBRG8,
> },
> {
> - .name = "GRBG Bayer (GRBG)",
> .guid = UVC_GUID_FORMAT_GRBG,
> .fcc = V4L2_PIX_FMT_SGRBG8,
> },
> {
> - .name = "RGGB Bayer (RGGB)",
> .guid = UVC_GUID_FORMAT_RGGB,
> .fcc = V4L2_PIX_FMT_SRGGB8,
> },
> {
> - .name = "RGB565",
> .guid = UVC_GUID_FORMAT_RGBP,
> .fcc = V4L2_PIX_FMT_RGB565,
> },
> {
> - .name = "BGR 8:8:8 (BGR3)",
> .guid = UVC_GUID_FORMAT_BGR3,
> .fcc = V4L2_PIX_FMT_BGR24,
> },
> {
> - .name = "BGRA/X 8:8:8:8 (BGR4)",
> .guid = UVC_GUID_FORMAT_BGR4,
> .fcc = V4L2_PIX_FMT_XBGR32,
> },
> {
> - .name = "H.264",
> .guid = UVC_GUID_FORMAT_H264,
> .fcc = V4L2_PIX_FMT_H264,
> },
> {
> - .name = "H.265",
> .guid = UVC_GUID_FORMAT_H265,
> .fcc = V4L2_PIX_FMT_HEVC,
> },
> {
> - .name = "Greyscale 8 L/R (Y8I)",
> .guid = UVC_GUID_FORMAT_Y8I,
> .fcc = V4L2_PIX_FMT_Y8I,
> },
> {
> - .name = "Greyscale 12 L/R (Y12I)",
> .guid = UVC_GUID_FORMAT_Y12I,
> .fcc = V4L2_PIX_FMT_Y12I,
> },
> {
> - .name = "Depth data 16-bit (Z16)",
> .guid = UVC_GUID_FORMAT_Z16,
> .fcc = V4L2_PIX_FMT_Z16,
> },
> {
> - .name = "Bayer 10-bit (SRGGB10P)",
> .guid = UVC_GUID_FORMAT_RW10,
> .fcc = V4L2_PIX_FMT_SRGGB10P,
> },
> {
> - .name = "Bayer 16-bit (SBGGR16)",
> .guid = UVC_GUID_FORMAT_BG16,
> .fcc = V4L2_PIX_FMT_SBGGR16,
> },
> {
> - .name = "Bayer 16-bit (SGBRG16)",
> .guid = UVC_GUID_FORMAT_GB16,
> .fcc = V4L2_PIX_FMT_SGBRG16,
> },
> {
> - .name = "Bayer 16-bit (SRGGB16)",
> .guid = UVC_GUID_FORMAT_RG16,
> .fcc = V4L2_PIX_FMT_SRGGB16,
> },
> {
> - .name = "Bayer 16-bit (SGRBG16)",
> .guid = UVC_GUID_FORMAT_GR16,
> .fcc = V4L2_PIX_FMT_SGRBG16,
> },
> {
> - .name = "Depth data 16-bit (Z16)",
> .guid = UVC_GUID_FORMAT_INVZ,
> .fcc = V4L2_PIX_FMT_Z16,
> },
> {
> - .name = "Greyscale 10-bit (Y10 )",
> .guid = UVC_GUID_FORMAT_INVI,
> .fcc = V4L2_PIX_FMT_Y10,
> },
> {
> - .name = "IR:Depth 26-bit (INZI)",
> .guid = UVC_GUID_FORMAT_INZI,
> .fcc = V4L2_PIX_FMT_INZI,
> },
> {
> - .name = "4-bit Depth Confidence (Packed)",
> .guid = UVC_GUID_FORMAT_CNF4,
> .fcc = V4L2_PIX_FMT_CNF4,
> },
> {
> - .name = "HEVC",
> .guid = UVC_GUID_FORMAT_HEVC,
> .fcc = V4L2_PIX_FMT_HEVC,
> },
> diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c
> index 21e573e628f4e7..3f0a9795c0d45d 100644
> --- a/drivers/usb/gadget/function/uvc_v4l2.c
> +++ b/drivers/usb/gadget/function/uvc_v4l2.c
> @@ -374,15 +374,9 @@ uvc_v4l2_enum_format(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> if (!uformat)
> return -EINVAL;
>
> - if (uformat->type != UVCG_UNCOMPRESSED)
> - f->flags |= V4L2_FMT_FLAG_COMPRESSED;
> -
> fmtdesc = to_uvc_format(uformat);
> f->pixelformat = fmtdesc->fcc;
>
> - strscpy(f->description, fmtdesc->name, sizeof(f->description));
> - f->description[strlen(fmtdesc->name) - 1] = 0;
> -
> return 0;
> }
>
> diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h
> index b0210c5c5406b3..88d96095bcb163 100644
> --- a/include/linux/usb/uvc.h
> +++ b/include/linux/usb/uvc.h
> @@ -149,7 +149,6 @@
> 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
>
> struct uvc_format_desc {
> - char *name;
> u8 guid[16];
> u32 fcc;
> };
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2023-01-26 23:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 23:14 [PATCH v3 0/5] [PATCH v3] usb: uvc: improve header files and function use Michael Grzeschik
2023-01-26 23:14 ` [PATCH v3 1/5] media: uvcvideo: Add GUID for BGRA/X 8:8:8:8 Michael Grzeschik
2023-01-26 23:14 ` [PATCH v3 2/5] usb: uvc: move media/v4l2-uvc.h to usb/uvc.h Michael Grzeschik
2023-01-26 23:14 ` [PATCH v3 3/5] usb: uvc: move uvc_fmts and uvc_format_by_guid to own compile unit Michael Grzeschik
2023-01-26 23:14 ` [PATCH v3 4/5] usb: uvc: make uvc_format_desc table const Michael Grzeschik
2023-01-26 23:14 ` [PATCH v3 5/5] usb: uvc: use v4l2_fill_fmtdesc instead of open coded format name Michael Grzeschik
2023-01-26 23:26 ` Laurent Pinchart [this message]
2023-01-31 8:41 ` [PATCH v3 0/5] [PATCH v3] usb: uvc: improve header files and function use Greg KH
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=Y9MMLFDSFftPFGZg@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dan.scally@ideasonboard.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--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 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.