From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: sre@kernel.org
Subject: [PATCH v3 05/18] smiapp: Provide a common function to obtain native pixel array size
Date: Tue, 20 Sep 2016 01:02:38 +0300 [thread overview]
Message-ID: <1474322571-20290-6-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1474322571-20290-1-git-send-email-sakari.ailus@linux.intel.com>
The same pixel array size is required for the active format of each
sub-device sink pad and try format of each sink pad of each opened file
handle as well as for the native size rectangle.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/smiapp/smiapp-core.c | 39 +++++++++++++++++-----------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 86c0d7c..e5d4584 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2161,6 +2161,15 @@ static int smiapp_set_crop(struct v4l2_subdev *subdev,
return 0;
}
+static void smiapp_get_native_size(struct smiapp_subdev *ssd,
+ struct v4l2_rect *r)
+{
+ r->top = 0;
+ r->left = 0;
+ r->width = ssd->sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
+ r->height = ssd->sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
+}
+
static int __smiapp_get_selection(struct v4l2_subdev *subdev,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_selection *sel)
@@ -2192,17 +2201,12 @@ static int __smiapp_get_selection(struct v4l2_subdev *subdev,
switch (sel->target) {
case V4L2_SEL_TGT_CROP_BOUNDS:
case V4L2_SEL_TGT_NATIVE_SIZE:
- if (ssd == sensor->pixel_array) {
- sel->r.left = sel->r.top = 0;
- sel->r.width =
- sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
- sel->r.height =
- sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
- } else if (sel->pad == ssd->sink_pad) {
+ if (ssd == sensor->pixel_array)
+ smiapp_get_native_size(ssd, &sel->r);
+ else if (sel->pad == ssd->sink_pad)
sel->r = sink_fmt;
- } else {
+ else
sel->r = *comp;
- }
break;
case V4L2_SEL_TGT_CROP:
case V4L2_SEL_TGT_COMPOSE_BOUNDS:
@@ -2564,10 +2568,8 @@ static void smiapp_create_subdev(struct smiapp_sensor *sensor,
sizeof(ssd->sd.name), "%s %s %d-%4.4x", sensor->minfo.name,
name, i2c_adapter_id(client->adapter), client->addr);
- ssd->sink_fmt.width =
- sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
- ssd->sink_fmt.height =
- sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
+ smiapp_get_native_size(ssd, &ssd->sink_fmt);
+
ssd->compose.width = ssd->sink_fmt.width;
ssd->compose.height = ssd->sink_fmt.height;
ssd->crop[ssd->source_pad] = ssd->compose;
@@ -2840,16 +2842,13 @@ static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
struct v4l2_rect *try_crop = v4l2_subdev_get_try_crop(sd, fh->pad, i);
struct v4l2_rect *try_comp;
- try_fmt->width = sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
- try_fmt->height = sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
+ smiapp_get_native_size(ssd, try_crop);
+
+ try_fmt->width = try_crop->width;
+ try_fmt->height = try_crop->height;
try_fmt->code = mbus_code;
try_fmt->field = V4L2_FIELD_NONE;
- try_crop->top = 0;
- try_crop->left = 0;
- try_crop->width = try_fmt->width;
- try_crop->height = try_fmt->height;
-
if (ssd != sensor->pixel_array)
continue;
--
2.1.4
next prev parent reply other threads:[~2016-09-19 22:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 22:02 [PATCH v3 00/18] More smiapp cleanups, fixes Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 01/18] smiapp: Move sub-device initialisation into a separate function Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 02/18] smiapp: Explicitly define number of pads in initialisation Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 03/18] smiapp: Initialise media entity after sensor init Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 04/18] smiapp: Split off sub-device registration into two Sakari Ailus
2016-09-19 22:02 ` Sakari Ailus [this message]
2016-09-19 22:02 ` [PATCH v3 06/18] smiapp: Remove unnecessary BUG_ON()'s Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 07/18] smiapp: Always initialise the sensor in probe Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 08/18] smiapp: Fix resource management in registration failure Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 09/18] smiapp: Merge smiapp_init() with smiapp_probe() Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 10/18] smiapp: Read frame format earlier Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 11/18] smiapp: Unify setting up sub-devices Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 12/18] smiapp: Use SMIAPP_PADS when referring to number of pads Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 13/18] smiapp: Obtain frame layout from the frame descriptor Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 14/18] smiapp: Improve debug messages from frame layout reading Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 15/18] smiapp: Remove useless newlines and other small cleanups Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 16/18] smiapp: Obtain correct media bus code for try format Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 17/18] smiapp: Drop a debug print on frame size and bit depth Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 18/18] smiapp-pll: Don't complain aloud about failing PLL calculation Sakari Ailus
2016-09-19 23:27 ` [PATCH v3 00/18] More smiapp cleanups, fixes Sebastian Reichel
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=1474322571-20290-6-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.kernel.org \
--cc=sre@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).