Hi Kaneko-san,
On Tue, 21 Oct 2014, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
>
> At the time of NV16 capture format, the user has to specify the
> capture output width of the multiple of 32 for H/W specification.
> At the time of using NV16 format by ioctl of VIDIOC_S_FMT,
> this patch adds align check and the error handling to forbid
> specification of the capture output width which is not a multiple of 32.
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
> ---
>
> v3 [Yoshihiro Kaneko]
> * fixes some code-style and remove useless error flag as suggested by
> Sergei Shtylyov
>
> v2 [Yoshihiro Kaneko]
> * use u32 instead of unsigned long
>
> drivers/media/platform/soc_camera/rcar_vin.c | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index dd6daab..ecdbd48 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
[snip]
> @@ -1605,6 +1610,15 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
> dev_dbg(dev, "S_FMT(pix=0x%x, %ux%u)\n",
> pixfmt, pix->width, pix->height);
>
> + /*
> + * At the time of NV16 capture format, the user has to specify the
> + * width of the multiple of 32 for H/W specification.
> + */
> + if ((pixfmt == V4L2_PIX_FMT_NV16) && (pix->width & 0x1F)) {
> + dev_err(icd->parent, "Specified width error in NV16 format.\n");
> + return -EINVAL;
> + }
> +
Shouldn't these checks go into rcar_vin_try_fmt() and then just adjust the
width instead of erroring out?
Thanks
Guennadi
> switch (pix->field) {
> default:
> pix->field = V4L2_FIELD_NONE;
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
