Set up timeInvariantAlias in the TimeVaryingTransform constructor

Since copies are only actually made in calls to distribute, we don't need to be initialized to set up the TimeInvariantWrapperTransform, and can do it in the constructor. This means subclasses don't need to explicitly call TimeVaryingTransform::init, although it depends quite strongly on Resource having a particular behavior.

Set up timeInvariantAlias in the TimeVaryingTransform constructor
Since copies are only actually made in calls to distribute, we don't need to be initialized to set up the TimeInvariantWrapperTransform, and can do it in the constructor. This means subclasses don't need to explicitly call TimeVaryingTransform::init, although it depends quite strongly on Resource having a particular behavior.
Charles Otto
1 parent 8f957ce1
Showing 5 changed files with 12 additions and 35 deletions
openbr/core/resource.h
openbr/plugins/frames.cpp
openbr/plugins/gui.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/stream.cpp
@@ -40,6 +40,9 @@ class DefaultResourceMaker : public ResourceMaker&lt;T&gt;
     T *make() const { return new T(); }
 };
+// Manage multiple copies of a limited resource in a thread-safe manner.
+// TimeVaryingTransform makes a strong assumption that ResourceMaker::Make
+// is only called in acquire, not in the constructor.
 template <typename T>
 class Resource
 {
@@ -52,11 +52,6 @@ private:
     {
         (void) stream;
     }
-
-    void init()
-    {
-        TimeVaryingTransform::init();
-    }
 };
 BR_REGISTER(Transform, AggregateFrames)
@@ -350,8 +350,6 @@ public:
         if (!Globals->useGui)
             return;
-        TimeVaryingTransform::init();
-
         if (displayBuffer)
             delete displayBuffer;
         displayBuffer = new QPixmap();
@@ -532,7 +530,6 @@ public:
         target_wait = 1000.0 / targetFPS;
         timer.start();
         last_time = timer.elapsed();
-        TimeVaryingTransform::init();
     }
 protected:
@@ -586,7 +583,6 @@ public:
     {
         initialized = false;
         framesSeen = 0;
-        TimeVaryingTransform::init();
     }
 protected:
@@ -110,12 +110,12 @@ public:
     virtual void project(const Template &src, Template &dst) const
     {
-        timeInvariantAlias->project(src,dst);
+        timeInvariantAlias.project(src,dst);
     }
     virtual void project(const TemplateList &src, TemplateList &dst) const
     {
-        timeInvariantAlias->project(src,dst);
+        timeInvariantAlias.project(src,dst);
     }
     // Get a compile failure if this isn't here to go along with the other
@@ -144,21 +144,13 @@ public:
         return this->clone();
     }
-    void init()
-    {
-        delete timeInvariantAlias;
-        timeInvariantAlias = new TimeInvariantWrapperTransform(this);
-    }
-
 protected:
-    Transform * timeInvariantAlias;
-    TimeVaryingTransform(bool independent = true, bool trainable = true) : Transform(independent, trainable)
+    // Since copies aren't actually made until project is called, we can set up
+    // timeInvariantAlias in the constructor.
+    TimeInvariantWrapperTransform timeInvariantAlias;
+    TimeVaryingTransform(bool independent = true, bool trainable = true) : Transform(independent, trainable), timeInvariantAlias(this)
     {
-        timeInvariantAlias = NULL;
-    }
-    ~TimeVaryingTransform()
-    {
-        delete timeInvariantAlias;
+        //
     }
 };
@@ -177,7 +169,7 @@ public:
     virtual void project(const Template &src, Template &dst) const
     {
         if (timeVarying()) {
-            timeInvariantAlias->project(src,dst);
+            timeInvariantAlias.project(src,dst);
             return;
         }
         _project(src, dst);
@@ -186,7 +178,7 @@ public:
     virtual void project(const TemplateList &src, TemplateList &dst) const
     {
         if (timeVarying()) {
-            timeInvariantAlias->project(src,dst);
+            timeInvariantAlias.project(src,dst);
             return;
         }
         _project(src, dst);
@@ -203,10 +195,6 @@ public:
             isTimeVarying = isTimeVarying || transform->timeVarying();
             trainable = trainable || transform->trainable;
         }
-
-        // If we are time varying, set up timeInvariantAlias
-        if (this->timeVarying())
-            TimeVaryingTransform::init();
     }
     /*!
@@ -1300,11 +1300,6 @@ public:
         if (!transform)
             return;
-        // Set up timeInvariantAlias
-        // this is only safe because copies are actually made in project
-        // calls, not during init.
-        TimeVaryingTransform::init();
-
         trainable = transform->trainable;
         basis.setParent(this->parent());