From: Nicolas Dufresne <nicolas@ndufresne.ca>
To: Maxime Ripard <maxime.ripard@bootlin.com>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Subject: Re: [RFC PATCH 18/20] lib: image-formats: Add v4l2 formats support
Date: Tue, 19 Mar 2019 19:29:18 -0400 [thread overview]
Message-ID: <d8f4a31e35b1702230ced4a0cb43c10d1c7e60c8.camel@ndufresne.ca> (raw)
In-Reply-To: <c97024b97d3261dcf41aad3c8bc1c5d9906f33c9.1553032382.git-series.maxime.ripard@bootlin.com>
Le mardi 19 mars 2019 à 22:57 +0100, Maxime Ripard a écrit :
> V4L2 uses different fourcc's than DRM, and has a different set of formats.
> For now, let's add the v4l2 fourcc's for the already existing formats.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
> ---
> include/linux/image-formats.h | 9 +++++-
> lib/image-formats.c | 67 ++++++++++++++++++++++++++++++++++++-
> 2 files changed, 76 insertions(+)
>
> diff --git a/include/linux/image-formats.h b/include/linux/image-formats.h
> index 53fd73a71b3d..fbc3a4501ebd 100644
> --- a/include/linux/image-formats.h
> +++ b/include/linux/image-formats.h
> @@ -26,6 +26,13 @@ struct image_format_info {
> };
>
> /**
> + * @v4l2_fmt:
> + *
> + * V4L2 4CC format identifier (V4L2_PIX_FMT_*)
> + */
> + u32 v4l2_fmt;
> +
> + /**
> * @depth:
> *
> * Color depth (number of bits per pixel excluding padding bits),
> @@ -222,6 +229,8 @@ image_format_info_is_yuv_sampling_444(const struct image_format_info *info)
>
> const struct image_format_info *__image_format_drm_lookup(u32 drm);
> const struct image_format_info *image_format_drm_lookup(u32 drm);
> +const struct image_format_info *__image_format_v4l2_lookup(u32 v4l2);
> +const struct image_format_info *image_format_v4l2_lookup(u32 v4l2);
> unsigned int image_format_plane_cpp(const struct image_format_info *format,
> int plane);
> unsigned int image_format_plane_width(int width,
> diff --git a/lib/image-formats.c b/lib/image-formats.c
> index 9b9a73220c5d..39f1d38ae861 100644
> --- a/lib/image-formats.c
> +++ b/lib/image-formats.c
> @@ -8,6 +8,7 @@
> static const struct image_format_info formats[] = {
> {
> .drm_fmt = DRM_FORMAT_C8,
> + .v4l2_fmt = V4L2_PIX_FMT_GREY,
> .depth = 8,
> .num_planes = 1,
> .cpp = { 1, 0, 0 },
> @@ -15,6 +16,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_RGB332,
> + .v4l2_fmt = V4L2_PIX_FMT_RGB332,
> .depth = 8,
> .num_planes = 1,
> .cpp = { 1, 0, 0 },
> @@ -29,6 +31,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_XRGB4444,
> + .v4l2_fmt = V4L2_PIX_FMT_XRGB444,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -57,6 +60,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_ARGB4444,
> + .v4l2_fmt = V4L2_PIX_FMT_ARGB444,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -89,6 +93,7 @@ static const struct image_format_info formats[] = {
> .has_alpha = true,
> }, {
> .drm_fmt = DRM_FORMAT_XRGB1555,
> + .v4l2_fmt = V4L2_PIX_FMT_XRGB555,
> .depth = 15,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -117,6 +122,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_ARGB1555,
> + .v4l2_fmt = V4L2_PIX_FMT_ARGB555,
> .depth = 15,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -149,6 +155,7 @@ static const struct image_format_info formats[] = {
> .has_alpha = true,
> }, {
> .drm_fmt = DRM_FORMAT_RGB565,
> + .v4l2_fmt = V4L2_PIX_FMT_RGB565,
> .depth = 16,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -163,6 +170,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_RGB888,
> + .v4l2_fmt = V4L2_PIX_FMT_RGB24,
> .depth = 24,
> .num_planes = 1,
> .cpp = { 3, 0, 0 },
> @@ -170,6 +178,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_BGR888,
> + .v4l2_fmt = V4L2_PIX_FMT_BGR24,
> .depth = 24,
> .num_planes = 1,
> .cpp = { 3, 0, 0 },
> @@ -177,6 +186,7 @@ static const struct image_format_info formats[] = {
> .vsub = 1,
> }, {
> .drm_fmt = DRM_FORMAT_XRGB8888,
> + .v4l2_fmt = V4L2_PIX_FMT_XRGB32,
All RGB mapping should be surrounded by ifdef, because many (not all)
DRM formats represent the order of component when placed in a CPU
register, unlike V4L2 which uses memory order. I've pick this one
randomly, but this one on most system, little endian, will match
V4L2_PIX_FMT_XBGR32. This type of complex mapping can be found in
multiple places, notably in GStreamer:
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/blob/master/sys/kms/gstkmsutils.c#L45
> .depth = 24,
> .num_planes = 1,
> .cpp = { 4, 0, 0 },
> @@ -281,6 +291,7 @@ static const struct image_format_info formats[] = {
> .has_alpha = true,
> }, {
> .drm_fmt = DRM_FORMAT_ARGB8888,
> + .v4l2_fmt = V4L2_PIX_FMT_ARGB32,
> .depth = 32,
> .num_planes = 1,
> .cpp = { 4, 0, 0 },
> @@ -361,6 +372,7 @@ static const struct image_format_info formats[] = {
> .has_alpha = true,
> }, {
> .drm_fmt = DRM_FORMAT_YUV410,
> + .v4l2_fmt = V4L2_PIX_FMT_YUV410,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -369,6 +381,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YVU410,
> + .v4l2_fmt = V4L2_PIX_FMT_YVU410,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -393,6 +406,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YUV420,
> + .v4l2_fmt = V4L2_PIX_FMT_YUV420M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -401,6 +415,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YVU420,
> + .v4l2_fmt = V4L2_PIX_FMT_YVU420M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -409,6 +424,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YUV422,
> + .v4l2_fmt = V4L2_PIX_FMT_YUV422M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -417,6 +433,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YVU422,
> + .v4l2_fmt = V4L2_PIX_FMT_YVU422M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -425,6 +442,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YUV444,
> + .v4l2_fmt = V4L2_PIX_FMT_YUV444M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -433,6 +451,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YVU444,
> + .v4l2_fmt = V4L2_PIX_FMT_YVU444M,
> .depth = 0,
> .num_planes = 3,
> .cpp = { 1, 1, 1 },
> @@ -441,6 +460,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV12,
> + .v4l2_fmt = V4L2_PIX_FMT_NV12,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -449,6 +469,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV21,
> + .v4l2_fmt = V4L2_PIX_FMT_NV21,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -457,6 +478,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV16,
> + .v4l2_fmt = V4L2_PIX_FMT_NV16,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -465,6 +487,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV61,
> + .v4l2_fmt = V4L2_PIX_FMT_NV61,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -473,6 +496,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV24,
> + .v4l2_fmt = V4L2_PIX_FMT_NV24,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -481,6 +505,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_NV42,
> + .v4l2_fmt = V4L2_PIX_FMT_NV42,
> .depth = 0,
> .num_planes = 2,
> .cpp = { 1, 2, 0 },
> @@ -489,6 +514,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YUYV,
> + .v4l2_fmt = V4L2_PIX_FMT_YUYV,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -497,6 +523,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_YVYU,
> + .v4l2_fmt = V4L2_PIX_FMT_YVYU,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -505,6 +532,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_UYVY,
> + .v4l2_fmt = V4L2_PIX_FMT_UYVY,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -513,6 +541,7 @@ static const struct image_format_info formats[] = {
> .is_yuv = true,
> }, {
> .drm_fmt = DRM_FORMAT_VYUY,
> + .v4l2_fmt = V4L2_PIX_FMT_VYUY,
> .depth = 0,
> .num_planes = 1,
> .cpp = { 2, 0, 0 },
> @@ -632,6 +661,44 @@ const struct image_format_info *image_format_drm_lookup(u32 drm)
> EXPORT_SYMBOL(image_format_drm_lookup);
>
> /**
> + * __image_format_v4l2_lookup - query information for a given format
> + * @v4l2: V4L2 fourcc pixel format (V4L2_PIX_FMT_*)
> + *
> + * The caller should only pass a supported pixel format to this function.
> + *
> + * Returns:
> + * The instance of struct image_format_info that describes the pixel format, or
> + * NULL if the format is unsupported.
> + */
> +const struct image_format_info *__image_format_v4l2_lookup(u32 v4l2)
> +{
> + return __image_format_lookup(v4l2_fmt, v4l2);
> +}
> +EXPORT_SYMBOL(__image_format_v4l2_lookup);
> +
> +/**
> + * image_format_v4l2_lookup - query information for a given format
> + * @v4l2: V4L2 fourcc pixel format (V4L2_PIX_FMT_*)
> + *
> + * The caller should only pass a supported pixel format to this function.
> + * Unsupported pixel formats will generate a warning in the kernel log.
> + *
> + * Returns:
> + * The instance of struct image_format_info that describes the pixel format, or
> + * NULL if the format is unsupported.
> + */
> +const struct image_format_info *image_format_v4l2_lookup(u32 v4l2)
> +{
> + const struct image_format_info *format;
> +
> + format = __image_format_v4l2_lookup(v4l2);
> +
> + WARN_ON(!format);
> + return format;
> +}
> +EXPORT_SYMBOL(image_format_v4l2_lookup);
> +
> +/**
> * image_format_plane_cpp - determine the bytes per pixel value
> * @format: pointer to the image_format
> * @plane: plane index
next prev parent reply other threads:[~2019-03-19 23:29 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 21:57 [RFC PATCH 00/20] drm: Split out the formats API and move it to a common place Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 01/20] drm: Remove users of drm_format_num_planes Maxime Ripard
2019-03-20 14:16 ` Paul Kocialkowski
2019-04-02 9:43 ` Emil Velikov
2019-04-02 14:51 ` Maxime Ripard
2019-04-04 16:24 ` Emil Velikov
2019-03-19 21:57 ` [RFC PATCH 02/20] drm: Remove users of drm_format_(horz|vert)_chroma_subsampling Maxime Ripard
2019-03-20 14:19 ` Paul Kocialkowski
2019-03-19 21:57 ` [RFC PATCH 03/20] drm/fourcc: Pass the format_info pointer to drm_format_plane_cpp Maxime Ripard
2019-03-20 14:24 ` Paul Kocialkowski
2019-03-21 10:13 ` Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 04/20] drm/fourcc: Pass the format_info pointer to drm_format_plane_width/height Maxime Ripard
2019-03-20 14:26 ` Paul Kocialkowski
2019-03-19 21:57 ` [RFC PATCH 05/20] drm: Replace instances of drm_format_info by drm_get_format_info Maxime Ripard
2019-03-20 14:27 ` Paul Kocialkowski
2019-03-19 21:57 ` [RFC PATCH 06/20] lib: Add video format information library Maxime Ripard
2019-03-20 13:39 ` Boris Brezillon
2019-03-21 8:20 ` Maxime Ripard
2019-03-21 8:40 ` Boris Brezillon
2019-03-19 21:57 ` [RFC PATCH 07/20] drm/fb: Move from drm_format_info to image_format_info Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 08/20] drm/malidp: Convert to generic image format library Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 09/20] drm/client: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 10/20] drm/exynos: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 11/20] drm/i915: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 12/20] drm/ipuv3: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 13/20] drm/msm: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 14/20] drm/omap: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 15/20] drm/rockchip: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 16/20] drm/tegra: " Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 17/20] drm/fourcc: Remove old DRM format API Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 18/20] lib: image-formats: Add v4l2 formats support Maxime Ripard
2019-03-19 23:29 ` Nicolas Dufresne [this message]
2019-03-20 14:27 ` Ville Syrjälä
2019-03-20 15:51 ` Nicolas Dufresne
[not found] ` <20190320160939.GR3888@intel.com>
2019-03-20 16:30 ` Nicolas Dufresne
[not found] ` <20190320164133.GT3888@intel.com>
2019-03-20 18:27 ` Nicolas Dufresne
2019-03-20 18:39 ` Ville Syrjälä
2019-03-21 16:04 ` Paul Kocialkowski
2019-03-21 16:35 ` Ville Syrjälä
2019-03-21 19:14 ` Nicolas Dufresne
2019-03-21 21:44 ` Ville Syrjälä
2019-03-22 18:24 ` Nicolas Dufresne
2019-03-22 18:44 ` Ville Syrjälä
2019-03-22 19:25 ` Nicolas Dufresne
2019-03-22 14:42 ` Ville Syrjälä
2019-03-22 18:11 ` Nicolas Dufresne
2019-03-20 18:15 ` Brian Starkey
2019-03-21 15:47 ` Maxime Ripard
2019-03-22 19:55 ` Nicolas Dufresne
2019-04-01 14:44 ` Maxime Ripard
2019-04-11 7:24 ` Hans Verkuil
2019-04-11 7:38 ` Hans Verkuil
2019-04-11 15:55 ` Maxime Ripard
2019-04-11 7:12 ` Hans Verkuil
2019-04-11 7:15 ` Hans Verkuil
2019-03-19 21:57 ` [RFC PATCH 19/20] lib: image-formats: Add more functions Maxime Ripard
2019-03-19 21:57 ` [RFC PATCH 20/20] media: sun6i: Convert to the image format API Maxime Ripard
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=d8f4a31e35b1702230ced4a0cb43c10d1c7e60c8.camel@ndufresne.ca \
--to=nicolas@ndufresne.ca \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hans.verkuil@cisco.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=paul.kocialkowski@bootlin.com \
--cc=sakari.ailus@linux.intel.com \
--cc=seanpaul@chromium.org \
--cc=thomas.petazzoni@bootlin.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).