This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/xawtv3.git tree:

Subject: v4l-info: Add support for V4L2_CID_USER_BASE
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Mon Feb 7 16:18:12 2011 -0200

Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 console/v4l-info.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=7b37c75267fb3f439492b94ea032338436764132

diff --git a/console/v4l-info.c b/console/v4l-info.c
index d37799b..aafe54a 100644
--- a/console/v4l-info.c
+++ b/console/v4l-info.c
@@ -30,7 +30,7 @@ static int dump_v4l2(int fd, int tab)
        struct v4l2_format      format;
        struct v4l2_framebuffer fbuf;
        struct v4l2_queryctrl   qctrl;
-       int i;
+       int i, id;
 
        printf("general info\n");
        memset(&capability,0,sizeof(capability));
@@ -159,6 +159,17 @@ static int dump_v4l2(int fd, int tab)
                printf("    VIDIOC_QUERYCTRL(BASE+%d)\n",i);
                print_struct(stdout,desc_v4l2_queryctrl,&qctrl,"",tab);
        }
+        for (i = 0; i < V4L2_CID_LASTP1 - V4L2_CID_USER_BASE; i++) {
+               memset(&qctrl,0,sizeof(qctrl));
+               qctrl.id = id + V4L2_CID_USER_BASE;
+               if (-1 == ioctl(fd,VIDIOC_QUERYCTRL,&qctrl))
+                       break;
+               if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
+                       continue;
+               printf("    VIDIOC_QUERYCTRL(USER_BASE+%d)\n", i);
+               print_struct(stdout,desc_v4l2_queryctrl,&qctrl, "", tab);
+       }
+
        for (i = 0;; i++) {
                memset(&qctrl,0,sizeof(qctrl));
                qctrl.id = V4L2_CID_PRIVATE_BASE+i;
@@ -184,7 +195,7 @@ int main(int argc, char *argv[])
 
        if (argc > 1)
                device = argv[1];
-       
+
        fd = open(device,O_RDONLY);
        if (-1 == fd) {
                fprintf(stderr,"open %s: %s\n",device,strerror(errno));

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to