lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Thu, 19 Nov 2020 13:23:19 -0300
From:   Helen Koike <helen.koike@...labora.com>
To:     Alexandre Courbot <acourbot@...omium.org>
Cc:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        Hans Verkuil <hans.verkuil@...co.com>,
        Laurent Pinchart <laurent.pinchart@...asonboard.com>,
        Sakari Ailus <sakari.ailus@....fi>,
        Linux Media Mailing List <linux-media@...r.kernel.org>,
        Boris Brezillon <boris.brezillon@...labora.com>,
        Tomasz Figa <tfiga@...omium.org>,
        Hirokazu Honda <hiroh@...omium.org>,
        Nicolas Dufresne <nicolas@...fresne.ca>,
        Brian Starkey <Brian.Starkey@....com>, kernel@...labora.com,
        narmstrong@...libre.com, LKML <linux-kernel@...r.kernel.org>,
        frkoenig@...omium.org, Maxime Jourdan <mjourdan@...libre.com>,
        Stanimir Varbanov <stanimir.varbanov@...aro.org>
Subject: Re: [PATCH v5 1/7] media: v4l2: Extend pixel formats to unify
 single/multi-planar handling (and more)

Hi Alexandre,

Thanks for your review.

On 8/14/20 4:49 AM, Alexandre Courbot wrote:
> On Wed, Aug 5, 2020 at 4:32 AM Helen Koike <helen.koike@...labora.com> wrote:
>>
>> This is part of the multiplanar and singleplanar unification process.
>> v4l2_ext_pix_format is supposed to work for both cases.
>>
>> We also add the concept of modifiers already employed in DRM to expose
>> HW-specific formats (like tiled or compressed formats) and allow
>> exchanging this information with the DRM subsystem in a consistent way.
>>
>> Note that only V4L2_BUF_TYPE_VIDEO_[OUTPUT,CAPTURE] are accepted in
>> v4l2_ext_format, other types will be rejected if you use the
>> {G,S,TRY}_EXT_PIX_FMT ioctls.
>>
>> New hooks have been added to v4l2_ioctl_ops to support those new ioctls
>> in drivers, but, in the meantime, the core takes care of converting
>> {S,G,TRY}_EXT_PIX_FMT requests into {S,G,TRY}_FMT so that old drivers can
>> still work if the userspace app/lib uses the new ioctls.
>> The conversion is also done the other around to allow userspace
>> apps/libs using {S,G,TRY}_FMT to work with drivers implementing the
>> _ext_ hooks.
>>
>> Signed-off-by: Boris Brezillon <boris.brezillon@...labora.com>
>> Signed-off-by: Helen Koike <helen.koike@...labora.com>
>> ---
>> Changes in v5:
>> - change sizes and reorder fields to avoid holes in the struct and make
>>   it the same for 32 and 64 bits
>> - removed __attribute__ ((packed)) from uapi structs
>> - Fix doc warning from make htmldocs
>> - Updated commit message with EXT_PIX prefix for the ioctls.
>>
>> Changes in v4:
>> - Use v4l2_ext_pix_format directly in the ioctl, drop v4l2_ext_format,
>> making V4L2_BUF_TYPE_VIDEO_[OUTPUT,CAPTURE] the only valid types.
>> - Add reserved fields
>> - Removed num_planes from struct v4l2_ext_pix_format
>> - Removed flag field from struct v4l2_ext_pix_format, since the only
>>   defined value is V4L2_PIX_FMT_FLAG_PREMUL_ALPHA only used by vsp1,
>>   where we can use modifiers, or add it back later through the reserved
>>   bits.
>> - In v4l2_ext_format_to_format(), check if modifier is != MOD_LINEAR &&
>>   != MOD_INVALID
>> - Fix type assignment in v4l_g_fmt_ext_pix()
>> - 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:
>> - Move the modifier in v4l2_ext_format (was formerly placed in
>>   v4l2_ext_plane)
>> - Fix a few bugs in the converters and add a strict parameter to
>>   allow conversion of uninitialized/mis-initialized objects
>> ---
>>  drivers/media/v4l2-core/v4l2-dev.c   |  21 +-
>>  drivers/media/v4l2-core/v4l2-ioctl.c | 585 +++++++++++++++++++++++----
>>  include/media/v4l2-ioctl.h           |  34 ++
>>  include/uapi/linux/videodev2.h       |  56 +++
>>  4 files changed, 615 insertions(+), 81 deletions(-)
>>
>> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
>> index a593ea0598b55..e1829906bc086 100644
>> --- a/drivers/media/v4l2-core/v4l2-dev.c
>> +++ b/drivers/media/v4l2-core/v4l2-dev.c
>> @@ -607,25 +607,37 @@ static void determine_valid_ioctls(struct video_device *vdev)
>>                         set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
>>                 if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
>>                                ops->vidioc_g_fmt_vid_cap_mplane ||
>> +                              ops->vidioc_g_ext_pix_fmt_vid_cap ||
>>                                ops->vidioc_g_fmt_vid_overlay)) ||
>>                     (is_tx && (ops->vidioc_g_fmt_vid_out ||
>>                                ops->vidioc_g_fmt_vid_out_mplane ||
>> -                              ops->vidioc_g_fmt_vid_out_overlay)))
>> +                              ops->vidioc_g_ext_pix_fmt_vid_out ||
>> +                              ops->vidioc_g_fmt_vid_out_overlay))) {
>>                          set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
>> +                        set_bit(_IOC_NR(VIDIOC_G_EXT_PIX_FMT), valid_ioctls);
>> +               }
>>                 if ((is_rx && (ops->vidioc_s_fmt_vid_cap ||
>>                                ops->vidioc_s_fmt_vid_cap_mplane ||
>> +                              ops->vidioc_s_ext_pix_fmt_vid_cap ||
>>                                ops->vidioc_s_fmt_vid_overlay)) ||
>>                     (is_tx && (ops->vidioc_s_fmt_vid_out ||
>>                                ops->vidioc_s_fmt_vid_out_mplane ||
>> -                              ops->vidioc_s_fmt_vid_out_overlay)))
>> +                              ops->vidioc_s_ext_pix_fmt_vid_out ||
>> +                              ops->vidioc_s_fmt_vid_out_overlay))) {
>>                          set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
>> +                        set_bit(_IOC_NR(VIDIOC_S_EXT_PIX_FMT), valid_ioctls);
>> +               }
>>                 if ((is_rx && (ops->vidioc_try_fmt_vid_cap ||
>>                                ops->vidioc_try_fmt_vid_cap_mplane ||
>> +                              ops->vidioc_try_ext_pix_fmt_vid_cap ||
>>                                ops->vidioc_try_fmt_vid_overlay)) ||
>>                     (is_tx && (ops->vidioc_try_fmt_vid_out ||
>>                                ops->vidioc_try_fmt_vid_out_mplane ||
>> -                              ops->vidioc_try_fmt_vid_out_overlay)))
>> +                              ops->vidioc_try_ext_pix_fmt_vid_out ||
>> +                              ops->vidioc_try_fmt_vid_out_overlay))) {
>>                          set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
>> +                        set_bit(_IOC_NR(VIDIOC_TRY_EXT_PIX_FMT), valid_ioctls);
>> +               }
>>                 SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay);
>>                 SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf);
>>                 SET_VALID_IOCTL(ops, VIDIOC_S_FBUF, vidioc_s_fbuf);
>> @@ -682,8 +694,11 @@ static void determine_valid_ioctls(struct video_device *vdev)
>>                 /* touch specific ioctls */
>>                 SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_vid_cap);
>>                 SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_vid_cap);
>> +               SET_VALID_IOCTL(ops, VIDIOC_G_EXT_PIX_FMT, vidioc_g_fmt_vid_cap);
>>                 SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_vid_cap);
>> +               SET_VALID_IOCTL(ops, VIDIOC_S_EXT_PIX_FMT, vidioc_s_fmt_vid_cap);
>>                 SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_vid_cap);
>> +               SET_VALID_IOCTL(ops, VIDIOC_TRY_EXT_PIX_FMT, vidioc_try_fmt_vid_cap);
>>                 SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes);
>>                 SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals);
>>                 SET_VALID_IOCTL(ops, VIDIOC_ENUMINPUT, vidioc_enum_input);
>> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
>> index a556880f225a5..14a0def50f8ea 100644
>> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
>> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
>> @@ -17,6 +17,8 @@
>>
>>  #include <linux/videodev2.h>
>>
>> +#include <drm/drm_fourcc.h>
>> +
>>  #include <media/v4l2-common.h>
>>  #include <media/v4l2-ioctl.h>
>>  #include <media/v4l2-ctrls.h>
>> @@ -378,6 +380,27 @@ static void v4l_print_format(const void *arg, bool write_only)
>>         }
>>  }
>>
>> +static void v4l_print_ext_pix_format(const void *arg, bool write_only)
>> +{
>> +       const struct v4l2_ext_pix_format *pix = arg;
>> +       unsigned int i;
>> +
>> +       pr_cont("type=%s, width=%u, height=%u, format=%c%c%c%c, modifier %llx, field=%s, colorspace=%d, ycbcr_enc=%u, quantization=%u, xfer_func=%u\n",
>> +               prt_names(pix->type, v4l2_type_names),
>> +               pix->width, pix->height,
>> +               (pix->pixelformat & 0xff),
>> +               (pix->pixelformat >>  8) & 0xff,
>> +               (pix->pixelformat >> 16) & 0xff,
>> +               (pix->pixelformat >> 24) & 0xff,
>> +               pix->modifier, prt_names(pix->field, v4l2_field_names),
>> +               pix->colorspace, pix->ycbcr_enc,
>> +               pix->quantization, pix->xfer_func);
>> +       for (i = 0; i < VIDEO_MAX_PLANES && pix->plane_fmt[i].sizeimage; i++)
>> +               pr_debug("plane %u: bytesperline=%u sizeimage=%u\n",
>> +                        i, pix->plane_fmt[i].bytesperline,
>> +                        pix->plane_fmt[i].sizeimage);
>> +}
>> +
>>  static void v4l_print_framebuffer(const void *arg, bool write_only)
>>  {
>>         const struct v4l2_framebuffer *p = arg;
>> @@ -964,11 +987,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
>>         switch (type) {
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>>                 if ((is_vid || is_tch) && is_rx &&
>> -                   (ops->vidioc_g_fmt_vid_cap || ops->vidioc_g_fmt_vid_cap_mplane))
>> +                   (ops->vidioc_g_fmt_vid_cap ||
>> +                    ops->vidioc_g_ext_pix_fmt_vid_cap ||
>> +                    ops->vidioc_g_fmt_vid_cap_mplane))
>>                         return 0;
>>                 break;
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> -               if ((is_vid || is_tch) && is_rx && ops->vidioc_g_fmt_vid_cap_mplane)
>> +               if ((is_vid || is_tch) && is_rx &&
>> +                   (ops->vidioc_g_fmt_vid_cap_mplane ||
>> +                    ops->vidioc_g_ext_pix_fmt_vid_cap))
>>                         return 0;
>>                 break;
>>         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
>> @@ -977,11 +1004,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
>>                 break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>>                 if (is_vid && is_tx &&
>> -                   (ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out_mplane))
>> +                   (ops->vidioc_g_fmt_vid_out ||
>> +                    ops->vidioc_g_ext_pix_fmt_vid_out ||
>> +                    ops->vidioc_g_fmt_vid_out_mplane))
>>                         return 0;
>>                 break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> -               if (is_vid && is_tx && ops->vidioc_g_fmt_vid_out_mplane)
>> +               if (is_vid && is_tx &&
>> +                   (ops->vidioc_g_ext_pix_fmt_vid_out ||
>> +                    ops->vidioc_g_fmt_vid_out_mplane))
>>                         return 0;
>>                 break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
>> @@ -1061,6 +1092,134 @@ static void v4l_sanitize_format(struct v4l2_format *fmt)
>>                sizeof(fmt->fmt.pix) - offset);
>>  }
>>
>> +int v4l2_ext_pix_format_to_format(const struct v4l2_ext_pix_format *e,
>> +                                 struct v4l2_format *f, bool mplane_cap,
>> +                                 bool strict)
>> +{
>> +       const struct v4l2_plane_ext_pix_format *pe;
>> +       struct v4l2_plane_pix_format *p;
>> +       unsigned int i;
>> +
>> +       memset(f, 0, sizeof(*f));
>> +
>> +       /*
>> +        * Make sure no modifier is required before doing the
>> +        * conversion.
>> +        */
>> +       if (e->modifier && strict &&
>> +           e->modifier != DRM_FORMAT_MOD_LINEAR &&
>> +           e->modifier != DRM_FORMAT_MOD_INVALID)
>> +               return -EINVAL;
>> +
>> +       if (!e->plane_fmt[0].sizeimage && strict)
>> +               return -EINVAL;
>> +
>> +       if (e->plane_fmt[1].sizeimage && !mplane_cap && strict)
>> +               return 0;
>> +
>> +       if (!mplane_cap) {
>> +               f->fmt.pix.width = e->width;
>> +               f->fmt.pix.height = e->height;
>> +               f->fmt.pix.pixelformat = e->pixelformat;
>> +               f->fmt.pix.field = e->field;
>> +               f->fmt.pix.colorspace = e->colorspace;
>> +               f->fmt.pix.ycbcr_enc = e->ycbcr_enc;
>> +               f->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +               f->fmt.pix.quantization = e->quantization;
>> +               pe = &e->plane_fmt[0];
>> +               f->fmt.pix.bytesperline = pe->bytesperline;
>> +               f->fmt.pix.sizeimage = pe->sizeimage;
>> +               f->type = e->type;
>> +               return 0;
>> +       }
>> +
>> +       f->fmt.pix_mp.width = e->width;
>> +       f->fmt.pix_mp.height = e->height;
>> +       f->fmt.pix_mp.pixelformat = e->pixelformat;
>> +       f->fmt.pix_mp.field = e->field;
>> +       f->fmt.pix_mp.colorspace = e->colorspace;
>> +       f->fmt.pix_mp.ycbcr_enc = e->ycbcr_enc;
>> +       f->fmt.pix_mp.quantization = e->quantization;
>> +       if (e->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
>> +               f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
>> +       else
>> +               f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
>> +
>> +       for (i = 0; i < VIDEO_MAX_PLANES; i++) {
>> +               pe = &e->plane_fmt[i];
>> +               p = &f->fmt.pix_mp.plane_fmt[i];
>> +               p->bytesperline = pe->bytesperline;
>> +               p->sizeimage = pe->sizeimage;
>> +       }
>> +
>> +       return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(v4l2_ext_pix_format_to_format);
>> +
>> +int v4l2_format_to_ext_pix_format(const struct v4l2_format *f,
>> +                                 struct v4l2_ext_pix_format *e, bool strict)
>> +{
>> +       const struct v4l2_plane_pix_format *p;
>> +       struct v4l2_plane_ext_pix_format *pe;
>> +       unsigned int i;
>> +
>> +       memset(e, 0, sizeof(*e));
>> +
>> +       switch (f->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +               e->width = f->fmt.pix.width;
>> +               e->height = f->fmt.pix.height;
>> +               e->pixelformat = f->fmt.pix.pixelformat;
>> +               e->field = f->fmt.pix.field;
>> +               e->colorspace = f->fmt.pix.colorspace;
>> +               if (f->fmt.pix.flags)
>> +                       pr_warn("Ignoring pixelformat flags 0x%x\n",
>> +                               f->fmt.pix.flags);
>> +               e->ycbcr_enc = f->fmt.pix.ycbcr_enc;
>> +               e->quantization = f->fmt.pix.quantization;
>> +               e->plane_fmt[0].bytesperline = f->fmt.pix.bytesperline;
>> +               e->plane_fmt[0].sizeimage = f->fmt.pix.sizeimage;
>> +               e->type = f->type;
>> +               break;
>> +
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> +               if ((f->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES ||
>> +                    !f->fmt.pix_mp.num_planes) && strict)
>> +                       return -EINVAL;
>> +
>> +               e->width = f->fmt.pix_mp.width;
>> +               e->height = f->fmt.pix_mp.height;
>> +               e->pixelformat = f->fmt.pix_mp.pixelformat;
>> +               e->field = f->fmt.pix_mp.field;
>> +               e->colorspace = f->fmt.pix_mp.colorspace;
>> +               if (f->fmt.pix.flags)
>> +                       pr_warn("Ignoring pixelformat flags 0x%x\n",
>> +                               f->fmt.pix.flags);
>> +               e->ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
>> +               e->quantization = f->fmt.pix_mp.quantization;
>> +               if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
>> +                       e->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> +               else
>> +                       e->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>> +
>> +               for (i = 0; i < VIDEO_MAX_PLANES; i++) {
>> +                       pe = &e->plane_fmt[i];
>> +                       p = &f->fmt.pix_mp.plane_fmt[i];
>> +                       pe->bytesperline = p->bytesperline;
>> +                       pe->sizeimage = p->sizeimage;
>> +               }
>> +               break;
>> +
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(v4l2_format_to_ext_pix_format);
>> +
>>  static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
>>                                 struct file *file, void *fh, void *arg)
>>  {
>> @@ -1564,6 +1723,38 @@ static void v4l_pix_format_touch(struct v4l2_pix_format *p)
>>         p->xfer_func = 0;
>>  }
>>
>> +static int v4l_g_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
>> +                            struct file *file, void *fh,
>> +                            struct v4l2_format *f)
>> +{
>> +       struct v4l2_ext_pix_format ef;
>> +       int ret;
>> +
>> +       switch (f->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> +               ef.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> +               ret = ops->vidioc_g_ext_pix_fmt_vid_cap(file, fh, &ef);
>> +               break;
>> +
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> +               ef.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>> +               ret = ops->vidioc_g_ext_pix_fmt_vid_out(file, fh, &ef);
>> +               break;
>> +
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_ext_pix_format_to_format(&ef, f,
>> +                                            V4L2_TYPE_IS_MULTIPLANAR(f->type),
>> +                                            true);
>> +}
>> +
>>  static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
>>                                 struct file *file, void *fh, void *arg)
>>  {
>> @@ -1600,17 +1791,27 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
>>
>>         switch (p->type) {
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> -               if (unlikely(!ops->vidioc_g_fmt_vid_cap))
>> -                       break;
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> -                       v4l_pix_format_touch(&p->fmt.pix);
>> -               return ret;
>> +               if (ops->vidioc_g_fmt_vid_cap) {
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> +                               v4l_pix_format_touch(&p->fmt.pix);
>> +                       return ret;
>> +               } else if (ops->vidioc_g_ext_pix_fmt_vid_cap) {
>> +                       ret = v4l_g_fmt_ext_pix(ops, file, fh, p);
>> +                       if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> +                               v4l_pix_format_touch(&p->fmt.pix);
>> +                       return ret;
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> -               return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
>> +               if (ops->vidioc_g_fmt_vid_cap_mplane)
>> +                       return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
>> +               else if (ops->vidioc_g_ext_pix_fmt_vid_cap)
>> +                       return v4l_g_fmt_ext_pix(ops, file, fh, p);
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
>>                 return ops->vidioc_g_fmt_vid_overlay(file, fh, arg);
>>         case V4L2_BUF_TYPE_VBI_CAPTURE:
>> @@ -1618,15 +1819,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
>>         case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
>>                 return ops->vidioc_g_fmt_sliced_vbi_cap(file, fh, arg);
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> -               if (unlikely(!ops->vidioc_g_fmt_vid_out))
>> -                       break;
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               return ret;
>> +               if (ops->vidioc_g_fmt_vid_out) {
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       return ret;
>> +               } else if (ops->vidioc_g_ext_pix_fmt_vid_out) {
>> +                       return v4l_g_fmt_ext_pix(ops, file, fh, p);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> -               return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
>> +               if (ops->vidioc_g_fmt_vid_out_mplane)
>> +                       return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
>> +               else if (ops->vidioc_g_ext_pix_fmt_vid_out)
>> +                       return v4l_g_fmt_ext_pix(ops, file, fh, p);
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
>>                 return ops->vidioc_g_fmt_vid_out_overlay(file, fh, arg);
>>         case V4L2_BUF_TYPE_VBI_OUTPUT:
>> @@ -1645,6 +1853,76 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
>>         return -EINVAL;
>>  }
>>
>> +static int v4l_g_ext_pix_fmt(const struct v4l2_ioctl_ops *ops,
>> +                            struct file *file, void *fh, void *arg)
>> +{
>> +       struct v4l2_ext_pix_format *ef = arg;
>> +       struct v4l2_format f = {
>> +               .type = ef->type,
>> +       };
>> +       int ret;
>> +
>> +       ret = check_fmt(file, ef->type);
>> +       if (ret)
>> +               return ret;
>> +
>> +       memset(ef, 0, sizeof(*ef));
>> +       ef->type = f.type;
>> +
>> +       switch (f.type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +               if (ops->vidioc_g_ext_pix_fmt_vid_cap)
>> +                       return ops->vidioc_g_ext_pix_fmt_vid_cap(file, fh, ef);
>> +               break;
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +               if (ops->vidioc_g_ext_pix_fmt_vid_out)
>> +                       return ops->vidioc_g_ext_pix_fmt_vid_out(file, fh, ef);
>> +               break;
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       ret = v4l_g_fmt(ops, file, fh, &f);
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_format_to_ext_pix_format(&f, ef, true);
>> +}
>> +
>> +static int v4l_s_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
>> +                            struct file *file, void *fh,
>> +                            struct v4l2_format *f)
>> +{
>> +       struct v4l2_ext_pix_format ef;
>> +       int ret;
>> +
>> +       ret = v4l2_format_to_ext_pix_format(f, &ef, false);
>> +       if (ret)
>> +               return ret;
>> +
>> +       switch (f->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> +               ret = ops->vidioc_s_ext_pix_fmt_vid_cap(file, fh, &ef);
>> +               break;
>> +
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> +               ret = ops->vidioc_s_ext_pix_fmt_vid_out(file, fh, &ef);
>> +               break;
>> +
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_ext_pix_format_to_format(&ef, f,
>> +                                            V4L2_TYPE_IS_MULTIPLANAR(f->type),
>> +                                            true);
>> +}
>> +
>>  static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
>>                                 struct file *file, void *fh, void *arg)
>>  {
>> @@ -1663,23 +1941,31 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
>>
>>         switch (p->type) {
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> -               if (unlikely(!ops->vidioc_s_fmt_vid_cap))
>> +               if (ops->vidioc_s_fmt_vid_cap) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix);
>> +                       ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +               } else if (ops->vidioc_s_ext_pix_fmt_vid_cap) {
>> +                       ret = v4l_s_fmt_ext_pix(ops, file, fh, arg);
>> +               } else {
>>                         break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix);
>> -               ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +               }
>> +
>>                 if (vfd->vfl_type == VFL_TYPE_TOUCH)
>>                         v4l_pix_format_touch(&p->fmt.pix);
>>                 return ret;
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> -               if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> -               for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> -                       CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> -                                         bytesperline);
>> -               return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
>> +               if (ops->vidioc_s_fmt_vid_cap_mplane) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> +                       for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> +                               CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> +                                                 bytesperline);
>> +                       return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
>> +               } else if (ops->vidioc_s_ext_pix_fmt_vid_cap) {
>> +                       return v4l_s_fmt_ext_pix(ops, file, fh, arg);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
>>                 if (unlikely(!ops->vidioc_s_fmt_vid_overlay))
>>                         break;
>> @@ -1696,21 +1982,27 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
>>                 CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
>>                 return ops->vidioc_s_fmt_sliced_vbi_cap(file, fh, arg);
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> -               if (unlikely(!ops->vidioc_s_fmt_vid_out))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix);
>> -               ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               return ret;
>> +               if (ops->vidioc_s_fmt_vid_out) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix);
>> +                       ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       return ret;
>> +               } else if (ops->vidioc_s_ext_pix_fmt_vid_out) {
>> +                       return v4l_s_fmt_ext_pix(ops, file, fh, arg);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> -               if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> -               for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> -                       CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> -                                         bytesperline);
>> -               return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
>> +               if (ops->vidioc_s_fmt_vid_out_mplane) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> +                       for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> +                               CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> +                                                 bytesperline);
>> +                       return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
>> +               } else if (ops->vidioc_s_ext_pix_fmt_vid_out) {
>> +                       return v4l_s_fmt_ext_pix(ops, file, fh, arg);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
>>                 if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay))
>>                         break;
>> @@ -1750,6 +2042,82 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
>>         return -EINVAL;
>>  }
>>
>> +static int v4l_s_ext_pix_fmt(const struct v4l2_ioctl_ops *ops,
>> +                            struct file *file, void *fh, void *arg)
>> +{
>> +       struct video_device *vfd = video_devdata(file);
>> +       struct v4l2_ext_pix_format *ef = arg;
>> +       struct v4l2_format f;
>> +       int ret;
>> +
>> +       ret = check_fmt(file, ef->type);
>> +       if (ret)
>> +               return ret;
>> +
>> +       switch (ef->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +               if (ops->vidioc_s_ext_pix_fmt_vid_cap)
>> +                       return ops->vidioc_s_ext_pix_fmt_vid_cap(file, fh, ef);
>> +               break;
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +               if (ops->vidioc_s_ext_pix_fmt_vid_out)
>> +                       return ops->vidioc_s_ext_pix_fmt_vid_out(file, fh, ef);
>> +               break;
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       ret = v4l2_ext_pix_format_to_format(ef, &f,
>> +                                           vfd->device_caps &
>> +                                           (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
>> +                                            V4L2_CAP_VIDEO_OUTPUT_MPLANE |
>> +                                            V4L2_CAP_VIDEO_M2M_MPLANE),
>> +                                           false);
>> +       if (ret)
>> +               return ret;
>> +
>> +       ret = v4l_s_fmt(ops, file, fh, &f);
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_format_to_ext_pix_format(&f, ef, true);
>> +}
>> +
>> +static int v4l_try_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
>> +                              struct file *file, void *fh,
>> +                              struct v4l2_format *f)
>> +{
>> +       struct v4l2_ext_pix_format ef;
>> +       int ret;
>> +
>> +       ret = v4l2_format_to_ext_pix_format(f, &ef, false);
>> +       if (ret)
>> +               return ret;
>> +
>> +       switch (f->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> +               ret = ops->vidioc_try_ext_pix_fmt_vid_cap(file, fh, &ef);
>> +               break;
>> +
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> +               ret = ops->vidioc_try_ext_pix_fmt_vid_out(file, fh, &ef);
>> +               break;
>> +
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_ext_pix_format_to_format(&ef, f,
>> +                                            V4L2_TYPE_IS_MULTIPLANAR(f->type),
>> +                                            true);
>> +}
>> +
>> +
>>  static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
>>                                 struct file *file, void *fh, void *arg)
>>  {
>> @@ -1765,23 +2133,32 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
>>
>>         switch (p->type) {
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> -               if (unlikely(!ops->vidioc_try_fmt_vid_cap))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix);
>> -               ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> -                       v4l_pix_format_touch(&p->fmt.pix);
>> -               return ret;
>> +               if (ops->vidioc_try_fmt_vid_cap) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix);
>> +                       ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> +                               v4l_pix_format_touch(&p->fmt.pix);
>> +                       return ret;
>> +               } else if (ops->vidioc_try_ext_pix_fmt_vid_cap) {
>> +                       ret = v4l_try_fmt_ext_pix(ops, file, fh, p);
>> +                       if (vfd->vfl_type == VFL_TYPE_TOUCH)
>> +                               v4l_pix_format_touch(&p->fmt.pix);
>> +                       return ret;
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>> -               if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> -               for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> -                       CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> -                                         bytesperline);
>> -               return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
>> +               if (ops->vidioc_try_fmt_vid_cap_mplane) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> +                       for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> +                               CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> +                                                 bytesperline);
>> +                       return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
>> +               } else if (ops->vidioc_try_ext_pix_fmt_vid_cap) {
>> +                       return v4l_try_fmt_ext_pix(ops, file, fh, p);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OVERLAY:
>>                 if (unlikely(!ops->vidioc_try_fmt_vid_overlay))
>>                         break;
>> @@ -1798,21 +2175,27 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
>>                 CLEAR_AFTER_FIELD(p, fmt.sliced.io_size);
>>                 return ops->vidioc_try_fmt_sliced_vbi_cap(file, fh, arg);
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> -               if (unlikely(!ops->vidioc_try_fmt_vid_out))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix);
>> -               ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
>> -               /* just in case the driver zeroed it again */
>> -               p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> -               return ret;
>> +               if (ops->vidioc_try_fmt_vid_out) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix);
>> +                       ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
>> +                       /* just in case the driver zeroed it again */
>> +                       p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
>> +                       return ret;
>> +               } else if (ops->vidioc_try_ext_pix_fmt_vid_cap) {
>> +                       return v4l_try_fmt_ext_pix(ops, file, fh, p);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
>> -               if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))
>> -                       break;
>> -               CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> -               for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> -                       CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> -                                         bytesperline);
>> -               return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
>> +               if (ops->vidioc_try_fmt_vid_out_mplane) {
>> +                       CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
>> +                       for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
>> +                               CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
>> +                                                 bytesperline);
>> +                       return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
>> +               } else if (ops->vidioc_try_ext_pix_fmt_vid_cap) {
>> +                       return v4l_try_fmt_ext_pix(ops, file, fh, p);
>> +               }
>> +               break;
>>         case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
>>                 if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay))
>>                         break;
>> @@ -1852,6 +2235,49 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
>>         return -EINVAL;
>>  }
>>
>> +static int v4l_try_ext_pix_fmt(const struct v4l2_ioctl_ops *ops,
>> +                              struct file *file, void *fh, void *arg)
>> +{
>> +       struct video_device *vfd = video_devdata(file);
>> +       struct v4l2_ext_pix_format *ef = arg;
>> +       struct v4l2_format f;
>> +       int ret;
>> +
>> +       ret = check_fmt(file, ef->type);
>> +       if (ret)
>> +               return ret;
>> +
>> +       switch (ef->type) {
>> +       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>> +               if (ops->vidioc_try_ext_pix_fmt_vid_cap)
>> +                       return ops->vidioc_try_ext_pix_fmt_vid_cap(file, fh,
>> +                                                                  ef);
>> +               break;
>> +       case V4L2_BUF_TYPE_VIDEO_OUTPUT:
>> +               if (ops->vidioc_try_ext_pix_fmt_vid_out)
>> +                       return ops->vidioc_try_ext_pix_fmt_vid_out(file, fh,
>> +                                                                  ef);
>> +               break;
>> +       default:
>> +               return -EINVAL;
>> +       }
>> +
>> +       ret = v4l2_ext_pix_format_to_format(ef, &f,
>> +                                           vfd->device_caps &
>> +                                           (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
>> +                                            V4L2_CAP_VIDEO_OUTPUT_MPLANE |
>> +                                            V4L2_CAP_VIDEO_M2M_MPLANE),
>> +                                           false);
>> +       if (ret)
>> +               return ret;
>> +
>> +       ret = v4l_try_fmt(ops, file, fh, &f);
>> +       if (ret)
>> +               return ret;
>> +
>> +       return v4l2_format_to_ext_pix_format(&f, ef, true);
>> +}
>> +
>>  static int v4l_streamon(const struct v4l2_ioctl_ops *ops,
>>                                 struct file *file, void *fh, void *arg)
>>  {
>> @@ -2771,7 +3197,9 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
>>         IOCTL_INFO(VIDIOC_QUERYCAP, v4l_querycap, v4l_print_querycap, 0),
>>         IOCTL_INFO(VIDIOC_ENUM_FMT, v4l_enum_fmt, v4l_print_fmtdesc, 0),
>>         IOCTL_INFO(VIDIOC_G_FMT, v4l_g_fmt, v4l_print_format, 0),
>> +       IOCTL_INFO(VIDIOC_G_EXT_PIX_FMT, v4l_g_ext_pix_fmt, v4l_print_ext_pix_format, 0),
>>         IOCTL_INFO(VIDIOC_S_FMT, v4l_s_fmt, v4l_print_format, INFO_FL_PRIO),
>> +       IOCTL_INFO(VIDIOC_S_EXT_PIX_FMT, v4l_s_ext_pix_fmt, v4l_print_ext_pix_format, INFO_FL_PRIO),
>>         IOCTL_INFO(VIDIOC_REQBUFS, v4l_reqbufs, v4l_print_requestbuffers, INFO_FL_PRIO | INFO_FL_QUEUE),
>>         IOCTL_INFO(VIDIOC_QUERYBUF, v4l_querybuf, v4l_print_buffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_buffer, length)),
>>         IOCTL_INFO(VIDIOC_G_FBUF, v4l_stub_g_fbuf, v4l_print_framebuffer, 0),
>> @@ -2818,6 +3246,7 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
>>         IOCTL_INFO(VIDIOC_S_JPEGCOMP, v4l_stub_s_jpegcomp, v4l_print_jpegcompression, INFO_FL_PRIO),
>>         IOCTL_INFO(VIDIOC_QUERYSTD, v4l_querystd, v4l_print_std, 0),
>>         IOCTL_INFO(VIDIOC_TRY_FMT, v4l_try_fmt, v4l_print_format, 0),
>> +       IOCTL_INFO(VIDIOC_TRY_EXT_PIX_FMT, v4l_try_ext_pix_fmt, v4l_print_ext_pix_format, 0),
>>         IOCTL_INFO(VIDIOC_ENUMAUDIO, v4l_stub_enumaudio, v4l_print_audio, INFO_FL_CLEAR(v4l2_audio, index)),
>>         IOCTL_INFO(VIDIOC_ENUMAUDOUT, v4l_stub_enumaudout, v4l_print_audioout, INFO_FL_CLEAR(v4l2_audioout, index)),
>>         IOCTL_INFO(VIDIOC_G_PRIORITY, v4l_g_priority, v4l_print_u32, 0),
>> diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
>> index 86878fba332b0..8bbcb74d8ee31 100644
>> --- a/include/media/v4l2-ioctl.h
>> +++ b/include/media/v4l2-ioctl.h
>> @@ -48,11 +48,17 @@ struct v4l2_fh;
>>   * @vidioc_g_fmt_vid_cap: pointer to the function that implements
>>   *     :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video capture
>>   *     in single plane mode
>> + * @vidioc_g_ext_pix_fmt_vid_cap: pointer to the function that implements
>> + *     :ref:`VIDIOC_G_EXT_PIX_FMT <vidioc_g_ext_pix_fmt>` ioctl logic for video
>> + *     capture
>>   * @vidioc_g_fmt_vid_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay
>>   * @vidioc_g_fmt_vid_out: pointer to the function that implements
>>   *     :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video out
>>   *     in single plane mode
>> + * @vidioc_g_ext_pix_fmt_vid_out: pointer to the function that implements
>> + *     :ref:`VIDIOC_G_EXT_PIX_FMT <vidioc_g_ext_pix_fmt>` ioctl logic for video
>> + *     out
>>   * @vidioc_g_fmt_vid_out_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
>>   * @vidioc_g_fmt_vbi_cap: pointer to the function that implements
>> @@ -82,11 +88,16 @@ struct v4l2_fh;
>>   * @vidioc_s_fmt_vid_cap: pointer to the function that implements
>>   *     :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video capture
>>   *     in single plane mode
>> + * @vidioc_s_ext_pix_fmt_vid_cap: pointer to the function that implements
>> + *     :ref:`VIDIOC_S_EXT_PIX_FMT <vidioc_g_ext_pix_fmt>` ioctl logic for video
>> + *     capture
>>   * @vidioc_s_fmt_vid_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay
>>   * @vidioc_s_fmt_vid_out: pointer to the function that implements
>>   *     :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video out
>>   *     in single plane mode
>> + * @vidioc_s_ext_pix_fmt_vid_out: pointer to the function that implements
>> + *     :ref:`VIDIOC_S_EXT_PIX_FMT <vidioc_g_fmt>` ioctl logic for video out
>>   * @vidioc_s_fmt_vid_out_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
>>   * @vidioc_s_fmt_vbi_cap: pointer to the function that implements
>> @@ -116,11 +127,16 @@ struct v4l2_fh;
>>   * @vidioc_try_fmt_vid_cap: pointer to the function that implements
>>   *     :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video capture
>>   *     in single plane mode
>> + * @vidioc_try_ext_pix_fmt_vid_cap: pointer to the function that implements
>> + *     :ref:`VIDIOC_TRY_EXT_PIX_FMT <vidioc_g_ext_pix_fmt>` ioctl logic for
>> +       video capture
>>   * @vidioc_try_fmt_vid_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
>>   * @vidioc_try_fmt_vid_out: pointer to the function that implements
>>   *     :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video out
>>   *     in single plane mode
>> + * @vidioc_try_ext_pix_fmt_vid_out: pointer to the function that implements
>> + *     :ref:`VIDIOC_TRY_EXT_PIX_FMT <vidioc_g_fmt>` ioctl logic for video out
>>   * @vidioc_try_fmt_vid_out_overlay: pointer to the function that implements
>>   *     :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
>>   *     output
>> @@ -319,10 +335,14 @@ struct v4l2_ioctl_ops {
>>         /* VIDIOC_G_FMT handlers */
>>         int (*vidioc_g_fmt_vid_cap)(struct file *file, void *fh,
>>                                     struct v4l2_format *f);
>> +       int (*vidioc_g_ext_pix_fmt_vid_cap)(struct file *file, void *fh,
>> +                                           struct v4l2_ext_pix_format *f);
>>         int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
>>                                         struct v4l2_format *f);
>>         int (*vidioc_g_fmt_vid_out)(struct file *file, void *fh,
>>                                     struct v4l2_format *f);
>> +       int (*vidioc_g_ext_pix_fmt_vid_out)(struct file *file, void *fh,
>> +                                           struct v4l2_ext_pix_format *f);
>>         int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
>>                                             struct v4l2_format *f);
>>         int (*vidioc_g_fmt_vbi_cap)(struct file *file, void *fh,
>> @@ -349,10 +369,14 @@ struct v4l2_ioctl_ops {
>>         /* VIDIOC_S_FMT handlers */
>>         int (*vidioc_s_fmt_vid_cap)(struct file *file, void *fh,
>>                                     struct v4l2_format *f);
>> +       int (*vidioc_s_ext_pix_fmt_vid_cap)(struct file *file, void *fh,
>> +                                           struct v4l2_ext_pix_format *f);
>>         int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
>>                                         struct v4l2_format *f);
>>         int (*vidioc_s_fmt_vid_out)(struct file *file, void *fh,
>>                                     struct v4l2_format *f);
>> +       int (*vidioc_s_ext_pix_fmt_vid_out)(struct file *file, void *fh,
>> +                                           struct v4l2_ext_pix_format *f);
>>         int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
>>                                             struct v4l2_format *f);
>>         int (*vidioc_s_fmt_vbi_cap)(struct file *file, void *fh,
>> @@ -379,10 +403,14 @@ struct v4l2_ioctl_ops {
>>         /* VIDIOC_TRY_FMT handlers */
>>         int (*vidioc_try_fmt_vid_cap)(struct file *file, void *fh,
>>                                       struct v4l2_format *f);
>> +       int (*vidioc_try_ext_pix_fmt_vid_cap)(struct file *file, void *fh,
>> +                                             struct v4l2_ext_pix_format *f);
>>         int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
>>                                           struct v4l2_format *f);
>>         int (*vidioc_try_fmt_vid_out)(struct file *file, void *fh,
>>                                       struct v4l2_format *f);
>> +       int (*vidioc_try_ext_pix_fmt_vid_out)(struct file *file, void *fh,
>> +                                             struct v4l2_ext_pix_format *f);
>>         int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
>>                                              struct v4l2_format *f);
>>         int (*vidioc_try_fmt_vbi_cap)(struct file *file, void *fh,
>> @@ -724,6 +752,12 @@ long int video_usercopy(struct file *file, unsigned int cmd,
>>  long int video_ioctl2(struct file *file,
>>                       unsigned int cmd, unsigned long int arg);
>>
>> +int v4l2_format_to_ext_pix_format(const struct v4l2_format *f,
>> +                                 struct v4l2_ext_pix_format *e, bool strict);
>> +int v4l2_ext_pix_format_to_format(const struct v4l2_ext_pix_format *e,
>> +                                 struct v4l2_format *f,
>> +                                 bool mplane_cap, bool strict);
>> +
>>  /*
>>   * The user space interpretation of the 'v4l2_event' differs
>>   * based on the 'time_t' definition on 32-bit architectures, so
>> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
>> index c7b70ff53bc1d..7123c6a4d9569 100644
>> --- a/include/uapi/linux/videodev2.h
>> +++ b/include/uapi/linux/videodev2.h
>> @@ -2254,6 +2254,58 @@ struct v4l2_pix_format_mplane {
>>         __u8                            reserved[7];
>>  } __attribute__ ((packed));
>>
>> +/**
>> + * struct v4l2_plane_ext_pix_format - additional, per-plane format definition
>> + * @sizeimage:         maximum size in bytes required for data, for which
>> + *                     this plane will be used.
>> + *                     Should be set to zero for unused planes.
>> + * @bytesperline:      distance in bytes between the leftmost pixels in two
>> + *                     adjacent lines
>> + * @reserved:          extra space reserved for future fields, must be set to 0
>> + */
>> +struct v4l2_plane_ext_pix_format {
>> +       __u32 sizeimage;
>> +       __u32 bytesperline;
>> +       __u32 reserved;
> 
> Do we want to make this field a __u64 so the size of the struct is a
> multiple of 64 bits?

For next version, I'm reusing struct v4l2_plane_pix_format as suggested by Tomasz,
so this adjustment won't be required.

Thanks,
Helen

> 
> 
> 
>> +};
>> +
>> +/**
>> + * struct v4l2_ext_pix_format - extended single/multiplanar format definition
>> + * @type:              type of the data stream; V4L2_BUF_TYPE_VIDEO_CAPTURE or
>> + *                     V4L2_BUF_TYPE_VIDEO_OUTPUT
>> + * @width:             image width in pixels
>> + * @height:            image height in pixels
>> + * @field:             enum v4l2_field; field order (for interlaced video)
>> + * @pixelformat:       little endian four character code (fourcc)
>> + * @modifier:          modifier applied to the format (used for tiled formats
>> + *                     and other kind of HW-specific formats, like compressed
>> + *                     formats)
>> + * @colorspace:                enum v4l2_colorspace; supplemental to pixelformat
>> + * @plane_fmt:         per-plane information
>> + * @ycbcr_enc:         enum v4l2_ycbcr_encoding, Y'CbCr encoding
>> + * @hsv_enc:           enum v4l2_hsv_encoding, HSV encoding
>> + * @quantization:      enum v4l2_quantization, colorspace quantization
>> + * @xfer_func:         enum v4l2_xfer_func, colorspace transfer function
>> + * @reserved:          extra space reserved for future fields, must be set to 0
>> + */
>> +struct v4l2_ext_pix_format {
>> +       __u32 type;
>> +       __u32 width;
>> +       __u32 height;
>> +       __u32 field;
>> +       __u64 modifier;
>> +       __u32 pixelformat;
>> +       __u32 colorspace;
>> +       struct v4l2_plane_ext_pix_format plane_fmt[VIDEO_MAX_PLANES];
>> +       union {
>> +               __u32 ycbcr_enc;
>> +               __u32 hsv_enc;
>> +       };
>> +       __u32 quantization;
>> +       __u32 xfer_func;
>> +       __u32 reserved[9];
>> +};
>> +
>>  /**
>>   * struct v4l2_sdr_format - SDR format definition
>>   * @pixelformat:       little endian four character code (fourcc)
>> @@ -2571,6 +2623,10 @@ struct v4l2_create_buffers {
>>
>>  #define VIDIOC_QUERY_EXT_CTRL  _IOWR('V', 103, struct v4l2_query_ext_ctrl)
>>
>> +#define VIDIOC_G_EXT_PIX_FMT   _IOWR('V', 104, struct v4l2_ext_pix_format)
>> +#define VIDIOC_S_EXT_PIX_FMT   _IOWR('V', 105, struct v4l2_ext_pix_format)
>> +#define VIDIOC_TRY_EXT_PIX_FMT _IOWR('V', 106, struct v4l2_ext_pix_format)
>> +
>>  /* Reminder: when adding new ioctls please add support for them to
>>     drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
>>
>> --
>> 2.28.0.rc2
>>

Powered by blists - more mailing lists