Messages in this thread | | | Subject | Re: [PATCH 3/4] media: imx-csi: add frame size/interval enumeration | From | Steve Longerbeam <> | Date | Sun, 19 Mar 2017 15:18:16 -0700 |
| |
On 03/19/2017 03:49 AM, Russell King wrote: > Add frame size and frame interval enumeration to CSI. > > CSI can scale the image independently horizontally and vertically by a > factor of two, which enumerates to four different frame sizes. > > CSI can also drop frames, resulting in frame rate reduction, so > enumerate the resulting possible output frame rates. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > drivers/staging/media/imx/imx-media-csi.c | 51 +++++++++++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 65346e789dd6..d19659d7ddc2 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -1073,6 +1073,55 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd, > return ret; > } > > +static int csi_enum_frame_size(struct v4l2_subdev *sd, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + struct csi_priv *priv = v4l2_get_subdevdata(sd); > + struct v4l2_mbus_framefmt *fmt; > + int ret = 0; > + > + if (fse->pad >= CSI_NUM_PADS || > + fse->index > (fse->pad == CSI_SINK_PAD ? 0 : 3)) > + return -EINVAL; > + > + mutex_lock(&priv->lock); > + fmt = __csi_get_fmt(priv, cfg, fse->pad, fse->which); > + fse->min_width = fse->max_width = fse->index & 1 ? > + fmt->width >> 1 : fmt->width; > + fse->min_height = fse->max_height = fse->index & 2 ? > + fmt->height >> 1 : fmt->height; > + mutex_unlock(&priv->lock); > + > + return ret; > +}
This will only enumerate the currently set/tried format at the sink pad. But the sink pad supports a range of widths/heights.
I think this function should call csi_try_fmt() at the sink pad.
The other media drivers do the same, they return a supported range at the sinks rather than only the last set/tried values.
So the sink enumeration should return a continuous range. The source enumeration should behave the same as you have it above however, i.e. a discrete set of 4 possibilities since the CSI is limited to only /2 downsizing in both dimensions.
Steve
> + > +static int csi_enum_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_interval_enum *fie) > +{ > + struct csi_priv *priv = v4l2_get_subdevdata(sd); > + struct v4l2_mbus_framefmt *fmt; > + int ret = 0; > + > + if (fie->pad >= CSI_NUM_PADS || > + fie->index >= (fie->pad == CSI_SINK_PAD ? 1 : ARRAY_SIZE(csi_skip))) > + return -EINVAL; > + > + mutex_lock(&priv->lock); > + fmt = __csi_get_fmt(priv, cfg, fie->pad, fie->which); > + if ((fie->width == fmt->width || fie->width == fmt->width / 2) && > + (fie->height == fmt->height || fie->height == fmt->height / 2)) { > + fie->interval = priv->frame_interval; > + csi_apply_skip_interval(&csi_skip[fie->index], &fie->interval); > + } else { > + ret = -EINVAL; > + } > + mutex_unlock(&priv->lock); > + > + return ret; > +} > + > static int csi_get_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *sdformat) > @@ -1473,6 +1522,8 @@ static struct v4l2_subdev_video_ops csi_video_ops = { > > static struct v4l2_subdev_pad_ops csi_pad_ops = { > .enum_mbus_code = csi_enum_mbus_code, > + .enum_frame_size = csi_enum_frame_size, > + .enum_frame_interval = csi_enum_frame_interval, > .get_fmt = csi_get_fmt, > .set_fmt = csi_set_fmt, > .get_selection = csi_get_selection,
| |