Changeset 348 in flair-src for trunk/lib/FlairSensorActuator/src/V4LCamera.h

Timestamp:

Feb 17, 2020, 3:44:56 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

update v4l cam, ok on gcs

File:

• trunk/lib/FlairSensorActuator/src/V4LCamera.h (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/V4LCamera.h

@@ -142 +142 @@
   void Run(void);
   
-  int device;
   gui::Tab *sensor_tab;
   gui::DoubleSpinBox *bright, *exposure, *gain, *contrast, *hue, *sharpness,*sat;
   gui::CheckBox *autogain, *awb, *autoexposure;
   gui::Label *fps;
+  
+  int device;
   bool hasProblems;
+  struct video_mmap *mmaps;
+  void* buffers[MAX_V4L_BUFFERS];
+  int nbBuffers;
+  int bufferIndex;
+  char *imageData;
+  
+  int init(int width, int height,unsigned long colorspace);
   static int xioctl( int fd, int request, void *arg);
   void SetProperty(int property,float value);
@@ -153 +161 @@
   int GrabFrame(void);
   int AllocBuffers(void);
+  int allocBuffers (void);
   int QueueBuffer(int index);
-  struct video_mmap *mmaps;
-  int bufferIndex;
-  struct buffer {
-    void *  start;
-    size_t  length;
-  };
-  buffer buffers[MAX_V4L_BUFFERS];
-  char* frame;
-  int nbBuffers;
   
-    typedef struct CvCaptureCAM_V4L
-{
-    //int deviceHandle;
-    int bufferIndex;
-    struct video_capability capability;
-    struct video_window     captureWindow;
-    struct video_picture    imageProperties; 
-    struct video_mbuf       memoryBuffer;
-    struct video_mmap       *mmaps;
-    char *memoryMap;
-    //IplImage frame;
-char *imageData;
-int imageSize;
 
-   /* V4L2 variables */
-   buffer buffers[MAX_V4L_BUFFERS + 1];
-   struct v4l2_capability cap;
-   struct v4l2_input inp;
-   struct v4l2_format form;
-   struct v4l2_crop crop;
-   struct v4l2_cropcap cropcap;
-   struct v4l2_requestbuffers req;
-   struct v4l2_jpegcompression compr;
-   struct v4l2_control control;
-   enum v4l2_buf_type type;
-   struct v4l2_queryctrl queryctrl;
-   struct v4l2_querymenu querymenu;
-} CvCaptureCAM_V4L;
+int cvGrabFrame(void);
 
-CvCaptureCAM_V4L capture;
-int init(int width, int height,unsigned long colorspace);
-int setVideoSize(int width, int height,unsigned long colorspace);
-int cvGrabFrame(void);
-int allocBuffers (void);
-int read_frame_v4l2(CvCaptureCAM_V4L* capture);
-void cvRetrieveRawFrame( CvCaptureCAM_V4L* capture);
-unsigned int n_buffers ;
+int read_frame_v4l2(void);
+void cvRetrieveRawFrame(void);
+
+
 };
 } // end namespace sensor