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

Timestamp:

02/19/20 14:19:28 (4 years ago)

Author:

Sanahuja Guillaume

Message:

V4l modifs

File:

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

trunk/lib/FlairSensorActuator/src/V4LCamera.h

@@ -16 +16 @@
 #include <Thread.h>
 #include "Camera.h"
-//todo use pimpl and remove this
+
 #include <linux/videodev2.h>
-#include <libv4l1-videodev.h>
-
 #define DEFAULT_V4L_BUFFERS 4
 
@@ -152 +150 @@
   void* buffers[DEFAULT_V4L_BUFFERS];
   int nbBuffers;
-  int bufferIndex;
   char *imageData;
+  bool useMemoryUsrPtr;
   
-  int init(int width, int height,unsigned long colorspace);
-  static int xioctl( int fd, int request, void *arg);
+  int Init(int width, int height,unsigned long colorspace);
+  int xioctl( int fd, int request, void *arg);
   void SetProperty(int property,float value);
   float GetProperty(int property);
-  int GrabFrame(void);
-  int AllocBuffers(void);
-  int allocBuffers (void);
+  //int GrabFrame(void);
+  int AllocV4LBuffers(void);
+  int AllocUserBuffers(void);
   int QueueBuffer(int index);
+  int QueueBuffer(struct v4l2_buffer *buf);
+  struct v4l2_buffer dQueuedBuffer;
   
 
 int cvGrabFrame(void);
-int read_frame_v4l2(void);
-void cvRetrieveRawFrame(void);
+