Changeset 4089

Timestamp:

08/15/07 08:35:11 (6 years ago)

Author:

douglask

Message:

Added V4L2 Powerline freqency filter control which is adjustable with the
new Anti-flicker menubutton in the V4L2 grabber configuration panel.

Added v4l2gain, v4l2gamma and antiflicker resources to ui-resource.tcl

Location:

vic/branches/mpeg4

Files:

• tcl/ui-grabber.tcl (modified) (3 diffs)
• tcl/ui-resource.tcl (modified) (1 diff)
• video/grabber-v4l2.cpp (modified) (10 diffs)

vic/branches/mpeg4/tcl/ui-grabber.tcl

@@ -97 +97 @@
     set f [smallfont]
     global contrast brightness v4l2gamma hue saturation v4l2gain norm
+    global antiflicker
     set contrast [resource contrast]
     set brightness [resource brightness]
@@ -104 +105 @@
     set v4l2gain [resource v4l2gain]
     set norm 0
+    set antiflicker [resource antiflicker]
 
     label $w.title -text "Video4Linux2 grabber controls"
@@ -111 +113 @@
     frame $w.f.left -relief flat
 
-
-    button $w.f.left.reset -font $f -width 10 -text "Reset" -command "set contrast 128; set brightness 128;set v4l2gamma 128; set hue 128; set saturation 128; set v4l2gain 128; grabber controls reset"  -padx 1 -pady 1
+    set m $w.f.left.antiflicker.menu
+    menubutton $w.f.left.antiflicker -menu $m -text "Anti-flicker..." \
+        -relief raised -width 14 -font $f -padx 1 -pady 1
+    menu $m
+    $m add radiobutton -label "disabled" -command "grabber antiflicker 0" \
+        -value "disabled" -variable antiflicker -font $f
+    $m add radiobutton -label "50 Hz" -command "grabber antiflicker 1" \
+        -value "50Hz" -variable antiflicker -font $f
+    $m add radiobutton -label "60 Hz" -command "grabber antiflicker 2" \
+        -value "60Hz" -variable antiflicker -font $f
+    pack $w.f.left.antiflicker
+
+    if [grabber get haveantiflicker] {
+        $w.f.left.antiflicker configure -state normal
+    } else {
+        $w.f.left.antiflicker configure -state disabled
+    }
+
+    button $w.f.left.reset -font $f -width 14 -text "Reset" -command "set contrast 128; set brightness 128;set v4l2gamma 128; set hue 128; set saturation 128; set v4l2gain 128; grabber controls reset"  -padx 1 -pady 1
     pack $w.f.left.reset
 

vic/branches/mpeg4/tcl/ui-resource.tcl

@@ -188 +188 @@
         option add Vic.luma_contrast "0" startupFile
 
+        option add Vic.antiflicker "disabled" startupFile
+        option add Vic.v4l2gain "128" startupFile
+        option add Vic.v4l2gamma "128" startupFile
+
         #
         # color resources

vic/branches/mpeg4/video/grabber-v4l2.cpp

@@ -85 +85 @@
 #define BYTE_ORDER_UYVY 2
 #define BYTE_ORDER_VYUY 3
+
+/* V4L2 driver specific controls */
+#define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_PRIVATE_BASE + 1)
 
 typedef struct tag_vimage
@@ -314 +317 @@
         } else {
                 if ( !(cap.capabilities & V4L2_CAP_READWRITE) && !(cap.capabilities & V4L2_CAP_STREAMING)) {
-                        debug_msg("v4l2: fatal: device does not support read()/write() calls or streaming capture.\n");
+                        debug_msg("V4L2: fatal: device does not support read()/write() calls or streaming capture.\n");
                         status_=-1;
                         return;
@@ -511 +514 @@
                 }
 
+                if (strcmp(argv[1], "antiflicker") == 0) {
+                        struct v4l2_queryctrl qctrl;
+                        struct v4l2_control ctrl;
+
+                        if (-1 != ioctl(fd_, VIDIOC_QUERYCTRL, &qctrl)) {
+                                if (strcmp((char *)qctrl.name, "Power Line Frequency") == 0) {
+                                        ctrl.id = V4L2_CID_POWER_LINE_FREQUENCY;
+                                        ctrl.value = atoi(argv[2]);
+                                        if (-1 == ioctl(fd_, VIDIOC_S_CTRL, &ctrl))
+                                                perror("ioctl  VIDIOC_S_CTRL");
+                                        else
+                                                debug_msg( "V4L2: V4L2_CID_POWER_LINE_FREQUENCY = %d\n", ctrl.value);
+                                 }
+                        }
+                        return (TCL_OK);
+                }
 
                 if (strcmp(argv[1], "controls") == 0) {
@@ -571 +590 @@
 
         if (fd_ > 0 ) {
-                debug_msg("\nv4l2: start\n");
+                debug_msg("\nV4L2: start\n");
 
                 format();
@@ -600 +619 @@
 
                                 if ((long)vimage[i].data == -1) {
-                                        debug_msg("v4l2: mmap() returned error %l\n", errno);
+                                        debug_msg("V4L2: mmap() returned error %l\n", errno);
                                         return;
-                                } else debug_msg("v4l2: mmap()'ed buffer at 0x%x (%d bytes)\n", (long)vimage[i].data, vimage[i].vidbuf.length);
+                                } else debug_msg("V4L2: mmap()'ed buffer at 0x%x (%d bytes)\n", (long)vimage[i].data, vimage[i].vidbuf.length);
                         }
 
@@ -621 +640 @@
                                 debug_msg("malloc(%d) failed\n", fmt.fmt.pix.sizeimage);
                                 return;
-                        } else debug_msg("v4l2: malloc()'ed buffer (%d bytes)\n",  fmt.fmt.pix.sizeimage);
+                        } else debug_msg("V4L2: malloc()'ed buffer (%d bytes)\n",  fmt.fmt.pix.sizeimage);
                 }
 
@@ -1052 +1071 @@
                 height_ = CIF_HEIGHT *2  / decimate_;
 
-                debug_msg("v4l2: format");
+                debug_msg("V4L2: format");
                 switch (cformat_) {
                 case CF_CIF:
@@ -1075 +1094 @@
                         if (-1 == ioctl(fd_, VIDIOC_S_STD, &standard.id))
                                 perror("ioctl VIDIOC_S_STD");
-                        else debug_msg("v4l2: setting norm to %s\n",standard.name);
+                        else debug_msg("V4L2: setting norm to %s\n",standard.name);
                 }
 
@@ -1081 +1100 @@
                 if ((err = ioctl(fd_, VIDIOC_S_INPUT, &input)) )
                         debug_msg("S_INPUT returned error %d\n",errno);
-                else debug_msg("v4l2: setting input port to %d\n", port_);
+                else debug_msg("V4L2: setting input port to %d\n", port_);
 
                 for (i = 0, err = 0; err == 0; ++i) {
@@ -1101 +1120 @@
 
                                         if ( (err = ioctl(fd_, VIDIOC_S_FMT, &fmt) ) )
-                                                debug_msg("\nv4l2: Failed to set format\n");
+                                                debug_msg("\nV4L2: Failed to set format\n");
 
                                         if ( ( fmt.fmt.pix.width != (unsigned int)width_ ) ||
                                                                 ( fmt.fmt.pix.height !=  (unsigned int)height_ ) ) {
 
-                                                debug_msg("v4l2: failed to set format! requested %dx%d, got %dx%d\n", width_, height_, fmt.fmt.pix.width, fmt.fmt.pix.height);
+                                                debug_msg("V4L2: failed to set format! requested %dx%d, got %dx%d\n", width_, height_, fmt.fmt.pix.width, fmt.fmt.pix.height);
 
 
                                                 switch(decimate_) {
                                                 case 2:
-                                                        debug_msg("v4l2: trying resolution under ...\n");
+                                                        debug_msg("V4L2: trying resolution under ...\n");
                                                         decimate_ = 4;
                                                         break;
                                                 case 1:
-                                                        debug_msg("v4l2: trying resolution under ...\n");
+                                                        debug_msg("V4L2: trying resolution under ...\n");
                                                         decimate_ = 2;
                                                         break;
                                                 default:
-                                                        debug_msg("v4l2: giving up ...\n");
+                                                        debug_msg("V4L2: giving up ...\n");
                                                         format_ok = 1;
                                                 }
 
                                         } else {
-                                                debug_msg("v4l2: setting format: width=%d height=%d\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
+                                                debug_msg("V4L2: setting format: width=%d height=%d\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
                                                 format_ok = 1;
                                         }