Changeset 151 in flair-src for trunk/lib

Timestamp:

Mar 1, 2017, 3:38:42 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

add timestamp to simucamera producer

Location:

trunk/lib

Files:

• FlairSensorActuator/src/SimuCamera.cpp (modified) (6 diffs)
• FlairSensorActuator/src/SimuCamera.h (modified) (2 diffs)
• FlairSimulator/src/Model_impl.cpp (modified) (1 diff)
• FlairSimulator/src/SimuCameraGL.cpp (modified) (9 diffs)
• FlairSimulator/src/SimuCameraGL.h (modified) (1 diff)

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -19 +19 @@
 #include <FrameworkManager.h>
 #include <GroupBox.h>
-#include <SpinBox.h>
-//#include <cvimage.h>
 #include <SharedMem.h>
 #include <sstream>
@@ -32 +30 @@
 namespace sensor {
 
+//control part
 SimuCamera::SimuCamera(string name,
                        uint16_t width, uint16_t height, uint8_t channels,
@@ -37 +36 @@
     : Thread(getFrameworkManager(), name, priority),
       Camera(name, width, height, cvimage::Type::Format::BGR) {
-//  data_rate =
-//      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 200, 1, 50);
 
-  buf_size = width * height * channels;
+  buf_size = width * height * channels+sizeof(Time);
 
-  img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
-  output->img->imageData = img->imageData;
+  shmemReadBuf=(char*)malloc(buf_size);
+  output->img->imageData = shmemReadBuf;
 
   ostringstream dev_name;
@@ -50 +47 @@
 }
 
+//simulation part
 SimuCamera::SimuCamera(const IODevice *parent, string name, uint16_t width,
                        uint16_t height, uint8_t channels, uint32_t dev_id)
     : Thread(parent, name, 0), Camera(parent,name) {
-//  data_rate = NULL;
 
+  buf_size = width * height * channels+sizeof(Time);
+  
   ostringstream dev_name;
   dev_name << "simu_cam_" << dev_id;
   shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
-                        width * height * channels, SharedMem::Type::producerConsumer);
+                        buf_size, SharedMem::Type::producerConsumer);
+  shmemReadBuf=NULL;
 }
 
@@ -64 +64 @@
   SafeStop();
   Join();
+  if(shmemReadBuf!=NULL) delete shmemReadBuf;
 }
 
 void SimuCamera::Run(void) {
+  Time time;
 //  if (data_rate == NULL) {
 //    Thread::Err("not applicable for simulation part.\n");
@@ -84 +86 @@
     output->GetMutex();
     //blocking read
-    shmem->Read((char *)img->imageData, buf_size); // remplacer copie par
+    shmem->Read(shmemReadBuf, buf_size); // remplacer copie par
                                                    // échange de pointeur sur
                                                    // double buffering
     output->ReleaseMutex();
-
-    output->SetDataTime(GetTime());
+    memcpy(&time,shmemReadBuf+buf_size-sizeof(Time),sizeof(Time));
+    output->SetDataTime(time);
 
     ProcessUpdate(output);

trunk/lib/FlairSensorActuator/src/SimuCamera.h

@@ -21 +21 @@
   namespace core {
     class SharedMem;
-  }
-  namespace gui {
-    class SpinBox;
   }
 }
@@ -99 +96 @@
   void UpdateFrom(const core::io_data *data){};
 
-  gui::SpinBox *data_rate;
   size_t buf_size;
-  IplImage *img;
+  char* shmemReadBuf;
 };
 } // end namespace sensor

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -204 +204 @@
 
   nodeOrientation.ToEuler(euler);
-  ISceneNode::setRotation(Euler::ToDegree(1) *
-                          vector3df(euler.roll, euler.pitch, euler.yaw));
+  ISceneNode::setRotation(Euler::ToDegree(1) * vector3df(euler.roll,euler.pitch, euler.yaw));
 
   if (position_init == false) {

trunk/lib/FlairSimulator/src/SimuCameraGL.cpp

@@ -59 +59 @@
   index = 0;
 
-  buffer = (char *)malloc(width * height * 3);
-
   // user interface
   Tab *setup_tab = new Tab(parent->GetTabWidget(), name);
@@ -86 +84 @@
     glGenBuffersARB(PBO_COUNT, pboIds);
     glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[0]);
-    glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, width * height * 3, 0,
+    glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, width * height * 3+sizeof(Time), 0,
                     GL_STREAM_READ_ARB);
     glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[1]);
-    glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, width * height * 3, 0,
+    glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, width * height * 3+sizeof(Time), 0,
                     GL_STREAM_READ_ARB);
 
@@ -95 +93 @@
   } else {
     use_pbo = false;
+    buffer = (char *)malloc(width * height * 3+sizeof(Time));
     Thread::Warn("GL_ARB_pixel_buffer_object is not suppoorted\n");
   }
@@ -106 +105 @@
 
 SimuCameraGL::~SimuCameraGL() {
-  free(buffer);
-
   if (use_pbo) {
     glDeleteBuffersARB(PBO_COUNT, pboIds);
     free(pboIds);
+  } else {
+    free(buffer);
   }
 }
@@ -151 +150 @@
     glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[index]);
     glReadPixels(x, y, width, height, GL_BGR, GL_UNSIGNED_BYTE, 0);
-
+    Time time=GetTime();
     // map the PBO that contain framebuffer pixels before processing it
     glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, pboIds[nextIndex]);
@@ -157 +156 @@
         GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB); // GL_READ_ONLY_ARB);
     if (src) {
-      putImage((char *)src);
+      putImage((char *)src,time);
       glUnmapBufferARB(
           GL_PIXEL_PACK_BUFFER_ARB); // release pointer to the mapped buffer
@@ -164 +163 @@
   } else {
     glReadPixels(x, y, width, height, GL_BGR, GL_UNSIGNED_BYTE, buffer);
-    putImage(buffer);
+    putImage(buffer,GetTime());
   }
 
@@ -173 +172 @@
 }
 
-void SimuCameraGL::putImage(char *buf) {
+void SimuCameraGL::putImage(char *buf,Time imageTime) {
   if (invert_pixel == true) {
     // opengl images are horizontally flipped, so we have to fix that here.
@@ -189 +188 @@
     delete[] tmpBuffer;
   }
-
-  shmem->Write(buf, width * height * 3);
+  memcpy(buf+width * height * 3,&imageTime,sizeof(Time));
+  shmem->Write(buf, width * height * 3+sizeof(Time));
 }
 

trunk/lib/FlairSimulator/src/SimuCameraGL.h

@@ -67 +67 @@
                                   irr::scene::ISceneManager *newManager = 0);
   void getImage(void);
-  void putImage(char *pixels);
+  void putImage(char *pixels,core::Time imageTime);
   irr::scene::ICameraSceneNode *camera;
   irr::scene::ISceneManager *smgr;