Changeset 4215

Timestamp:

07/14/08 08:30:51 (5 years ago)

Author:

douglask

Message:

V4L2 'large' capture only worked with 4:3 704x576 PAL input sources.

It now fallbacks to the nearest working resolution to 704x576 as returned by the V4L2 driver.

Files:

• vic/branches/mpeg4/video/grabber-v4l2.cpp (modified) (2 diffs)

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

@@ -1074 +1074 @@
 
         while ( !format_ok ) {
-                width_  = CIF_WIDTH  *2  / decimate_;
-                height_ = CIF_HEIGHT *2  / decimate_;
+                if (decimate_ > 0) {
+                        width_  = CIF_WIDTH  *2  / decimate_;
+                        height_ = CIF_HEIGHT *2  / decimate_;
+                }
 
                 debug_msg("V4L2: format");
@@ -1140 +1142 @@
                                                         break;
                                                 case 1:
-                                                        debug_msg("V4L2: trying resolution under ...\n");
-                                                        decimate_ = 2;
+                                                        debug_msg("V4L2: falling back to resolution %dx%d\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
+                                                        decimate_ = 0;
+                                                        width_ = fmt.fmt.pix.width;
+                                                        height_ = fmt.fmt.pix.height;
                                                         break;
                                                 default: