Changeset 403 in flair-src for trunk/lib/FlairSensorActuator

Timestamp:

Mar 23, 2021, 9:40:41 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

select user memory pointer (v4l) if using custom alloc function in images (ie if initdsp was called)

Location:

trunk/lib/FlairSensorActuator/src

Files:

• Ps3Eye.cpp (modified) (1 diff)
• Ps3Eye.h (modified) (1 diff)
• V4LCamera.cpp (modified) (1 diff)
• V4LCamera.h (modified) (1 diff)
• V4LCamera_impl.cpp (modified) (2 diffs)
• unexported/V4LCamera_impl.h (modified) (1 diff)

trunk/lib/FlairSensorActuator/src/Ps3Eye.cpp

@@ -25 +25 @@
 namespace sensor {
 
-Ps3Eye::Ps3Eye(string name, int camera_index,
+Ps3Eye::Ps3Eye(string name, int camera_index,bool useMemoryUsrPtr,
                uint8_t priority)
     : V4LCamera( name, camera_index, 320, 240,
-                Image::Type::Format::YUYV, priority) {
+                Image::Type::Format::YUYV, useMemoryUsrPtr,priority) {
   SetIsReady(true);                  
 }

trunk/lib/FlairSensorActuator/src/Ps3Eye.h

@@ -33 +33 @@
   * \param name name
   * \param camera_index index of the camera, ie /dev/videox
+  * \param useMemoryUsrPtr true to use memory user pointer (ex with cmem on omap3730), false to use mmap
   * \param priority priority of the Thread
   */
   Ps3Eye(std::string name,
-         int camera_index, uint8_t priority);
+         int camera_index, bool useMemoryUsrPtr,uint8_t priority);
 
   /*!

trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

@@ -28 +28 @@
   
 V4LCamera::V4LCamera(string name,uint8_t camera_index, uint16_t width, uint16_t height,
-                     Image::Type::Format format, uint8_t priority)
+                     Image::Type::Format format, bool useMemoryUsrPtr,uint8_t priority)
     : Thread(getFrameworkManager(), name, priority),
       Camera(name, width, height, format) {
   
-  pimpl_=new V4LCamera_impl(this,name,camera_index,width,height,format);
+  pimpl_=new V4LCamera_impl(this,name,camera_index,width,height,format,useMemoryUsrPtr);
 }
 

trunk/lib/FlairSensorActuator/src/V4LCamera.h

@@ -45 +45 @@
   * \param height height
   * \param format image format
+  * \param useMemoryUsrPtr true to use memory user pointer (ex with cmem on omap3730), false to use mmap
   * \param priority priority of the Thread
   */
   V4LCamera(std::string name,
             uint8_t camera_index, uint16_t width, uint16_t height,
-            core::Image::Type::Format format, uint8_t priority);
+            core::Image::Type::Format format, bool useMemoryUsrPtr,uint8_t priority);
 
   /*!

trunk/lib/FlairSensorActuator/src/V4LCamera_impl.cpp

@@ -37 +37 @@
   
 V4LCamera_impl::V4LCamera_impl(V4LCamera *self,string name,uint8_t camera_index, uint16_t width, uint16_t height,
-                     Image::Type::Format format) {
+                     Image::Type::Format format,bool useMemoryUsrPtr) {
   this->self=self;
   
@@ -60 +60 @@
   }
   
-  //todo: better handling of detection, only neeeded for omap/dm
-  //also in run, copy from v4l to cmem is not necessary if not using cmem...
-#ifdef ARMV7A
-  useMemoryUsrPtr=true;
-#else
-  useMemoryUsrPtr=false;
-#endif
+  //todo: in run, copy from v4l to cmem is not necessary if not using cmem. (!useMemoryUsrPtr)
+  this->useMemoryUsrPtr=useMemoryUsrPtr;
+
   if(useMemoryUsrPtr) {
     AllocUserBuffers();

trunk/lib/FlairSensorActuator/src/unexported/V4LCamera_impl.h

@@ -48 +48 @@
   * \param height height
   * \param format image format
+  * \param useMemoryUsrPtr true to use memory user pointer (ex with cmem on omap3730), false to use mmap
   */
   V4LCamera_impl(flair::sensor::V4LCamera *self,std::string name,
             uint8_t camera_index, uint16_t width, uint16_t height,
-            flair::core::Image::Type::Format format);
+            flair::core::Image::Type::Format format,bool useMemoryUsrPtr);
 
   /*!