[libcvd-members] libcvd/cvd_src/Linux v4lbuffer.cc

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        09/07/22 19:25:31

Modified files:
        cvd_src/Linux  : v4lbuffer.cc 

Log message:
        Backport to older kernels (eg 2.6.18), by removing framerate etc
        enumeration.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/v4lbuffer.cc?cvsroot=libcvd&r1=1.13&r2=1.14

Patches:
Index: v4lbuffer.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/v4lbuffer.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- v4lbuffer.cc        25 Feb 2009 16:08:19 -0000      1.13
+++ v4lbuffer.cc        22 Jul 2009 19:25:31 -0000      1.14
@@ -107,7 +107,8 @@
        return v4l2_fourcc(s[0], s[1], s[2], s[3]);
 }
 
-void print_v4l2_framerates(int fd, unsigned int fmt, unsigned int width, 
unsigned int height, VPrint & log){
+#ifdef VIDIOC_ENUM_FRAMESIZES
+       void print_v4l2_framerates(int fd, unsigned int fmt, unsigned int 
width, unsigned int height, VPrint & log){
     struct v4l2_frmivalenum fr;
     fr.pixel_format = fmt;
     fr.width = width;
@@ -126,7 +127,8 @@
         default: assert(false);
         }
     }
-}
+       }
+#endif
 
 namespace V4L { // V4L
 
@@ -209,6 +211,8 @@
                {
                        actual_fmt = f.pixelformat;
                }
+
+               #ifdef VIDIOC_ENUM_FRAMESIZES
         if(verbose){
             struct v4l2_frmsizeenum fs;
             fs.pixel_format = f.pixelformat;
@@ -230,6 +234,7 @@
                 }
             }
         }
+               #endif
     }
 
        if(errno != EINVAL)