From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
tomi.valkeinen@ideasonboard.com, bingbu.cao@intel.com,
hongju.wang@intel.com, hverkuil@xs4all.nl,
Andrey Konovalov <andrey.konovalov@linaro.org>,
Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
Dmitry Perchanov <dmitry.perchanov@intel.com>,
"Ng, Khai Wen" <khai.wen.ng@intel.com>
Subject: [PATCH v6 12/28] media: v4l: subdev: Add helpers for format, crop and compose pointers
Date: Tue, 3 Oct 2023 15:07:57 +0300 [thread overview]
Message-ID: <20231003120813.77726-3-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20231003115237.76828-1-sakari.ailus@linux.intel.com>
Add a helper for obtaining format, crop and compose pointers. These are
convenient for drivers, independently of the driver uses streams or not.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-subdev.c | 54 ++++++++++++++++++++++----
include/media/v4l2-subdev.h | 56 +++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 8 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index d295a4e87b66..854f9d4db923 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1573,19 +1573,57 @@ v4l2_subdev_init_stream_configs(struct v4l2_subdev_stream_configs *stream_config
return 0;
}
+struct v4l2_mbus_framefmt
+*v4l2_subdev_get_fmt_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream)
+{
+ if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
+ return v4l2_subdev_state_get_stream_format(state, pad, stream);
+
+ if (pad < sd->entity.num_pads && stream == 0)
+ return v4l2_subdev_get_pad_format(sd, state, pad);
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_subdev_get_fmt_ptr);
+
+struct v4l2_rect
+*v4l2_subdev_get_crop_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream)
+{
+ if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
+ return v4l2_subdev_state_get_stream_crop(state, pad, stream);
+
+ if (pad < sd->entity.num_pads && stream == 0)
+ return v4l2_subdev_get_pad_crop(sd, state, pad);
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_subdev_get_crop_ptr);
+
+struct v4l2_rect
+*v4l2_subdev_get_compose_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream)
+{
+ if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
+ return v4l2_subdev_state_get_stream_compose(state, pad, stream);
+
+ if (pad < sd->entity.num_pads && stream == 0)
+ return v4l2_subdev_get_pad_compose(sd, state, pad);
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_subdev_get_compose_ptr);
+
int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
{
struct v4l2_mbus_framefmt *fmt;
- if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
- fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
- format->stream);
- else if (format->pad < sd->entity.num_pads && format->stream == 0)
- fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
- else
- fmt = NULL;
-
+ fmt = v4l2_subdev_get_fmt_ptr(sd, state, format->pad, format->stream);
if (!fmt)
return -EINVAL;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5f59ff0796b7..7c34243ffed9 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -1479,6 +1479,62 @@ v4l2_subdev_lock_and_get_active_state(struct v4l2_subdev *sd)
#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
+/**
+ * v4l2_subdev_get_fmt_ptr - Obtain a pointer to V4L2 sub-device format for pad
+ * and stream
+ * @sd: subdevice
+ * @state: subdevice state
+ * @pad: the pad on the sub-device
+ * @stream: stream in the pad
+ *
+ * For given pad and stream, obtain a pointer to the mbus format from the
+ * sub-device.
+ *
+ * Returns NULL if the format is not found or the parameters are invalid.
+ */
+struct v4l2_mbus_framefmt *
+v4l2_subdev_get_fmt_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream);
+
+/**
+ * v4l2_subdev_get_crop_ptr - Obtain a pointer to V4L2 sub-device crop
+ * rectangle for pad and stream
+ * @sd: subdevice
+ * @state: subdevice state
+ * @pad: the pad on the sub-device
+ * @stream: stream in the pad
+ *
+ * For given pad and stream, obtain a pointer to the crop selection rectangle
+ * from the sub-device.
+ *
+ * Returns NULL if the selection rectangle is not found or the parameters are
+ * invalid.
+ */
+struct v4l2_rect *
+v4l2_subdev_get_crop_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream);
+
+/**
+ * v4l2_subdev_get_compose_ptr - Obtain a pointer to V4L2 sub-device compose
+ * rectangle for pad and stream
+ * @sd: subdevice
+ * @state: subdevice state
+ * @pad: the pad on the sub-device
+ * @stream: stream in the pad
+ *
+ * For given pad and stream, obtain a pointer to the compose selection rectangle
+ * from the sub-device.
+ *
+ * Returns NULL if the selection rectangle is not found or the parameters are
+ * invalid.
+ */
+struct v4l2_rect *
+v4l2_subdev_get_compose_ptr(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state, unsigned int pad,
+ unsigned int stream);
+
/**
* v4l2_subdev_get_fmt() - Fill format based on state
* @sd: subdevice
--
2.39.2
next prev parent reply other threads:[~2023-10-03 12:08 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 11:52 [PATCH v6 00/28] Generic line based metadata support, internal pads Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 01/28] media: mc: Add INTERNAL pad flag Sakari Ailus
2023-10-05 9:52 ` Hans Verkuil
2023-10-05 10:22 ` Sakari Ailus
2023-10-05 11:16 ` Hans Verkuil
2023-10-25 21:17 ` Sakari Ailus
2023-10-11 19:22 ` Sakari Ailus
2023-10-05 11:04 ` Tomi Valkeinen
2023-10-11 19:35 ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 02/28] media: uapi: Add generic serial metadata mbus formats Sakari Ailus
[not found] ` <20231027144742.GC19539@pendragon.ideasonboard.com>
2023-10-27 20:43 ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 03/28] media: uapi: Document which mbus format fields are valid for metadata Sakari Ailus
2023-10-05 11:28 ` Tomi Valkeinen
2023-10-11 19:41 ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 04/28] media: uapi: Add generic 8-bit metadata format definitions Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 05/28] media: v4l: Support line-based metadata capture Sakari Ailus
2023-10-05 10:00 ` Hans Verkuil
2023-10-03 11:52 ` [PATCH v6 06/28] media: uapi: ccs: Add media bus code for MIPI CCS embedded data Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 07/28] media: Documentation: ccs: Document routing Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 08/28] media: Documentation: Additional streams generally don't harm capture Sakari Ailus
2023-10-05 11:40 ` Tomi Valkeinen
2023-10-03 11:52 ` [PATCH v6 09/28] media: Documentation: Document embedded data guidelines for camera sensors Sakari Ailus
2023-10-05 10:10 ` Hans Verkuil
2023-10-05 11:53 ` Tomi Valkeinen
2023-10-05 14:13 ` Sakari Ailus
2023-10-05 14:11 ` Sakari Ailus
2023-10-05 10:14 ` Hans Verkuil
2023-10-05 14:35 ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 10/28] media: Documentation: v4l: Document source routes Sakari Ailus
2023-10-05 10:26 ` Hans Verkuil
2023-10-09 17:31 ` Sakari Ailus
2023-10-05 12:37 ` Tomi Valkeinen
2023-10-09 17:26 ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 11/28] media: Documentation: Document S_ROUTING behaviour Sakari Ailus
2023-10-05 12:59 ` Tomi Valkeinen
2023-10-12 20:00 ` Sakari Ailus
2023-10-03 12:07 ` Sakari Ailus [this message]
2023-10-05 13:12 ` [PATCH v6 12/28] media: v4l: subdev: Add helpers for format, crop and compose pointers Tomi Valkeinen
2023-10-13 6:05 ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 13/28] media: v4l: subdev: Add a function to lock two sub-device states, use it Sakari Ailus
2023-10-09 10:34 ` Tomi Valkeinen
2023-10-25 21:11 ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 14/28] media: v4l: subdev: Move G_ROUTING handling below S_ROUTING Sakari Ailus
2023-10-09 10:36 ` Tomi Valkeinen
2023-10-25 21:05 ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 15/28] media: v4l: subdev: Copy argument back to user also for S_ROUTING Sakari Ailus
2023-10-05 10:37 ` Hans Verkuil
2023-10-12 20:09 ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 16/28] media: v4l: subdev: Add len_routes field to struct v4l2_subdev_routing Sakari Ailus
2023-10-05 11:00 ` Hans Verkuil
2023-11-28 13:30 ` Sakari Ailus
2023-12-04 13:36 ` Hans Verkuil
2023-10-03 12:08 ` [PATCH v6 17/28] media: v4l: subdev: Return routes set using S_ROUTING Sakari Ailus
2023-10-05 11:05 ` Hans Verkuil
2023-10-25 20:12 ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 18/28] media: uapi: Allow a larger number of routes than there's room for Sakari Ailus
2023-10-05 11:08 ` Hans Verkuil
2023-10-25 21:00 ` Sakari Ailus
2023-10-09 10:56 ` Tomi Valkeinen
2023-10-25 21:07 ` Laurent Pinchart
[not found] ` <adaadd6e-c163-4c3a-b851-b2de184b5b5e@xs4all.nl>
2023-10-30 7:57 ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 19/28] media: v4l: subdev: Add trivial set_routing support Sakari Ailus
2023-10-09 11:09 ` Tomi Valkeinen
2023-10-03 12:08 ` [PATCH v6 20/28] media: uapi: v4l: subdev: Enable streams API Sakari Ailus
2023-10-09 12:52 ` Tomi Valkeinen
2023-10-25 21:13 ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 21/28] media: ccs: No need to set streaming to false in power off Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 22/28] media: ccs: Use {enable,disable}_streams operations Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 23/28] media: ccs: Track streaming state Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 24/28] media: ccs: Move ccs_validate_csi_data_format up Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 25/28] media: ccs: Support frame descriptors Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 26/28] media: ccs: Add support for embedded data stream Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 27/28] media: ccs: Remove ccs_get_crop_compose helper Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 28/28] media: ccs: Rely on sub-device state locking Sakari Ailus
2023-10-05 8:05 ` [PATCH v6 00/28] Generic line based metadata support, internal pads Tomi Valkeinen
2023-10-05 9:04 ` Sakari Ailus
2023-10-05 11:17 ` Tomi Valkeinen
2023-10-09 12:16 ` Sakari Ailus
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=20231003120813.77726-3-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=andrey.konovalov@linaro.org \
--cc=bingbu.cao@intel.com \
--cc=dmitry.perchanov@intel.com \
--cc=hongju.wang@intel.com \
--cc=hverkuil@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=khai.wen.ng@intel.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=tomi.valkeinen@ideasonboard.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 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.