]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
authorMauro Carvalho Chehab <mchehab@infradead.org>
Thu, 14 Sep 2006 16:36:34 +0000 (13:36 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 26 Sep 2006 15:30:36 +0000 (12:30 -0300)
For most drivers, VIDIOC_G_PARM will just return the current standard fps.
So, instead of failing, drivers based on video_ioctl2 will implement the
default method.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/videodev.c

index 26e7ea252a0e5441ed7a6f43999336e89b1e5f91..479a0675cf60bf8ddfc7b6a372077be03063b35a 100644 (file)
@@ -1283,9 +1283,29 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
        case VIDIOC_G_PARM:
        {
                struct v4l2_streamparm *p=arg;
-               if (!vfd->vidioc_g_parm)
-                       break;
-               ret=vfd->vidioc_g_parm(file, fh, p);
+               if (vfd->vidioc_g_parm) {
+                       ret=vfd->vidioc_g_parm(file, fh, p);
+               } else {
+                       struct v4l2_standard s;
+
+                       if (!vfd->tvnormsize) {
+                               printk (KERN_WARNING "%s: no TV norms defined!\n",
+                                                       vfd->name);
+                               break;
+                       }
+
+                       if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                               return -EINVAL;
+
+                       v4l2_video_std_construct(&s, vfd->tvnorms[vfd->current_norm].id,
+                                                vfd->tvnorms[vfd->current_norm].name);
+
+                       memset(p,0,sizeof(*p));
+
+                       p->parm.capture.timeperframe = s.frameperiod;
+                       ret=0;
+               }
+
                dbgarg (cmd, "type=%d\n", p->type);
                break;
        }