]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[media] v4l2-ioctl: Fill the default value for VIDIOC_QUERYSTD
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 4 Oct 2011 12:32:23 +0000 (09:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 8 Oct 2011 11:00:35 +0000 (08:00 -0300)
According with the V4L2 API spec:

"When detection is not possible or fails, the set must contain
 all standards supported by the current video input or output."

The V4L2 core has the mask with all supported standards already. So,
apply it. Driver and subdevs can then just remove standards from the
mask, as they're able of detecting audio, video and frames frequency.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-ioctl.c

index 21c49dc064e2372cb037792a1ff4691ccdf0b3e6..24fd43322150e07d7fe1d24a07a2e1320d64a167 100644 (file)
@@ -1109,6 +1109,14 @@ static long __video_do_ioctl(struct file *file,
 
                if (!ops->vidioc_querystd)
                        break;
+               /*
+                * If nothing detected, it should return all supported
+                * Drivers just need to mask the std argument, in order
+                * to remove the standards that don't apply from the mask.
+                * This means that tuners, audio and video decoders can join
+                * their efforts to improve the standards detection
+                */
+               *p = vfd->tvnorms;
                ret = ops->vidioc_querystd(file, fh, arg);
                if (!ret)
                        dbgarg(cmd, "detected std=%08Lx\n",