Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <bbb6660439bb66bd9d81bb8031d9062d3c03fdf0.camel@ndufresne.ca>
Subject: Re: [PATCH v7 2/9] media: vivid: Convert to v4l2_ext_pix_format
From:   Nicolas Dufresne <nicolas@ndufresne.ca>
To:     Randy Li <ayaka@soulik.info>, Tomasz Figa <tfiga@chromium.org>
Cc:     linux-media@vger.kernel.org, randy.li@synaptics.com,
        Brian.Starkey@arm.com, boris.brezillon@collabora.com,
        frkoenig@chromium.org, hans.verkuil@cisco.com, hiroh@chromium.org,
        hverkuil@xs4all.nl, kernel@collabora.com,
        laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org,
        mchehab@kernel.org, narmstrong@baylibre.com, sakari.ailus@iki.fi,
        stanimir.varbanov@linaro.org,
        Helen Koike <helen.koike@collabora.com>
Date:   Thu, 20 Jul 2023 16:09:58 -0400
In-Reply-To: <46d15120-6e19-e224-47f3-e0dcbf0aeda5@soulik.info>
References: <20230206043308.28365-1-ayaka@soulik.info>
         <20230206043308.28365-3-ayaka@soulik.info>
         <20230713103912.favcnhqwjkzvsa6b@chromium.org>
         <46d15120-6e19-e224-47f3-e0dcbf0aeda5@soulik.info>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) 
MIME-Version: 1.0
Precedence: bulk

Le mardi 18 juillet 2023 =C3=A0 00:00 +0800, Randy Li a =C3=A9crit=C2=A0:
> On 2023/7/13 18:39, Tomasz Figa wrote:
> > On Mon, Feb 06, 2023 at 12:33:01PM +0800, ayaka wrote:
> > > From: Helen Koike <helen.koike@collabora.com>
> > >=20
> > > Simplify Multi/Single planer API handling by converting to v4l2_ext_p=
ix_format.
> > >=20
> > > Duplicate v4l2_ioctl_ops for touch devices. This is done to force the
> > > framework to use the ext hooks when the classic Api is used from
> > > userspace in Vid devices, and to keep touch devices with classic hook=
.
> > >=20
> > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> > > Signed-off-by: Helen Koike <helen.koike@collabora.com>
> > > ---
> > > Changes in v7:
> > > - Force the userspace using the new APIs to operate non-touch drivers=
.
> > The primary objective of Linux development is not to break the
> > userspace. We can't just remove the old API, especially not from
> > existing drivers.
> Maybe I should create a new virtual driver here? It is impossible to=20
> support the new fourcc modifier with the old APIs.

For MPLANE, where backward compatibility was built into libv4l2 LD_PRELOAD
wrapper, it simply failed the cases that could not be supported (non contig=
uous
planes).

regards,
Nicolas

> >=20
> > [snip]
> > >   int vivid_try_fmt_vid_cap(struct file *file, void *priv,
> > > -			struct v4l2_format *f)
> > > +			  struct v4l2_ext_pix_format *f)
> > >   {
> > > -	struct v4l2_pix_format_mplane *mp =3D &f->fmt.pix_mp;
> > > -	struct v4l2_plane_pix_format *pfmt =3D mp->plane_fmt;
> > >   	struct vivid_dev *dev =3D video_drvdata(file);
> > > +	struct v4l2_plane_pix_format *pfmt =3D f->plane_fmt;
> > >   	const struct vivid_fmt *fmt;
> > >   	unsigned bytesperline, max_bpl;
> > >   	unsigned factor =3D 1;
> > >   	unsigned w, h;
> > >   	unsigned p;
> > > -	bool user_set_csc =3D !!(mp->flags & V4L2_PIX_FMT_FLAG_SET_CSC);
> > Why is this condition being removed?
>=20
> Because the v4l2_ext_pix has a struct for the colorspace?
>=20
> Would you like the idea that driver exports a buffer contains all the=20
> info for an enumeration ?
>=20
> >=20
> > Best regards,
> > Tomasz
> >=20
> > >  =20
> > > -	fmt =3D vivid_get_format(dev, mp->pixelformat);
> > > +	fmt =3D vivid_get_format(dev, f->pixelformat);
> > >   	if (!fmt) {
> > >   		dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
> > > -			mp->pixelformat);
> > > -		mp->pixelformat =3D V4L2_PIX_FMT_YUYV;
> > > -		fmt =3D vivid_get_format(dev, mp->pixelformat);
> > > +			f->pixelformat);
> > > +		f->pixelformat =3D V4L2_PIX_FMT_YUYV;
> > > +		fmt =3D vivid_get_format(dev, f->pixelformat);
> > >   	}
> > >  =20
> > > -	mp->field =3D vivid_field_cap(dev, mp->field);
> > > +	f->field =3D vivid_field_cap(dev, f->field);
> > >   	if (vivid_is_webcam(dev)) {
> > >   		const struct v4l2_frmsize_discrete *sz =3D
> > >   			v4l2_find_nearest_size(webcam_sizes,
> > >   					       VIVID_WEBCAM_SIZES, width,
> > > -					       height, mp->width, mp->height);
> > > +					       height, f->width, f->height);
> > >  =20
> > >   		w =3D sz->width;
> > >   		h =3D sz->height;
> > > @@ -604,14 +603,14 @@ int vivid_try_fmt_vid_cap(struct file *file, vo=
id *priv,
> > >   		w =3D dev->src_rect.width;
> > >   		h =3D dev->src_rect.height;
> > >   	}
> > > -	if (V4L2_FIELD_HAS_T_OR_B(mp->field))
> > > +	if (V4L2_FIELD_HAS_T_OR_B(f->field))
> > >   		factor =3D 2;
> > >   	if (vivid_is_webcam(dev) ||
> > >   	    (!dev->has_scaler_cap && !dev->has_crop_cap && !dev->has_compo=
se_cap)) {
> > > -		mp->width =3D w;
> > > -		mp->height =3D h / factor;
> > > +		f->width =3D w;
> > > +		f->height =3D h / factor;
> > >   	} else {
> > > -		struct v4l2_rect r =3D { 0, 0, mp->width, mp->height * factor };
> > > +		struct v4l2_rect r =3D { 0, 0, f->width, f->height * factor };
> > >  =20
> > >   		v4l2_rect_set_min_size(&r, &vivid_min_rect);
> > >   		v4l2_rect_set_max_size(&r, &vivid_max_rect);
> > > @@ -624,16 +623,15 @@ int vivid_try_fmt_vid_cap(struct file *file, vo=
id *priv,
> > >   		} else if (!dev->has_scaler_cap && !dev->has_crop_cap) {
> > >   			v4l2_rect_set_min_size(&r, &dev->src_rect);
> > >   		}
> > > -		mp->width =3D r.width;
> > > -		mp->height =3D r.height / factor;
> > > +		f->width =3D r.width;
> > > +		f->height =3D r.height / factor;
> > >   	}
> > >  =20
> > >   	/* This driver supports custom bytesperline values */
> > >  =20
> > > -	mp->num_planes =3D fmt->buffers;
> > >   	for (p =3D 0; p < fmt->buffers; p++) {
> > >   		/* Calculate the minimum supported bytesperline value */
> > > -		bytesperline =3D (mp->width * fmt->bit_depth[p]) >> 3;
> > > +		bytesperline =3D (f->width * fmt->bit_depth[p]) >> 3;
> > >   		/* Calculate the maximum supported bytesperline value */
> > >   		max_bpl =3D (MAX_ZOOM * MAX_WIDTH * fmt->bit_depth[p]) >> 3;
> > >  =20
> > > @@ -642,48 +640,49 @@ int vivid_try_fmt_vid_cap(struct file *file, vo=
id *priv,
> > >   		if (pfmt[p].bytesperline < bytesperline)
> > >   			pfmt[p].bytesperline =3D bytesperline;
> > >  =20
> > > -		pfmt[p].sizeimage =3D (pfmt[p].bytesperline * mp->height) /
> > > +		pfmt[p].sizeimage =3D (pfmt[p].bytesperline * f->height) /
> > >   				fmt->vdownsampling[p] + fmt->data_offset[p];
> > > -
> > > -		memset(pfmt[p].reserved, 0, sizeof(pfmt[p].reserved));
> > >   	}
> > > +
> > > +	if (p < VIDEO_MAX_PLANES)
> > > +		pfmt[p].sizeimage =3D 0;
> > > +
> > >   	for (p =3D fmt->buffers; p < fmt->planes; p++)
> > > -		pfmt[0].sizeimage +=3D (pfmt[0].bytesperline * mp->height *
> > > +		pfmt[0].sizeimage +=3D (pfmt[0].bytesperline * f->height *
> > >   			(fmt->bit_depth[p] / fmt->vdownsampling[p])) /
> > >   			(fmt->bit_depth[0] / fmt->vdownsampling[0]);
> > >  =20
> > > -	if (!user_set_csc || !v4l2_is_colorspace_valid(mp->colorspace))
> > > -		mp->colorspace =3D vivid_colorspace_cap(dev);
> > > +	if (!v4l2_is_colorspace_valid(f->colorspace))
> > > +		f->colorspace =3D vivid_colorspace_cap(dev);
> > >  =20
> > > -	if (!user_set_csc || !v4l2_is_xfer_func_valid(mp->xfer_func))
> > > -		mp->xfer_func =3D vivid_xfer_func_cap(dev);
> > > +	if (!v4l2_is_xfer_func_valid(f->xfer_func))
> > > +		f->xfer_func =3D vivid_xfer_func_cap(dev);
> > >  =20
> > >   	if (fmt->color_enc =3D=3D TGP_COLOR_ENC_HSV) {
> > > -		if (!user_set_csc || !v4l2_is_hsv_enc_valid(mp->hsv_enc))
> > > -			mp->hsv_enc =3D vivid_hsv_enc_cap(dev);
> > > +		if (!v4l2_is_hsv_enc_valid(f->hsv_enc))
> > > +			f->hsv_enc =3D vivid_hsv_enc_cap(dev);
> > >   	} else if (fmt->color_enc =3D=3D TGP_COLOR_ENC_YCBCR) {
> > > -		if (!user_set_csc || !v4l2_is_ycbcr_enc_valid(mp->ycbcr_enc))
> > > -			mp->ycbcr_enc =3D vivid_ycbcr_enc_cap(dev);
> > > +		if (!v4l2_is_ycbcr_enc_valid(f->ycbcr_enc))
> > > +			f->ycbcr_enc =3D vivid_ycbcr_enc_cap(dev);
> > >   	} else {
> > > -		mp->ycbcr_enc =3D vivid_ycbcr_enc_cap(dev);
> > > +		f->ycbcr_enc =3D vivid_ycbcr_enc_cap(dev);
> > >   	}
> > >  =20
> > >   	if (fmt->color_enc =3D=3D TGP_COLOR_ENC_YCBCR ||
> > >   	    fmt->color_enc =3D=3D TGP_COLOR_ENC_RGB) {
> > > -		if (!user_set_csc || !v4l2_is_quant_valid(mp->quantization))
> > > -			mp->quantization =3D vivid_quantization_cap(dev);
> > > +		if (!v4l2_is_quant_valid(f->quantization))
> > > +			f->quantization =3D vivid_quantization_cap(dev);
> > >   	} else {
> > > -		mp->quantization =3D vivid_quantization_cap(dev);
> > > +		f->quantization =3D vivid_quantization_cap(dev);
> > >   	}
> > >  =20
> > > -	memset(mp->reserved, 0, sizeof(mp->reserved));
> > > +	memset(f->reserved, 0, sizeof(f->reserved));
> > >   	return 0;
> > >   }
> > [snip]
>=20