Changeset 330 in flair-src for trunk/lib/FlairCore/src/cvimage.cpp

Timestamp:

Sep 25, 2019, 3:29:26 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

use less bandwidth in vprnlite

File:

• trunk/lib/FlairCore/src/cvimage.cpp (modified) (3 diffs)

trunk/lib/FlairCore/src/cvimage.cpp

@@ -22 +22 @@
 namespace core {
 
+char* (*cvimage::allocFunction)(ssize_t)=cvimage::DefaultAllocFunction;
+void (*cvimage::freeFunction)(char*)=cvimage::DefaultFreeFunction;
+   
 cvimage::cvimage(const Object *parent, uint16_t width, uint16_t height,
                  Type::Format format, string name, bool allocate_data, int n)
     : io_data(parent, name, n), dataType(width, height, format) {
   this->allocate_data = allocate_data;
-
+//Printf("cvimage %s\n",ObjectName().c_str());
   if (allocate_data) {
     switch (format) {
     case Type::Format::YUYV:
     case Type::Format::UYVY:
-      img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 2);
+      buffer=allocFunction(width*height*2);
       break;
     case Type::Format::BGR:
-      img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 3);
+      buffer=allocFunction(width*height*3);
       break;
     case Type::Format::Gray:
-      img = cvCreateImage(cvSize(width, height), IPL_DEPTH_8U, 1);
+      buffer=allocFunction(width*height*1);
       break;
     default:
-      Err("format no supported");
+      Err("format not supported");
       break;
     }
@@ -47 +50 @@
       Err("number of samples!=1 not possible when not allocating data\n");
     n = 1;
-    switch (format) {
-    case Type::Format::YUYV:
-    case Type::Format::UYVY:
-      img = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, 2);
-      break;
-    case Type::Format::BGR:
-      img = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, 3);
-      break;
-    case Type::Format::Gray:
-      img = cvCreateImageHeader(cvSize(width, height), IPL_DEPTH_8U, 1);
-      break;
-    default:
-      Err("format no supported");
-      break;
-    }
   }
 
-  SetPtrToCircle((void **)&img);
+  SetPtrToCircle((void **)&buffer);
 
   if (n > 1)
@@ -72 +60 @@
 cvimage::~cvimage() {
   // printf("destructeur cvimage\n");
-
-  cvReleaseImage(&img);
+  if(allocate_data) freeFunction(buffer);
 }
 
 void cvimage::RawRead(char *dst) const { Warn("non implementé\n"); }
 
+void cvimage::RegisterAllocFunction(char*(*func)(ssize_t size)) {
+  if(allocFunction==DefaultAllocFunction) allocFunction=func;
+}
+
+void cvimage::RegisterFreeFunction(void(*func)(char* buffer)) {
+  if(freeFunction==DefaultFreeFunction) freeFunction=func;
+}
+
+char* cvimage::DefaultAllocFunction(ssize_t size){
+  Printf("default alloc %i\n",size);
+  return (char*)malloc(size);
+}
+
+void cvimage::DefaultFreeFunction(char* buffer){
+  Printf("default free\n");
+  free(buffer);
+}
+
 } // end namespace core
 } // end namespace flair