| Message ID | 20200804192939.2251988-5-helen.koike@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: v4l2: Add extended fmt and buffer ioctls | expand |
On Wed, Aug 5, 2020 at 4:32 AM Helen Koike <helen.koike@collabora.com> wrote: > > Just a new version of v4l2_fill_mbus_format() and v4l2_fill_ext_pix_format() > to deal with the new v4l2_ext_pix_format struct. > This is needed to convert the VIMC driver to the EXT_FMT/EXT_BUF iocts. > > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> > Signed-off-by: Helen Koike <helen.koike@collabora.com> > --- > Changes in v4: > - Add helper v4l2_fill_ext_pix_format() > - Rebased on top of media/master (post 5.8-rc1) > > Changes in v3: > - Rebased on top of media/master (post 5.4-rc1) > > Changes in v2: > - New patch > --- > include/media/v4l2-mediabus.h | 42 +++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h > index 45f88f0248c4e..8133407377f7d 100644 > --- a/include/media/v4l2-mediabus.h > +++ b/include/media/v4l2-mediabus.h > @@ -119,6 +119,26 @@ v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, > pix_fmt->xfer_func = mbus_fmt->xfer_func; > } > > +/** > + * v4l2_fill_ext_pix_format - Ancillary routine that fills a &struct I feel the names of these functions are maybe too generic - maybe they should carry the fact that the source is a mbus or ext_pix format? > + * v4l2_ext_pix_format fields from a &struct v4l2_mbus_framefmt. > + * > + * @pix_fmt: pointer to &struct v4l2_ext_pix_format to be filled > + * @mbus_fmt: pointer to &struct v4l2_mbus_framefmt to be used as model > + */ > +static inline void > +v4l2_fill_ext_pix_format(struct v4l2_ext_pix_format *pix_fmt, > + const struct v4l2_mbus_framefmt *mbus_fmt) > +{ > + pix_fmt->width = mbus_fmt->width; > + pix_fmt->height = mbus_fmt->height; > + pix_fmt->field = mbus_fmt->field; > + pix_fmt->colorspace = mbus_fmt->colorspace; > + pix_fmt->ycbcr_enc = mbus_fmt->ycbcr_enc; > + pix_fmt->quantization = mbus_fmt->quantization; > + pix_fmt->xfer_func = mbus_fmt->xfer_func; > +} > + > /** > * v4l2_fill_pix_format - Ancillary routine that fills a &struct > * v4l2_mbus_framefmt from a &struct v4l2_pix_format and a > @@ -182,4 +202,26 @@ v4l2_fill_mbus_format_mplane(struct v4l2_mbus_framefmt *mbus_fmt, > mbus_fmt->xfer_func = pix_mp_fmt->xfer_func; > } > > +/** > + * v4l2_fill_mbus_format_ext - Ancillary routine that fills a &struct > + * v4l2_mbus_framefmt from a &struct v4l2_ext_pix_format. > + * > + * @mbus_fmt: pointer to &struct v4l2_mbus_framefmt to be filled > + * @pix_fmt: pointer to &struct v4l2_ext_pix_format to be used as model > + * @code: data format code (from &enum v4l2_mbus_pixelcode) > + */ > +static inline void > +v4l2_fill_mbus_format_ext(struct v4l2_mbus_framefmt *mbus_fmt, > + const struct v4l2_ext_pix_format *pix_fmt, u32 code) > +{ > + mbus_fmt->width = pix_fmt->width; > + mbus_fmt->height = pix_fmt->height; > + mbus_fmt->field = pix_fmt->field; > + mbus_fmt->colorspace = pix_fmt->colorspace; > + mbus_fmt->ycbcr_enc = pix_fmt->ycbcr_enc; > + mbus_fmt->quantization = pix_fmt->quantization; > + mbus_fmt->xfer_func = pix_fmt->xfer_func; > + mbus_fmt->code = code; > +} > + > #endif > -- > 2.28.0.rc2 >
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index 45f88f0248c4e..8133407377f7d 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h @@ -119,6 +119,26 @@ v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, pix_fmt->xfer_func = mbus_fmt->xfer_func; } +/** + * v4l2_fill_ext_pix_format - Ancillary routine that fills a &struct + * v4l2_ext_pix_format fields from a &struct v4l2_mbus_framefmt. + * + * @pix_fmt: pointer to &struct v4l2_ext_pix_format to be filled + * @mbus_fmt: pointer to &struct v4l2_mbus_framefmt to be used as model + */ +static inline void +v4l2_fill_ext_pix_format(struct v4l2_ext_pix_format *pix_fmt, + const struct v4l2_mbus_framefmt *mbus_fmt) +{ + pix_fmt->width = mbus_fmt->width; + pix_fmt->height = mbus_fmt->height; + pix_fmt->field = mbus_fmt->field; + pix_fmt->colorspace = mbus_fmt->colorspace; + pix_fmt->ycbcr_enc = mbus_fmt->ycbcr_enc; + pix_fmt->quantization = mbus_fmt->quantization; + pix_fmt->xfer_func = mbus_fmt->xfer_func; +} + /** * v4l2_fill_pix_format - Ancillary routine that fills a &struct * v4l2_mbus_framefmt from a &struct v4l2_pix_format and a @@ -182,4 +202,26 @@ v4l2_fill_mbus_format_mplane(struct v4l2_mbus_framefmt *mbus_fmt, mbus_fmt->xfer_func = pix_mp_fmt->xfer_func; } +/** + * v4l2_fill_mbus_format_ext - Ancillary routine that fills a &struct + * v4l2_mbus_framefmt from a &struct v4l2_ext_pix_format. + * + * @mbus_fmt: pointer to &struct v4l2_mbus_framefmt to be filled + * @pix_fmt: pointer to &struct v4l2_ext_pix_format to be used as model + * @code: data format code (from &enum v4l2_mbus_pixelcode) + */ +static inline void +v4l2_fill_mbus_format_ext(struct v4l2_mbus_framefmt *mbus_fmt, + const struct v4l2_ext_pix_format *pix_fmt, u32 code) +{ + mbus_fmt->width = pix_fmt->width; + mbus_fmt->height = pix_fmt->height; + mbus_fmt->field = pix_fmt->field; + mbus_fmt->colorspace = pix_fmt->colorspace; + mbus_fmt->ycbcr_enc = pix_fmt->ycbcr_enc; + mbus_fmt->quantization = pix_fmt->quantization; + mbus_fmt->xfer_func = pix_fmt->xfer_func; + mbus_fmt->code = code; +} + #endif