]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
media: coda: implement ENUM_FRAMEINTERVALS
authorPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 5 Nov 2018 15:25:07 +0000 (10:25 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 23 Nov 2018 10:30:03 +0000 (05:30 -0500)
v4l2-compliance complains about S_PARM being supported, but not
ENUM_FRAMEINTERVALS.
Report a continuous frame interval even though the hardware only
supports 16-bit numerator and denominator, with min/max values
that can be programmed into the mailbox registers.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/coda/coda-common.c

index 6d950335c0d2125933f4d0c31b0ddaf7bd7f38be..e342f1b64b610934a160db2268fd24d75bce2836 100644 (file)
@@ -1045,6 +1045,38 @@ static int coda_decoder_cmd(struct file *file, void *fh,
        return 0;
 }
 
+static int coda_enum_frameintervals(struct file *file, void *fh,
+                                   struct v4l2_frmivalenum *f)
+{
+       struct coda_ctx *ctx = fh_to_ctx(fh);
+       int i;
+
+       if (f->index)
+               return -EINVAL;
+
+       /* Disallow YUYV if the vdoa is not available */
+       if (!ctx->vdoa && f->pixel_format == V4L2_PIX_FMT_YUYV)
+               return -EINVAL;
+
+       for (i = 0; i < CODA_MAX_FORMATS; i++) {
+               if (f->pixel_format == ctx->cvd->src_formats[i] ||
+                   f->pixel_format == ctx->cvd->dst_formats[i])
+                       break;
+       }
+       if (i == CODA_MAX_FORMATS)
+               return -EINVAL;
+
+       f->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
+       f->stepwise.min.numerator = 1;
+       f->stepwise.min.denominator = 65535;
+       f->stepwise.max.numerator = 65536;
+       f->stepwise.max.denominator = 1;
+       f->stepwise.step.numerator = 1;
+       f->stepwise.step.denominator = 1;
+
+       return 0;
+}
+
 static int coda_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 {
        struct coda_ctx *ctx = fh_to_ctx(fh);
@@ -1191,6 +1223,8 @@ static const struct v4l2_ioctl_ops coda_ioctl_ops = {
        .vidioc_g_parm          = coda_g_parm,
        .vidioc_s_parm          = coda_s_parm,
 
+       .vidioc_enum_frameintervals = coda_enum_frameintervals,
+
        .vidioc_subscribe_event = coda_subscribe_event,
        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };